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

Adds Clothing / sprites to various jobs. #18

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b415d60
- adds construction graphs & recipes to plastitanium walls/windows
rynkatze Jul 11, 2024
072ec60
Update girder.yml
rynkatze Jul 11, 2024
241e2b6
seperated components for minimal conflicts when pulling from upstream
rynkatze Jul 12, 2024
a6af47f
taking the rsi validator out back with a shotgun
rynkatze Jul 12, 2024
841469f
undid my previous error, seperation is only possible with massive hea…
rynkatze Jul 12, 2024
4fee893
fixed build error
rynkatze Jul 12, 2024
6a3cced
four fucking pixels
rynkatze Jul 12, 2024
89fb7f5
fixed infinite glass glitch
rynkatze Jul 12, 2024
283d9b3
adds some warden clothing items and loadouts for warden role, updated…
rynkatze Aug 6, 2024
7e1dce3
fixed the branch being wrong. probably an easier way to do this but i…
rynkatze Aug 6, 2024
1350def
added liberator gear - sprites may be updated. still no vox stuff.
rynkatze Aug 6, 2024
27d10dd
done. somehow stanford changed!? oh well.
rynkatze Aug 8, 2024
c521131
made an oops
rynkatze Aug 8, 2024
f23c21b
four fucking yamls
rynkatze Aug 8, 2024
79c74b7
added liberator prototypes, untested
rynkatze Aug 16, 2024
1f0b387
liberator yml fix. added warden jumpskirt
rynkatze Aug 20, 2024
31f2275
added sp14warden locker, thanks Unajoy :D
rynkatze Aug 21, 2024
3caa0a7
added warden jumpskirt to loadout group
rynkatze Aug 21, 2024
214d162
warden and cco locker fills. will update stanford after merge
rynkatze Aug 21, 2024
554f9f4
maintenance jumpsuit and loadout
rynkatze Aug 21, 2024
695b7f6
gave inspector and warden flippos
rynkatze Aug 21, 2024
e08319d
fixed laziness. fixes.
rynkatze Aug 21, 2024
37235c8
fixes, removed my coflmod
rynkatze Aug 23, 2024
3f926da
started merge conflict fix
rynkatze Dec 17, 2024
3e31baa
quick rename
rynkatze Dec 17, 2024
0bcd0c3
Merge branch 'master' into add-clothing
rynkatze Dec 17, 2024
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
72 changes: 72 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,78 @@
Piercing: 0.9
Heat: 0.9

#SP14 Warden's Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitSP14Warden
name: warden's hardsuit helmet
description: A specially tailored and armoured helmet. Oddly comfortable.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/sp14warden.rsi
- type: Clothing
sprite: Clothing/Head/Hardsuits/sp14warden.rsi
- type: PointLight
color: "#ffeead"
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9

#SP14 Liberator Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitSP14Liberator
name: liberator hardsuit helmet
description: A helmet to welcome the trapped and intimidate the tyrants. For Freedom!
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/sp14liberator.rsi
- type: Clothing
sprite: Clothing/Head/Hardsuits/sp14liberator.rsi
- type: PointLight
color: "#771718"
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.85
Heat: 0.9

#SP14 Liberator Commander's Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitSP14LiberatorCommander
name: liberator hardsuit helmet
description: A helmet to welcome the trapped and intimidate the tyrants. For Freedom!
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/sp14liberatorcommander.rsi
- type: Clothing
sprite: Clothing/Head/Hardsuits/sp14liberatorcommander.rsi
- type: PointLight
color: "#771718"
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9

#Captain's Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,22 @@
- WhitelistChameleon
- HamsterWearable

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatSP14Wardencap
name: warden's cap
description: A grand, stylish warden cap.
components:
- type: Sprite
sprite: Clothing/Head/Hats/sp14wardencap.rsi
- type: Clothing
sprite: Clothing/Head/Hats/sp14wardencap.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon
- HamsterWearable

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCentcomcap
Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,26 @@
- type: StealTarget
stealGroup: HeadCloak

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakSP14Warden
name: warden's cloak
description: A formal and gilded cloak for intimidating prisoners.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/sp14warden.rsi
- type: StealTarget
stealGroup: HeadCloak

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakSP14LiberatorCommander
name: liberator commander's cloak
description: A magnanimous and gilded cloak for tackling tyrants.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/sp14liberatorcommander.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakAdmin
Expand Down
26 changes: 26 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,32 @@
damageCoefficient: 0.65
- type: GroupExamine

- type: entity
parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
id: ClothingOuterArmorSP14WardenCarapace
name: "warden's carapace"
description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest."
components:
- type: Sprite
sprite: Clothing/OuterClothing/Armor/sp14warden_carapace.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Armor/sp14warden_carapace.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.5
Piercing: 0.6
Heat: 0.5
Caustic: 0.9
- type: ClothingSpeedModifier
walkModifier: 1.0
sprintModifier: 1.0
- type: HeldSpeedModifier
- type: ExplosionResistance
damageCoefficient: 0.65
- type: GroupExamine

- type: entity
parent: ClothingOuterBaseLarge
id: ClothingOuterArmorChangeling
Expand Down
97 changes: 97 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,103 @@
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitWarden

#SP14 Warden's Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitSP14Warden
name: warden's hardsuit
description: A specialized riot suit geared to combat low pressure environments.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/sp14warden.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/sp14warden.rsi
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.6
Piercing: 0.5
Caustic: 0.7
Heat: 0.35
Radiation: 0.35
- type: ClothingSpeedModifier
walkModifier: 0.7
sprintModifier: 0.7
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSP14Warden

#SP14 Liberator Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitSP14Liberator
name: liberator hardsuit
description: A specialized hardsuit to welcome the trapped and fight the tyrants. For Freedom!
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/sp14liberator.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/sp14liberator.rsi
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
- type: Armor
modifiers:
coefficients:
Blunt: 0.65
Slash: 0.65
Piercing: 0.65
Caustic: 0.7
Heat: 0.65
Radiation: 0.6
- type: ClothingSpeedModifier
walkModifier: 0.85
sprintModifier: 0.85
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSP14Liberator

#SP14 Liberator Commander's Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitSP14LiberatorCommander
name: liberator commander hardsuit
description: A gilded, magnanimous hardsuit to welcome the trapped and fight the tyrants. For Freedom!
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.6
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.6
Piercing: 0.5
Caustic: 0.6
Heat: 0.6
Radiation: 0.6
- type: ClothingSpeedModifier
walkModifier: 0.85
sprintModifier: 0.85
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSP14LiberatorCommander


#Captain's Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
Expand Down
22 changes: 22 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,28 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/captain.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSP14Warden
name: warden's jumpsuit
description: A red and black jumpsuit with gold engravings showing the status of the Warden.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/sp14warden.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/sp14warden.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSP14Liberator
name: liberator jumpsuit
description: A sleek and comfortable jumpsuit for tackling tyrants. For Freedom!
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/sp14liberator.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/sp14liberator.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCargo
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Markers/Spawners/sp14 jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
- type: Sprite
layers:
- state: green
- state: warden
- state: sp14warden

- type: entity
id: SpawnPointWelfareOfficer
Expand Down Expand Up @@ -284,4 +284,4 @@
- type: Sprite
layers:
- state: green
- state: detective
- state: detective
39 changes: 39 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/SP14/Command/sp14warden.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Jumpsuit
- type: loadout
id: SP14WardenJumpsuit
equipment: SP14WardenJumpsuit

- type: startingGear
id: SP14WardenJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitSP14Warden

# Head
- type: loadout
id: WardenCap
equipment: WardenCap

- type: startingGear
id: WardenCap
equipment:
head: ClothingHeadHatSP14Wardencap

# Neck
- type: loadout
id: WardenCloak
equipment: WardenCloak

- type: startingGear
id: WardenCloak
equipment:
neck: ClothingNeckCloakSP14Warden

# Hands
- type: loadout
id: WardenCombatGloves
equipment: WardenCombatGloves

- type: startingGear
id: WardenCombatGloves
equipment:
hands: ClothingHandsGlovesCombat
24 changes: 24 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,30 @@
- CaptainOuterClothing
- CaptainWintercoat

- type: loadoutGroup
id: SP14WardenHead
name: loadout-group-sp14warden-head
loadouts:
- WardenCap

- type: loadoutGroup
id: SP14WardenNeck
name: loadout-group-sp14warden-head
loadouts:
- WardenCloak

- type: loadoutGroup
id: SP14WardenJumpsuit
name: loadout-group-sp14warden-jumpsuit
loadouts:
- SP14WardenJumpsuit

- type: loadoutGroup
id: SP14WardenGloves
name: loadout-group-sp14warden-gloves
loadouts:
- WardenCombatGloves

- type: loadoutGroup
id: HoPHead
name: loadout-group-hop-head
Expand Down
9 changes: 5 additions & 4 deletions Resources/Prototypes/Loadouts/sp14_role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
- type: roleLoadout
id: JobSPWarden
groups:
- HeadofSecurityHead
- HeadofSecurityNeck
- HeadofSecurityJumpsuit
- SP14WardenHead
- SP14WardenNeck
- SP14WardenJumpsuit
- SP14WardenGloves
- SecurityBackpack
- SecurityBelt
- HeadofSecurityOuterClothing
- HeadofSecurityOuterClothing # tbd: warden winter coat
- SecurityShoes
- SurvivalSecurity
- Trinkets
Expand Down
Loading
Loading