diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 66ebfde0bb..b11be3a774 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -133887,7 +133887,7 @@ entities: - pos: 57.464855,-58.31391 parent: 13329 type: Transform -- proto: DrinkBeer +- proto: DrinkBeerBottleFull entities: - uid: 12134 components: diff --git a/Resources/Maps/nukieplanet.yml b/Resources/Maps/nukieplanet.yml index 7d13aa0966..c2b220ab97 100644 --- a/Resources/Maps/nukieplanet.yml +++ b/Resources/Maps/nukieplanet.yml @@ -5735,7 +5735,7 @@ entities: - pos: 3.9415665,-8.34479 parent: 104 type: Transform -- proto: DrinkBeer +- proto: DrinkBeerBottleFull entities: - uid: 161 components: diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml index e86748633c..d053f900e0 100644 --- a/Resources/Maps/origin.yml +++ b/Resources/Maps/origin.yml @@ -93874,7 +93874,7 @@ entities: - pos: -25.524792,55.598667 parent: 2 type: Transform -- proto: DrinkBeer +- proto: DrinkBeerBottleFull entities: - uid: 14041 components: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 6f2e7db5b2..452300dae2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -9,7 +9,7 @@ DrinkShaker: 5 DrinkAbsintheBottleFull: 2 DrinkAleBottleFull: 5 - DrinkBeer: 5 # Needs to be renamed DrinkBeerBottleFull + DrinkBeerBottleFull: 5 DrinkBlueCuracaoBottleFull: 2 DrinkCognacBottleFull: 4 DrinkColaBottleFull: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml index bf7af4ad11..f3dc778d3a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml @@ -21,3 +21,5 @@ JugSodium: 2 JugSugar: 2 JugSulfur: 2 + emaggedInventory: + ToxinChemistryBottle: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 29fd3cc7bf..e263903ef5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -58,3 +58,6 @@ ClothingHeadFishCap: 2 ClothingHeadRastaHat: 2 ClothingBeltStorageWaistbag: 3 + contrabandInventory: + ClothingUniformJumpsuitTacticool: 1 + ClothingUniformJumpskirtTacticool: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index c28a6be535..888061226a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -14,3 +14,5 @@ ClothingShoesBootsLaceup: 2 ClothingHeadsetService: 2 ClothingNeckLawyerbadge: 2 + emaggedInventory: + CyberPen: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index 85ffaf4adf..154723c9f5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -13,3 +13,6 @@ FlashlightLantern: 5 ClothingHandsGlovesColorYellowBudget: 5 AirlockPainter: 3 + # Some engineer forgot to take the multitool out the youtool when working on it, happens. + contrabandInventory: + Multitool: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 5ec3bc4464..12ef43b63b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -579,6 +579,21 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtTacticool + name: tacticool jumpskirt + description: Uniform for subpar operative LARPers performing tactical insulated glove theft in deep space. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/tacticool_s.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/tacticool_s.rsi + # Too cool for sensors to be on + - type: SuitSensor + randomMode: false + mode: SensorOff + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtAtmos diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 7622a84b1a..465a587510 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -887,6 +887,21 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/operative.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitTacticool + name: tacticool jumpsuit + description: Uniform for subpar operative LARPers performing tactical insulated glove theft in deep space. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + # Too cool for sensors to be on + - type: SuitSensor + randomMode: false + mode: SensorOff + - type: entity parent: UnsensoredClothingUniformBase id: ClothingUniformJumpsuitMercenary diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml index 40f6e927cb..819320a80f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml @@ -29,7 +29,7 @@ - DrinkVodkaBottleFull - DrinkWhiskeyBottleFull - DrinkWineBottleFull - - DrinkBeer + - DrinkBeerBottleFull - DrinkAleBottleFull chance: 0.8 offset: 0.0 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index f47edb6abd..4779150801 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -351,7 +351,7 @@ - type: entity parent: DrinkBottleBaseFull - id: DrinkBeer # Needs to be renamed DrinkBeerBottleFull + id: DrinkBeerBottleFull name: beer # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e description: An alcoholic beverage made from malted grains, hops, yeast, and water. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index 016733d8db..c0c7047c00 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -254,3 +254,19 @@ - type: Tag tags: - Bottle + +- type: entity + id: ToxinChemistryBottle + name: toxin bottle + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Toxin + Quantity: 30 + - type: Tag + tags: + - Bottle diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..af77e0b574 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING.png new file mode 100755 index 0000000000..7e280a1074 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/icon.png new file mode 100755 index 0000000000..d88a810d8e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-left.png new file mode 100644 index 0000000000..ebb3b515aa Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-right.png new file mode 100644 index 0000000000..cb143902bd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/meta.json new file mode 100644 index 0000000000..94d2cd0d9d --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey derivative made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..5e4d0b0867 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING.png new file mode 100755 index 0000000000..d846c10634 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/icon.png new file mode 100755 index 0000000000..ac63a361fd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-left.png new file mode 100644 index 0000000000..81b43846cb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-right.png new file mode 100644 index 0000000000..18756ef6a0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json new file mode 100644 index 0000000000..1a3bbef77b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file