diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index 2323d2f88b6..6c9d9be433b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml @@ -21,4 +21,10 @@ ClothingOuterApronChemist: 2 # Realistic PPE apron for chemistry ClothingEyesGlassesChemist: 2 # Safety glasses ClothingHandsGlovesChemist: 2 # Heavy duty chemistry gloves - # End of modified code \ No newline at end of file + # End of modified code + # Begin DeltaV modifications - Add contraband to the chemdrobe + contrabandInventory: + ClothingMaskInterdyneChemistry: 1 + ClothingOuterInterdyneChemistrySuit: 1 + ClothingUniformInterdyneChemist: 1 + # End of DeltaV modifications diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml index 52c7a6f3821..01fb7dadafd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml @@ -83,3 +83,14 @@ sprite: DeltaV/Clothing/Eyes/Glasses/presccorpsglasses.rsi - type: Clothing sprite: DeltaV/Clothing/Eyes/Glasses/presccorpsglasses.rsi + +- type: entity + parent: [ClothingEyesGlassesChemical, ShowMedicalIcons] + id: ClothingEyesGlassesChemicalInterdyne + name: interdyne chemical analysis goggles + description: Goggles engineered to be unable to get a stain on the lenses. It comes with a medical HUD incorporated. + components: + - type: Sprite + sprite: DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi + - type: Clothing + sprite: DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hoods.yml new file mode 100644 index 00000000000..0decd805c60 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hoods.yml @@ -0,0 +1,11 @@ +- type: entity + parent: ClothingHeadHatHoodBioGeneral + id: ClothingHeadHatInterdyneChemistryHood + categories: [ HideSpawnMenu ] + name: interdyne chemistry hood + description: A hood to complete the professional chemist look. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Masks/masks.yml new file mode 100644 index 00000000000..7e024db5b13 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Masks/masks.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingMaskGas + id: ClothingMaskInterdyneChemistry + name: interdyne gas mask + description: A face-covering mask that can be connected to an air supply. + components: + - type: Sprite + sprite: DeltaV/Clothing/Mask/interdynechemmask.rsi + - type: Clothing + sprite: DeltaV/Clothing/Mask/interdynechemmask.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml index 70354ccf836..4586c8318d0 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml @@ -13,3 +13,20 @@ modifiers: coefficients: Caustic: 0.25 + +- type: entity + parent: ClothingOuterBaseToggleable + id: ClothingOuterInterdyneChemistrySuit + name: interdyne chemistry suit + description: A spotless suit and durable, designed to protect you from chemical spills. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.40 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatInterdyneChemistryHood diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 3646bbe0c9c..46e7cf6aea3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -418,3 +418,14 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformInterdyneChemist + name: interdyne chemist uniform + description: An impecable uniform, sign of a good chemist. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/equipped-EYES.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/equipped-EYES.png new file mode 100644 index 00000000000..d243af0061b Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/icon.png new file mode 100644 index 00000000000..429475f5b20 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/inhand-left.png new file mode 100644 index 00000000000..9efcae06ec0 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/inhand-right.png new file mode 100644 index 00000000000..8800b0db496 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/meta.json new file mode 100644 index 00000000000..6e51cc72ef3 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/interdynechemgoogles.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustAnOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..da2404a932a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/icon.png new file mode 100644 index 00000000000..2e5d2a28396 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/inhand-left.png new file mode 100644 index 00000000000..2c66ace3732 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/inhand-right.png new file mode 100644 index 00000000000..7f072169a92 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/meta.json new file mode 100644 index 00000000000..64d5b6bd401 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Head/Hoods/interdynechemhood.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustAnOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/equipped-MASK.png b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..b2183436a92 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/icon.png new file mode 100644 index 00000000000..28241e2bf14 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/inhand-left.png new file mode 100644 index 00000000000..b84a0d107ca Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/inhand-right.png new file mode 100644 index 00000000000..cd2e818c3da Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/meta.json new file mode 100644 index 00000000000..3958cbbca08 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Mask/interdynechemmask.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustAnOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..afa3f44ef68 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/icon.png new file mode 100644 index 00000000000..dcc693e2e26 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/inhand-left.png new file mode 100644 index 00000000000..622756f1d49 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/inhand-right.png new file mode 100644 index 00000000000..793e1c977e2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/meta.json new file mode 100644 index 00000000000..1f43e3c45f9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/interdynechemsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustAnOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..91a2540dd39 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/icon.png new file mode 100644 index 00000000000..ac35d581229 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/inhand-left.png new file mode 100644 index 00000000000..38dcf86cc35 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/inhand-right.png new file mode 100644 index 00000000000..2a31a54c67c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/meta.json new file mode 100644 index 00000000000..50572b2b60c --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/interdyneuniform.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustAnOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}