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 22 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
11 changes: 10 additions & 1 deletion Resources/Locale/en-US/prototypes/roles/antags.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
roles-antag-syndicate-agent-name = Syndicate agent
roles-antag-syndicate-agent-name = Syndicate agent
roles-antag-syndicate-agent-objective = Complete your objectives without being caught.

roles-antag-syndicate-agent-sleeper-name = Syndicate sleeper agent
Expand Down Expand Up @@ -36,3 +36,12 @@ roles-antag-thief-objective = Add some NT property to your personal collection w

roles-antag-dragon-name = Space Dragon
roles-antag-dragon-objective = Create a carp army to take over this quadrant.

roles-antag-liberator-commander-name = Liberator commander
roles-antag-liberator-commander-objective = Lead your team to free as many prisoners as you can.

roles-antag-liberator-medic-name = Liberator medic
roles-antag-liberator-medic-objective = Like default Liberator, the team's treatment will have priority.

roles-antag-liberator-name = Nuclear operative
roles-antag-liberator-objective = Free as many prisoners as you can and convert them to your side.
108,931 changes: 108,931 additions & 0 deletions Resources/Maps/SP14/stanford.yml

Large diffs are not rendered by default.

52 changes: 52 additions & 0 deletions Resources/Prototypes/Catalog/Fills/sp14/Lockers/heads.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
type: entity
id: LockerSP14WardenFilled
suffix: Filled
parent: LockerSPWarden
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorSP14WardenCarapace
- id: NukeDisk
- id: PinpointerNuclear
- id: CaptainIDCard
- id: ClothingMaskGasCaptain
- id: WeaponTaser
- id: CommsComputerCircuitboard
- id: ClothingHeadsetAltCommand
- id: SpaceCash1000
- id: PlushieNuke
prob: 0.1
- id: CigarGoldCase
- id: ClothingBeltSheathFilled
- id: DoorRemoteCommand
- id: RubberStampCaptain
- id: WeaponAntiqueLaser
- id: JetpackFilled
- id: MedalCase


# TD: FILL WITH NEW ENERGY WEAPON
type: entity
id: LockerSP14ChiefCustodialOfficerFilled
suffix: Filled
parent: LockerSPChiefCustodial
components:
- type: StorageFill
contents:
- id: DoorRemoteSecurity
- id: FlashlightSeclite
- id: WeaponDisabler
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
- id: ClothingHeadsetAltSecurity
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
- id: DoorRemoteArmory
- id: HoloprojectorSecurity
- id: ClothingNeckShockCollar
amount: 3
- id: RemoteSignaller
amount: 3
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitWarden

#Captain's Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
#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
15 changes: 15 additions & 0 deletions Resources/Prototypes/Entities/Clothing/SP14/Head/hats.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- 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
19 changes: 19 additions & 0 deletions Resources/Prototypes/Entities/Clothing/SP14/Neck/Cloaks/cloaks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

- 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
#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
Copy link
Collaborator

@Truoizys Truoizys Aug 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as much as it may help your skyblock trading coflmod probably won't be any use in this repo

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I WAS WONDERING WHERE I PUT IT HAHAHAHA

Binary file not shown.
44 changes: 44 additions & 0 deletions Resources/Prototypes/Entities/Clothing/SP14/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@

- 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: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtSP14Warden
name: warden's jumpskirt
description: A red and black jumpskirt with gold engravings showing the status of the Warden
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/sp14wardens.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/sp14wardens.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSP14MaintenanceTech
name: maintenance jumpsuit
description: A professional and slightly sweaty jumpsuit belonging to a (hopefully) hardworking Maintenance worker.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtWarden
name: warden's uniform
description: A formal security suit for officers complete with Nanotrasen belt buckle.
name: chief custodial officer's uniform
description: A formal security skirt for officers complete with Nanotrasen belt buckle.
Comment on lines -413 to +414
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gunna need to separate these to a sp14 file

components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitWarden
name: warden's uniform
name: chief custodial officer's uniform
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

description: A formal security suit for officers complete with Nanotrasen belt buckle.
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
id: SpawnPointSP14Liberators
parent: MarkerBase
name: nukies
components:
- type: SpawnPoint
- type: Sprite
layers:
- state: green
- sprite: Objects/Fun/toys.rsi
state: synb
Loading
Loading