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.

Sign up for GitHub

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

Syndie Jumpsuit Sensors Fix #1210

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Syndie Jumpsuit Sensors Fix #1210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cafd3ab
Syndie Jumpsuit Sensors Fix
ErhardSteinhauer Apr 10, 2024
6901355
Merge branch 'new-frontiers-14:master' into Syndie-Jumpsuit-Sensors-Fix
ErhardSteinhauer Apr 10, 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
1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,7 +1277,6 @@
sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingUniformBase
Expand Down
4 changes: 0 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi
- type: Contraband #frontier

#Repairman
- type: entity
Expand All @@ -48,7 +47,6 @@
sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi
- type: Contraband #frontier

#Paramedic
- type: entity
Expand All @@ -72,7 +70,6 @@
sprite: Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi
- type: Contraband #frontier

#HEADS OF STAFF
#Chief Engineer
Expand All @@ -97,4 +94,3 @@
sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi
- type: Contraband #frontier
46 changes: 46 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,49 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi

# Syndicate Jupsuits with sensors off
- type: entity
parent: ClothingUniformJumpsuitRecruitSyndie
id: ClothingUniformJumpsuitRecruitSyndieNF
components:
- type: SuitSensor
randomMode: false
mode: SensorOff
- type: Contraband

- type: entity
parent: ClothingUniformJumpsuitRepairmanSyndie
id: ClothingUniformJumpsuitRepairmanSyndieNF
components:
- type: SuitSensor
randomMode: false
mode: SensorOff
- type: Contraband

- type: entity
parent: ClothingUniformJumpsuitParamedicSyndie
id: ClothingUniformJumpsuitParamedicSyndieNF
components:
- type: SuitSensor
randomMode: false
mode: SensorOff
- type: Contraband

- type: entity
parent: ClothingUniformJumpsuitChiefEngineerSyndie
id: ClothingUniformJumpsuitChiefEngineerSyndieNF
components:
- type: SuitSensor
randomMode: false
mode: SensorOff
- type: Contraband

- type: entity
parent: ClothingUniformJumpsuitSyndieFormal
id: ClothingUniformJumpsuitSyndieFormalNF
components:
- type: SuitSensor
randomMode: false
mode: SensorOff
- type: Contraband
48 changes: 24 additions & 24 deletions Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
id: SyndicateNavalCaptainGearA
equipment:
head: ClothingHeadHatSyndieMAA
jumpsuit: ClothingUniformJumpsuitSyndieFormal
jumpsuit: ClothingUniformJumpsuitSyndieFormalNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackPython
neck: ClothingNeckScarfStripedSyndieRed
Expand All @@ -17,7 +17,7 @@
id: SyndicateNavalCaptainGearB
equipment:
head: ClothingHeadHatSyndieMAA
jumpsuit: ClothingUniformJumpsuitSyndieFormal
jumpsuit: ClothingUniformJumpsuitSyndieFormalNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackPython
neck: ClothingNeckScarfStripedSyndieRed
Expand All @@ -31,7 +31,7 @@
id: SyndicateNavalCaptainGearC
equipment:
head: ClothingHeadHatSyndieMAA
jumpsuit: ClothingUniformJumpsuitSyndieFormal
jumpsuit: ClothingUniformJumpsuitSyndieFormalNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackPython
neck: ClothingNeckScarfStripedSyndieRed
Expand All @@ -43,7 +43,7 @@
id: SyndicateNavalCaptainGearD
equipment:
head: ClothingHeadHatSyndieMAA
jumpsuit: ClothingUniformJumpsuitSyndieFormal
jumpsuit: ClothingUniformJumpsuitSyndieFormalNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackPython
neck: ClothingNeckScarfStripedSyndieRed
Expand All @@ -56,7 +56,7 @@
id: SyndicateNavalEngineerGearA
equipment:
head: ClothingHeadHatHardhatRed
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackShotgun
belt: ClothingBeltUtility
Expand All @@ -70,7 +70,7 @@
id: SyndicateNavalEngineerGearB
equipment:
head: ClothingHeadHatHardhatRed
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackShotgun
belt: ClothingBeltUtility
Expand All @@ -84,7 +84,7 @@
id: SyndicateNavalEngineerGearC
equipment:
head: ClothingHeadHatHardhatRed
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackShotgun
belt: ClothingBeltUtility
Expand All @@ -98,7 +98,7 @@
id: SyndicateNavalEngineerGearD
equipment:
head: ClothingHeadHatHardhatRed
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackShotgun
belt: ClothingBeltUtility
Expand All @@ -113,7 +113,7 @@
id: SyndicateNavalMedicGearA
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitParamedicSyndie
jumpsuit: ClothingUniformJumpsuitParamedicSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesCombat
belt: ClothingBeltMedical
Expand All @@ -128,7 +128,7 @@
id: SyndicateNavalMedicGearB
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitParamedicSyndie
jumpsuit: ClothingUniformJumpsuitParamedicSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesCombat
belt: ClothingBeltMedical
Expand All @@ -143,7 +143,7 @@
id: SyndicateNavalMedicGearC
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitParamedicSyndie
jumpsuit: ClothingUniformJumpsuitParamedicSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesCombat
belt: ClothingBeltMedical
Expand All @@ -158,7 +158,7 @@
id: SyndicateNavalMedicGearD
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitParamedicSyndie
jumpsuit: ClothingUniformJumpsuitParamedicSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesCombat
belt: ClothingBeltMedical
Expand All @@ -174,7 +174,7 @@
id: SyndicateNavalSecondOfficerGearA
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackLaserPistol
eyes: ClothingEyesGlassesSunglasses
Expand All @@ -189,7 +189,7 @@
id: SyndicateNavalSecondOfficerGearB
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackLaserPistol
eyes: ClothingEyesGlassesSunglasses
Expand All @@ -204,7 +204,7 @@
id: SyndicateNavalSecondOfficerGearC
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackLaserPistol
eyes: ClothingEyesGlassesSunglasses
Expand All @@ -219,7 +219,7 @@
id: SyndicateNavalSecondOfficerGearD
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndieNF
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesColorBlackLaserPistol
eyes: ClothingEyesGlassesSunglasses
Expand Down Expand Up @@ -407,7 +407,7 @@
equipment:
mask: ClothingMaskGasSyndicate
neck: BedsheetSyndie
jumpsuit: ClothingUniformJumpsuitSyndieFormal
jumpsuit: ClothingUniformJumpsuitSyndieFormalNF
outerClothing: ClothingOuterHardsuitSyndieEliteUnremoveable
head: ClothingHeadHelmetHardsuitSyndieEliteUnremoveable
gloves: ClothingHandsGlovesColorBlackAK
Expand All @@ -420,7 +420,7 @@
id: SyndicateNavalCommanderGearB
equipment:
mask: ClothingMaskGasSyndicate
jumpsuit: ClothingUniformJumpsuitSyndieFormal
jumpsuit: ClothingUniformJumpsuitSyndieFormalNF
outerClothing: ClothingOuterHardsuitSyndieEliteUnremoveable
head: ClothingHeadHelmetHardsuitSyndieEliteUnremoveable
gloves: ClothingHandsGlovesColorBlackAK
Expand All @@ -434,7 +434,7 @@
equipment:
mask: ClothingMaskGasSyndicate
neck: BedsheetSyndie
jumpsuit: ClothingUniformJumpsuitSyndieFormal
jumpsuit: ClothingUniformJumpsuitSyndieFormalNF
outerClothing: ClothingOuterHardsuitSyndieBloodRedUnremoveable
head: ClothingHeadHelmetHardsuitSyndieUnremoveable
gloves: ClothingHandsGlovesColorBlackAK
Expand All @@ -447,7 +447,7 @@
id: SyndicateNavalCommanderGearD
equipment:
mask: ClothingMaskGasSyndicate
jumpsuit: ClothingUniformJumpsuitSyndieFormal
jumpsuit: ClothingUniformJumpsuitSyndieFormalNF
outerClothing: ClothingOuterHardsuitSyndieBloodRedUnremoveable
head: ClothingHeadHelmetHardsuitSyndieUnremoveable
gloves: ClothingHandsGlovesColorBlackAK
Expand All @@ -461,7 +461,7 @@
id: SyndicateNavalDeckhandGearA
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndieNF
shoes: ClothingShoesBootsWork
outerClothing: ClothingOuterArmorBasic
gloves: ClothingHandsGlovesColorBlackPistol
Expand All @@ -473,7 +473,7 @@
id: SyndicateNavalDeckhandGearB
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndieNF
shoes: ClothingShoesBootsWork
outerClothing: ClothingOuterArmorBasic
gloves: ClothingHandsGlovesColorBlackPistol
Expand All @@ -485,7 +485,7 @@
id: SyndicateNavalDeckhandGearC
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndieNF
shoes: ClothingShoesBootsWork
outerClothing: ClothingOuterArmorBasic
gloves: ClothingHandsGlovesColorBlackPistol
Expand All @@ -497,7 +497,7 @@
id: SyndicateNavalDeckhandGearD
equipment:
head: ClothingHeadHatSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
jumpsuit: ClothingUniformJumpsuitRecruitSyndieNF
shoes: ClothingShoesBootsWork
outerClothing: ClothingOuterArmorBasic
gloves: ClothingHandsGlovesColorBlackPistol
Expand Down
Loading