-
Notifications
You must be signed in to change notification settings - Fork 4
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
rynkatze
wants to merge
26
commits into
Prison-Station-14:master
Choose a base branch
from
rynkatze:add-clothing
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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 072ec60
Update girder.yml
rynkatze 241e2b6
seperated components for minimal conflicts when pulling from upstream
rynkatze a6af47f
taking the rsi validator out back with a shotgun
rynkatze 841469f
undid my previous error, seperation is only possible with massive hea…
rynkatze 4fee893
fixed build error
rynkatze 6a3cced
four fucking pixels
rynkatze 89fb7f5
fixed infinite glass glitch
rynkatze 283d9b3
adds some warden clothing items and loadouts for warden role, updated…
rynkatze 7e1dce3
fixed the branch being wrong. probably an easier way to do this but i…
rynkatze 1350def
added liberator gear - sprites may be updated. still no vox stuff.
rynkatze 27d10dd
done. somehow stanford changed!? oh well.
rynkatze c521131
made an oops
rynkatze f23c21b
four fucking yamls
rynkatze 79c74b7
added liberator prototypes, untested
rynkatze 1f0b387
liberator yml fix. added warden jumpskirt
rynkatze 31f2275
added sp14warden locker, thanks Unajoy :D
rynkatze 3caa0a7
added warden jumpskirt to loadout group
rynkatze 214d162
warden and cco locker fills. will update stanford after merge
rynkatze 554f9f4
maintenance jumpsuit and loadout
rynkatze 695b7f6
gave inspector and warden flippos
rynkatze e08319d
fixed laziness. fixes.
rynkatze 37235c8
fixes, removed my coflmod
rynkatze 3f926da
started merge conflict fix
rynkatze 3e31baa
quick rename
rynkatze 0bcd0c3
Merge branch 'master' into add-clothing
rynkatze File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
Resources/Prototypes/Entities/Clothing/SP14/Head/hardsuit-helmets.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
19
Resources/Prototypes/Entities/Clothing/SP14/Neck/Cloaks/cloaks.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
26 changes: 26 additions & 0 deletions
26
Resources/Prototypes/Entities/Clothing/SP14/Outerclothing/armor.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
95 changes: 95 additions & 0 deletions
95
Resources/Prototypes/Entities/Clothing/SP14/Outerclothing/hardsuits.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Binary file added
BIN
+256 KB
Resources/Prototypes/Entities/Clothing/SP14/Uniforms/CoflMod-1.5.5-alpha.jar
Binary file not shown.
44 changes: 44 additions & 0 deletions
44
Resources/Prototypes/Entities/Clothing/SP14/Uniforms/jumpsuits.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -638,7 +638,7 @@ | |
- type: entity | ||
parent: ClothingUniformBase | ||
id: ClothingUniformJumpsuitWarden | ||
name: warden's uniform | ||
name: chief custodial officer's uniform | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
11 changes: 11 additions & 0 deletions
11
Resources/Prototypes/Entities/Markers/Spawners/Conditional/SP14/nukies.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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