Skip to content

Commit

Permalink
Disarms sec/command loadouts (#2329)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Removes roundstart guns and ammunition as well as stun batons
(telebatons and classic batons remain) from spawning loadouts for most
normal sec and command.

Will probably require some map updates to add now-missing gear.
## Why It's Good For The Game

Gives mappers more granular control over gear, requires players to
actually hoof it to their ship's armory lockers to gear up, and finally
ends the annoyance of having a random 9mm magazine that doesn't go with
any guns on your ship.

## Changelog

:cl:
del: Removed guns and ammo from sec spawn outfits
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Apogee-dev authored Sep 13, 2023
1 parent a693b07 commit 1ae8db4
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 22 deletions.
9 changes: 3 additions & 6 deletions code/modules/clothing/outfits/solgov.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,12 @@
ears = /obj/item/radio/headset/solgov/alt
gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/solgov/sonnensoldner
r_pocket = /obj/item/gun/ballistic/automatic/pistol/solgov
l_pocket = /obj/item/ammo_box/magazine/pistol556mm
r_pocket = null
l_pocket = null
shoes = /obj/item/clothing/shoes/workboots
back = /obj/item/storage/backpack
box = /obj/item/storage/box/survival
backpack_contents = list(/obj/item/crowbar/power,\
/obj/item/melee/baton/loaded=1,\
/obj/item/ammo_box/magazine/pistol556mm=2)
backpack_contents = list(/obj/item/crowbar/power)

/datum/outfit/job/solgov/representative
name = "Solarian Representative (SolGov)"
Expand Down Expand Up @@ -153,7 +151,6 @@
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
/obj/item/kitchen/knife/combat/survival=1,\
/obj/item/mining_voucher=1,\
/obj/item/stack/marker_beacon/ten=1)

backpack = /obj/item/storage/backpack/explorer
Expand Down
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/captain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
satchel = /obj/item/storage/backpack/satchel/
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger
backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/commander=1, /obj/item/clothing/accessory/medal/gold/captain=1, /obj/item/spacecash/bundle/c10000=1)
backpack_contents = list(/obj/item/clothing/accessory/medal/gold/captain=1, /obj/item/spacecash/bundle/c10000=1)

/datum/outfit/job/captain/inteq
name = "IRMG Vanguard (Inteq)"
Expand All @@ -212,7 +212,7 @@
accessory = null

courierbag = /obj/item/storage/backpack/messenger/inteq
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/ammo_box/magazine/co9mm=1, /obj/item/pda/captain)
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/pda/captain)

/datum/outfit/job/captain/inteq/naked
name = "IRMG Vanguard (Inteq) (Naked)"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/jobs/job_types/head_of_security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
gloves = /obj/item/clothing/gloves/color/black
head = /obj/item/clothing/head/HoS
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
suit_store = /obj/item/gun/energy/e_gun
suit_store = null
r_pocket = /obj/item/assembly/flash/handheld
l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list(/obj/item/melee/baton/loaded=1)
backpack_contents = list(/obj/item/melee/classic_baton=1)

backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
Expand Down Expand Up @@ -71,7 +71,7 @@
head = /obj/item/clothing/head/warden
suit = /obj/item/clothing/suit/armor/vest/syndie
id = /obj/item/card/id/syndicate_command/crew_id
backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/storage/box/survival/syndie=1)
backpack_contents = list(/obj/item/melee/classic_baton=1,/obj/item/storage/box/survival/syndie=1)

/datum/outfit/job/hos/nanotrasen
name = "Head of Security (Nanotrasen)"
Expand Down
10 changes: 7 additions & 3 deletions code/modules/jobs/job_types/security_officer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
shoes = /obj/item/clothing/shoes/jackboots
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/assembly/flash/handheld
backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/ammo_box/magazine/co9mm=1, /obj/item/gun_voucher=1) //WS edit - security rearming
backpack_contents = null //WS edit - security rearming // SHIPTEST EDIT - security re-disarming. certified whitesands moment.

backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
Expand Down Expand Up @@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
glasses = /obj/item/clothing/glasses/hud/diagnostic

backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/gun/ballistic/automatic/pistol/commander=1, /obj/item/restraints/handcuffs=1)
backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/restraints/handcuffs=1)

/datum/outfit/job/security/inteq
name = "IRMG Enforcer (Inteq)"
Expand All @@ -192,8 +192,10 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
gloves = /obj/item/clothing/gloves/combat

backpack = /obj/item/storage/backpack/messenger/inteq
satchel = /obj/item/storage/backpack/messenger/inteq
courierbag = /obj/item/storage/backpack/messenger/inteq
backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/ammo_box/magazine/co9mm=1, /obj/item/gun_voucher=1,/obj/item/pda/security)
backpack_contents = list(/obj/item/pda/security)

/datum/outfit/job/security/inteq/beluga
name = "IRMG Enforcer (Beluga)"
Expand All @@ -208,6 +210,8 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
glasses = null
gloves = /obj/item/clothing/gloves/color/evening

backpack = /obj/item/storage/backpack/messenger/inteq
satchel = /obj/item/storage/backpack/messenger/inteq
courierbag = /obj/item/storage/backpack/messenger/inteq
backpack_contents = list(/obj/item/pda/security)

Expand Down
4 changes: 0 additions & 4 deletions code/modules/jobs/job_types/shaft_miner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
/obj/item/kitchen/knife/combat/survival=1,\
/obj/item/mining_voucher=1,\
/obj/item/stack/marker_beacon/ten=1)

backpack = /obj/item/storage/backpack/explorer
Expand All @@ -54,7 +53,6 @@
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
/obj/item/kitchen/knife/combat/survival=1,
/obj/item/mining_voucher=1,
/obj/item/mining_scanner=1,
/obj/item/stack/marker_beacon/ten=1)
belt = /obj/item/gun/energy/kinetic_accelerator
Expand Down Expand Up @@ -154,7 +152,6 @@
backpack_contents = list(
/obj/item/flashlight/seclite=1,
/obj/item/kitchen/knife/combat/survival=1,
/obj/item/mining_voucher=1,
/obj/item/mining_scanner=1,
/obj/item/wrench=1
)
Expand All @@ -163,7 +160,6 @@
backpack_contents = list(
/obj/item/flashlight/seclite=1,
/obj/item/kitchen/knife/combat/survival=1,
/obj/item/mining_voucher=1,
/obj/item/stack/marker_beacon/ten=1,
/obj/item/borg/upgrade/modkit/aoe=1
)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/jobs/job_types/warden.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
r_pocket = /obj/item/assembly/flash/handheld
l_pocket = /obj/item/restraints/handcuffs
suit_store = /obj/item/gun/energy/e_gun/advtaser //WS edit - Readds tasers
backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/ammo_box/magazine/co9mm=1) //WS edit - free lethals
suit_store = null //WS edit - Readds tasers //SHIPTEST EDIT - removes tasers
backpack_contents = list(/obj/item/melee/classic_baton) //WS edit - free lethals // SHIPTEST EDIT - nope

backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
Expand Down Expand Up @@ -97,10 +97,10 @@
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
suit_store = /obj/item/gun/energy/disabler
suit_store = null

courierbag = /obj/item/storage/backpack/messenger/inteq
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/ammo_box/magazine/co9mm=1, /obj/item/pda/warden)
backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/pda/warden)

/datum/outfit/job/warden/nanotrasen
name = "Warden (Nanotrasen)"
Expand Down

0 comments on commit 1ae8db4

Please sign in to comment.