diff --git a/Resources/Audio/Lobby/Get_It_Done.ogg b/Resources/Audio/Lobby/Get_It_Done.ogg new file mode 100644 index 0000000000..67f0059698 Binary files /dev/null and b/Resources/Audio/Lobby/Get_It_Done.ogg differ diff --git a/Resources/Audio/Lobby/Undefined_Theory.ogg b/Resources/Audio/Lobby/Undefined_Theory.ogg new file mode 100644 index 0000000000..c567ac17a0 Binary files /dev/null and b/Resources/Audio/Lobby/Undefined_Theory.ogg differ diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml index bc45632555..81a22ed013 100644 --- a/Resources/Audio/Lobby/attributions.yml +++ b/Resources/Audio/Lobby/attributions.yml @@ -27,3 +27,19 @@ license: "CC-BY-SA-3.0" copyright: "Black Heat by Ross Bugden, converted from WAV to OGG" source: "https://soundcloud.com/rossbugden/intense-and-upbeat-electronic-trailer-music-black-heat-copyright-and-royalty-free" + +- files: ["thestation.ogg"] + license: "CC0-1.0" + copyright: "The Station by A-Guy, converted from mp3 to OGG" + source: "https://github.com/A-Guy173/Music/blob/main/thestation.mp3" + +- files: ["Get_It_Done.ogg"] + license: "CC0-1.0" + copyright: "Get It Done by A-Guy, converted from mp3 to OGG" + source: "https://github.com/A-Guy173/Music/blob/main/getitdone.mp3" + +- files: ["Undefined_Theory.ogg"] + license: "CC0-1.0" + copyright: "Undefined Theory by A-Guy, converted to OGG" + source: "https://www.youtube.com/watch?v=FIOs2t84MKo" + \ No newline at end of file diff --git a/Resources/Audio/Lobby/thestation.ogg b/Resources/Audio/Lobby/thestation.ogg new file mode 100644 index 0000000000..4a422f2dcc Binary files /dev/null and b/Resources/Audio/Lobby/thestation.ogg differ diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 3e38b6c4ef..c3d2c76126 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -51,15 +51,20 @@ - type: StorageFill contents: - id: CigCartonGreen - prob: 0.50 + prob: 0.33 # DeltaV orGroup: CigCarton1 - id: CigCartonRed orGroup: CigCarton1 - id: CigCartonBlue - prob: 0.50 + prob: 0.33 # DeltaV orGroup: CigCarton2 - id: CigCartonBlack orGroup: CigCarton2 + - id: CigCartonPurple # DeltaV + prob: 0.33 + orGroup: CigCarton3 + - id: CigCartonCandy # DeltaV + orGroup: CigCarton3 - id: CigarGoldCase prob: 0.05 orGroup: Cigars diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml index cf69058027..9ea895b629 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml @@ -5,6 +5,8 @@ CigPackRed: 2 CigPackBlue: 2 CigPackBlack: 2 + CigPackPurple: 2 # DeltaV + CigPackCandy: 2 # DeltaV CigPackMixed: 2 CigarCase: 1 SmokingPipeFilledTobacco: 1 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml new file mode 100644 index 0000000000..d081025980 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml @@ -0,0 +1,33 @@ +- type: entity + id: CigCartonPurple + parent: CigCartonGreen + name: De Jure carton + description: A carton containing 6 packets of De Jure. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi + layers: + - state: closed + - type: Item + sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi + - type: StorageFill + contents: + - id: CigPackPurple + amount: 5 + +- type: entity + id: CigCartonCandy + parent: CigCartonGreen + name: Sugar Rush carton + description: A carton containing 6 packets of Sugar Rush. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi + layers: + - state: closed + - type: Item + sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi + - type: StorageFill + contents: + - id: CigPackCandy + amount: 5 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml new file mode 100644 index 0000000000..ec6642e7b8 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml @@ -0,0 +1,45 @@ +- type: entity + id: CigaretteOlive + suffix: olive + parent: Cigarette + name: cigarette + description: A roll of tobacco and nicotine soaked in some chemical, smells like olives. + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 15 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: OilOlive + Quantity: 5 + +- type: entity + id: CigaretteCandy + suffix: candy + parent: [Cigarette, FoodBase] + name: cigarette + description: Sugar sticks designed to look like a roll of nicotine and tobacco. + components: + - type: Appearance + - type: Food + - type: Tag + tags: + - FoodSnack + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + state: unlit-icon + - type: Clothing + sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + slots: [ mask ] + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Sugar + Quantity: 10 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml new file mode 100644 index 0000000000..09ab2e09ee --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -0,0 +1,29 @@ +- type: entity + id: CigPackPurple + parent: CigPackBase + name: De Jure packet + description: Your divine right to smoke. Tastes like olives and fake gold. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi + - type: Item + sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi + - type: StorageFill + contents: + - id: CigaretteOlive + amount: 10 + +- type: entity + id: CigPackCandy + parent: CigPackBase + name: Sugar Rush packet + description: It's sweetened! + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi + - type: Item + sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi + - type: StorageFill + contents: + - id: CigaretteCandy + amount: 10 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml index 9ef2331aa9..d0ae19c0c2 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml @@ -143,6 +143,8 @@ - CigCartonRed - CigCartonBlue - CigCartonBlack + - CigCartonPurple # DeltaV + - CigCartonCandy # DeltaV - Joint - Blunt - CigarGold diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index e2334bf546..c263e40f44 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -24,3 +24,7 @@ - /Audio/Lobby/atomicamnesiammx.ogg - /Audio/Lobby/Monument.ogg - /Audio/Lobby/Black_Heat.ogg + - /Audio/Lobby/thestation.ogg + - /Audio/Lobby/Get_It_Done.ogg + - /Audio/Lobby/Undefined_Theory.ogg + \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/closed.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/closed.png new file mode 100644 index 0000000000..d2378dd7d1 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-left.png new file mode 100644 index 0000000000..160fd7f68e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-right.png new file mode 100644 index 0000000000..6fede8b037 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/meta.json new file mode 100644 index 0000000000..f9c76c2ea2 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "open" + }, + { + "name": "closed" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/open.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/open.png new file mode 100644 index 0000000000..1ab682b795 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/closed.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/closed.png new file mode 100644 index 0000000000..dde70af180 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-left.png new file mode 100644 index 0000000000..2101a8c94b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-right.png new file mode 100644 index 0000000000..4953a234ba Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/meta.json new file mode 100644 index 0000000000..f9c76c2ea2 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "open" + }, + { + "name": "closed" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/open.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/open.png new file mode 100644 index 0000000000..8c6d21d23c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/closed.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/closed.png new file mode 100644 index 0000000000..b3b688720f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/equipped-BELT.png new file mode 100644 index 0000000000..d49b6f112c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-left.png new file mode 100644 index 0000000000..160fd7f68e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-right.png new file mode 100644 index 0000000000..6fede8b037 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/meta.json new file mode 100644 index 0000000000..11810896d4 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/open.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/open.png new file mode 100644 index 0000000000..9db23a7d14 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/trash.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/trash.png new file mode 100644 index 0000000000..b1e4bb99b3 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/trash.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/closed.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/closed.png new file mode 100644 index 0000000000..7af12a43d2 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/equipped-BELT.png new file mode 100644 index 0000000000..d49b6f112c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-left.png new file mode 100644 index 0000000000..2101a8c94b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-right.png new file mode 100644 index 0000000000..4953a234ba Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/meta.json new file mode 100644 index 0000000000..11810896d4 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/open.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/open.png new file mode 100644 index 0000000000..da246d4c16 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/trash.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/trash.png new file mode 100644 index 0000000000..1b183401ca Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/trash.png differ