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

Sec Shades Returns to Staff #626

Closed
wants to merge 9 commits into from
Closed

Sec Shades Returns to Staff #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
981334a
Sec Shades Returns to Staff
ps3moira Dec 31, 2023
93dba13
Merge branch 'master' into Sec-Shades-Returns
ps3moira Dec 31, 2023
01a37bc
Merge branch 'master' into Sec-Shades-Returns
ps3moira Dec 31, 2023
8be2baa
Merge branch 'master' into Sec-Shades-Returns
ps3moira Jan 3, 2024
63b25bf
Merge branch 'master' into Sec-Shades-Returns
ps3moira Jan 3, 2024
a1327eb
Merge branch 'master' into Sec-Shades-Returns
ps3moira Jan 8, 2024
4a7e163
Update security.yml
ps3moira Jan 10, 2024
3be0f78
Merge branch 'master' into Sec-Shades-Returns
ps3moira Jan 14, 2024
4693617
Merge branch 'master' into Sec-Shades-Returns
ps3moira Jan 15, 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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: HoloprojectorSecurity
- id: ClothingEyesHudSecurity
- id: ClothingEyesHudSecurity #Delta-V: Sechud Scarcity
Copy link
Contributor

Choose a reason for hiding this comment

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

So what exactly is getting changed besides the comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Originally, I had it removed. It ended up causing some issues and I'm currently working on trying to fix it.

- id: BoxPDAPrisoner # Delta-V
- id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots

Expand Down Expand Up @@ -92,7 +92,7 @@
- id: ClothingShoesBootsJack
- id: WeaponMeleeNeedle
prob: 0.1
- id: ClothingEyesHudSecurity
- id: ClothingEyesHudSecurity #Delta-V: Sechud Scarcity
Copy link
Contributor

Choose a reason for hiding this comment

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

Same deal here


- type: entity
id: LockerBrigmedicFilled
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
back: ClothingBackpackHOSFilled
shoes: ClothingShoesBootsCombatFilled
outerClothing: ClothingOuterCoatHoSTrench
eyes: ClothingEyesGlassesSunglasses
eyes: ClothingEyesGlassesSecurity # Delta-V: Replaced Regular Sunglasses
# eyes: ClothingEyesGlassesSunglasses # Delta-V: Replaced
Copy link
Contributor

Choose a reason for hiding this comment

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

Just replace the entire line and say you replaced it, this doesnt help

head: ClothingHeadHatBeretHoS
id: HoSPDA
gloves: ClothingHandsGlovesCombat
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
jumpsuit: ClothingUniformJumpsuitSec
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsCombatFilled
eyes: ClothingEyesGlassesSunglasses
eyes: ClothingEyesGlassesSecurity # Delta-V: Replaced Regular Sunglasses
# eyes: ClothingEyesGlassesSunglasses # Delta-V: Replaced
head: ClothingHeadHelmetBasic
outerClothing: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier
id: SecurityPDA
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Security/warden.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
jumpsuit: ClothingUniformJumpsuitWarden
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsCombatFilled
eyes: ClothingEyesGlassesSunglasses
eyes: ClothingEyesGlassesSecurity # Delta-V: Replaced Regular Sunglasses
# eyes: ClothingEyesGlassesSunglasses # Delta-V: Replaced
outerClothing: ClothingOuterCoatWarden
id: WardenPDA
ears: ClothingHeadsetSecurity
Expand Down
Loading