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

Cadet doesn't get a gun and SecOffs only gets the gun with non lethals #30

Merged
merged 11 commits into from
Sep 27, 2023
Merged

Cadet doesn't get a gun and SecOffs only gets the gun with non lethals #30

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
94b2110
Removes sec free gun on spawn
FluffiestFloof Sep 18, 2023
64e9274
Add additional comment
FluffiestFloof Sep 18, 2023
516e1a4
buh
FluffiestFloof Sep 18, 2023
a8b088e
Update after discussion
FluffiestFloof Sep 18, 2023
a2c5a25
Woops that was meant to be the cadet
FluffiestFloof Sep 18, 2023
11edced
Update comments
FluffiestFloof Sep 18, 2023
341aa9c
Merge branch 'master' into seclethals
FluffiestFloof Sep 19, 2023
f7bd92b
Merge branch 'master' into seclethals
FluffiestFloof Sep 21, 2023
6704d71
Merge branch 'master' into seclethals
FluffiestFloof Sep 25, 2023
9d26940
Merge branch 'master' into seclethals
FluffiestFloof Sep 27, 2023
e952c4d
Merge branch 'master' into seclethals
DebugOk Sep 27, 2023
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
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
contents:
- id: BoxSurvivalSecurity
- id: Flash
- id: MagazinePistol
# - id: MagazinePistol # DeltaV remove gun on spawn from Security

- type: entity
noSpawn: true
parent: ClothingBackpackSecurity
Expand Down Expand Up @@ -125,7 +125,7 @@
contents:
- id: BoxSurvivalSecurity
- id: Flash
- id: MagazinePistol
# - id: MagazinePistol # DeltaV remove gun on spawn from Security

- type: entity
noSpawn: true
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
contents:
- id: BoxSurvivalSecurity
- id: Flash
- id: MagazinePistol
# - id: MagazinePistol # DeltaV remove gun on spawn from Security

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelSecurity
Expand Down Expand Up @@ -134,7 +134,7 @@
contents:
- id: BoxSurvivalSecurity
- id: Flash
- id: MagazinePistol
# - id: MagazinePistol # DeltaV remove gun on spawn from Security

- type: entity
noSpawn: true
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
contents:
- id: BoxSurvivalSecurity
- id: Flash
- id: MagazinePistol
# - id: MagazinePistol # DeltaV remove gun on spawn from Security

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelSecurity
Expand Down Expand Up @@ -148,7 +148,7 @@
contents:
- id: BoxSurvivalSecurity
- id: Flash
- id: MagazinePistol
# - id: MagazinePistol # DeltaV remove gun on spawn from Security

- type: entity
noSpawn: true
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
outerClothing: ClothingOuterArmorBasic
id: SecurityCadetPDA
ears: ClothingHeadsetSecurity
pocket1: WeaponPistolMk58Nonlethal
# pocket1: WeaponPistolMk58Nonlethal # DeltaV remove gun on spawn from Security
innerclothingskirt: ClothingUniformJumpskirtColorRed
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
2 changes: 1 addition & 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 @@ -30,7 +30,7 @@
id: SecurityPDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
# pocket1: WeaponPistolMk58Nonlethal # DeltaV remove gun on spawn from Security
innerclothingskirt: ClothingUniformJumpskirtSec
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
id: SeniorOfficerPDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
# pocket1: WeaponPistolMk58Nonlethal # DeltaV remove gun on spawn from Security
innerclothingskirt: ClothingUniformJumpskirtSeniorOfficer
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
2 changes: 1 addition & 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 @@ -32,7 +32,7 @@
id: WardenPDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
# pocket1: WeaponPistolMk58Nonlethal # DeltaV remove gun on spawn from Security
innerclothingskirt: ClothingUniformJumpskirtWarden
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled