Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Interdyne clothes + contraband to the chemdrobe #2355

Merged
merged 5 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
# End of modified code
# Begin DeltaV modifications - Add contraband to the chemdrobe
contrabandInventory:
ClothingMaskInterdyneChemistry: 1
ClothingOuterInterdyneChemistrySuit: 1
ClothingUniformInterdyneChemist: 1
# End of DeltaV modifications
11 changes: 11 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 11 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Head/hoods.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Masks/masks.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading