From 72a6ba4a0da3710bb20aa484c729513330bb0301 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 29 Mar 2021 13:18:05 -0300 Subject: [PATCH] Adds pockets to the security jackets (#11515) --- code/controllers/subsystems/traumas.dm | 6 ++--- .../crates_lockers/closets/secure/security.dm | 8 +++---- .../preference_setup/loadout/loadout_suit.dm | 24 +++++++++---------- code/modules/clothing/suits/jobs.dm | 18 +++++++------- code/modules/item_worth/worths_list.dm | 4 ++-- html/changelogs/alberyk-secjacket.yml | 6 +++++ 6 files changed, 36 insertions(+), 30 deletions(-) create mode 100644 html/changelogs/alberyk-secjacket.yml diff --git a/code/controllers/subsystems/traumas.dm b/code/controllers/subsystems/traumas.dm index 024cd769631..4074869a785 100644 --- a/code/controllers/subsystems/traumas.dm +++ b/code/controllers/subsystems/traumas.dm @@ -56,8 +56,8 @@ var/datum/controller/subsystem/traumas/SStraumas /obj/item/melee/baton, /obj/item/gun/energy/taser, /obj/item/handcuffs, /obj/item/clothing/glasses/sunglasses/sechud, /obj/machinery/door/airlock/security, /obj/item/clothing/under/rank/cadet, /obj/structure/sign/directions/security, /obj/item/clothing/head/bio_hood/security, /obj/item/clothing/head/bomb_hood/security, /obj/item/clothing/head/helmet/space/void/security, - /obj/item/clothing/head/softcap/security, /obj/item/clothing/suit/security, /obj/item/clothing/suit/bio_suit/security, - /obj/item/clothing/suit/bomb_suit/security, /obj/item/clothing/suit/security/officer, /obj/item/clothing/suit/space/void/security, + /obj/item/clothing/head/softcap/security, /obj/item/clothing/suit/storage/security, /obj/item/clothing/suit/bio_suit/security, + /obj/item/clothing/suit/bomb_suit/security, /obj/item/clothing/suit/storage/security/officer, /obj/item/clothing/suit/space/void/security, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/device/magnetic_lock/security,/obj/item/toy/figure/secofficer, /obj/item/gun/bang/sec, /obj/item/gun/projectile/sec, /obj/item/book/manual/wiki/security_space_law)), @@ -88,7 +88,7 @@ var/datum/controller/subsystem/traumas/SStraumas /obj/structure/banner, /obj/structure/bed/chair/office/bridge, /obj/item/clothing/head/collectable/captain, /obj/item/clothing/head/helmet/space/void/captain, /obj/item/clothing/suit/space/void/captain, /obj/item/clothing/suit/storage/hooded/wintercoat/captain, /obj/item/clothing/under/captainformal, /obj/item/clothing/under/rank/captain, /obj/item/toy/figure/captain, /obj/item/card/id/captains_spare, - /obj/item/gun/energy/captain, /obj/item/stamp/captain, /obj/item/storage/backpack/captain, /obj/item/clothing/suit/security)), + /obj/item/gun/energy/captain, /obj/item/stamp/captain, /obj/item/storage/backpack/captain, /obj/item/clothing/suit/storage/security)), "filth" = typecacheof(list(/obj/effect/decal/cleanable,/obj/effect/decal/remains,/obj/item/trash, /obj/machinery/portable_atmospherics/hydroponics)), diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 2fcdb9d091b..cbb0188b3ba 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -136,7 +136,7 @@ new /obj/item/clothing/head/beret/security/hos/corp(src) new /obj/item/clothing/head/hos/corp(src) new /obj/item/clothing/head/helmet/hos(src) - new /obj/item/clothing/suit/security/hos(src) + new /obj/item/clothing/suit/storage/security/hos(src) new /obj/item/clothing/accessory/badge/hos(src) new /obj/item/clothing/gloves/black_leather(src) new /obj/item/clothing/suit/storage/toggle/armor/hos(src) @@ -190,7 +190,7 @@ new /obj/item/clothing/head/beret/security/corp(src) new /obj/item/clothing/head/hos/corp(src) new /obj/item/clothing/head/helmet/hos(src) - new /obj/item/clothing/suit/security/hos(src) + new /obj/item/clothing/suit/storage/security/hos(src) //Tools new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src) new /obj/item/device/radio/headset/heads/hos(src) @@ -236,7 +236,7 @@ new /obj/item/clothing/head/beret/security/corp(src) new /obj/item/clothing/head/warden/corp(src) new /obj/item/clothing/head/helmet/security(src) - new /obj/item/clothing/suit/security/warden(src) + new /obj/item/clothing/suit/storage/security/warden(src) new /obj/item/clothing/accessory/badge/warden(src) new /obj/item/clothing/gloves/black_leather(src) //Tools @@ -323,7 +323,7 @@ new /obj/item/clothing/head/beret/security/corp(src) new /obj/item/clothing/head/softcap/security/corp(src) new /obj/item/clothing/head/helmet/security(src) - new /obj/item/clothing/suit/security/officer(src) + new /obj/item/clothing/suit/storage/security/officer(src) new /obj/item/clothing/accessory/badge/officer(src) new /obj/item/clothing/mask/gas/alt(src) //Tools diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index ae67540faab..7bdedaf1a7d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -218,41 +218,41 @@ /datum/gear/suit/secjacketofficer display_name = "security jacket selection (Security Officer)" - path = /obj/item/clothing/suit/security/officer + path = /obj/item/clothing/suit/storage/security/officer allowed_roles = list("Security Officer", "Head of Security", "Warden") /datum/gear/suit/secjacketofficer/New() ..() var/secjacket = list() - secjacket["security jacket"] = /obj/item/clothing/suit/security/officer - secjacket["security jacket, blue"] = /obj/item/clothing/suit/security/officer/blue - secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/security/officer/dnavy + secjacket["security jacket"] = /obj/item/clothing/suit/storage/security/officer + secjacket["security jacket, blue"] = /obj/item/clothing/suit/storage/security/officer/blue + secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/storage/security/officer/dnavy gear_tweaks += new/datum/gear_tweak/path(secjacket) /datum/gear/suit/secjacketwarden display_name = "security jacket selection (Warden)" - path = /obj/item/clothing/suit/security/warden + path = /obj/item/clothing/suit/storage/security/warden allowed_roles = list("Head of Security", "Warden") /datum/gear/suit/secjacketwarden/New() ..() var/secjacket = list() - secjacket["security jacket"] = /obj/item/clothing/suit/security/warden - secjacket["security jacket, blue"] = /obj/item/clothing/suit/security/warden/blue - secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/security/warden/dnavy + secjacket["security jacket"] = /obj/item/clothing/suit/storage/security/warden + secjacket["security jacket, blue"] = /obj/item/clothing/suit/storage/security/warden/blue + secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/storage/security/warden/dnavy gear_tweaks += new/datum/gear_tweak/path(secjacket) /datum/gear/suit/secjackethos display_name = "security jacket selection (Head of Security)" - path = /obj/item/clothing/suit/security/hos + path = /obj/item/clothing/suit/storage/security/hos allowed_roles = list("Head of Security") /datum/gear/suit/secjackethos/New() ..() var/secjacket = list() - secjacket["security jacket"] = /obj/item/clothing/suit/security/hos - secjacket["security jacket, blue"] = /obj/item/clothing/suit/security/hos/blue - secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/security/hos/dnavy + secjacket["security jacket"] = /obj/item/clothing/suit/storage/security/hos + secjacket["security jacket, blue"] = /obj/item/clothing/suit/storage/security/hos/blue + secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/storage/security/hos/dnavy gear_tweaks += new/datum/gear_tweak/path(secjacket) /datum/gear/suit/secjacketforensictech diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 0799676f6b2..aaf22fef08d 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -89,48 +89,48 @@ obj/item/clothing/suit/apron/overalls/blue //Security -/obj/item/clothing/suit/security/officer +/obj/item/clothing/suit/storage/security/officer name = "security officer's jacket" desc = "This jacket is for those special occasions when a security officer actually feels safe." icon_state = "officerjacket" item_state = "officerjacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/suit/security/officer/blue +/obj/item/clothing/suit/storage/security/officer/blue icon_state = "officerbluejacket" item_state = "officerbluejacket" -/obj/item/clothing/suit/security/officer/dnavy +/obj/item/clothing/suit/storage/security/officer/dnavy icon_state = "officerdnavyjacket" item_state = "officerdnavyjacket" -/obj/item/clothing/suit/security/warden +/obj/item/clothing/suit/storage/security/warden name = "warden's jacket" desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig." icon_state = "wardenjacket" item_state = "wardenjacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/suit/security/warden/blue +/obj/item/clothing/suit/storage/security/warden/blue icon_state = "wardenbluejacket" item_state = "wardenbluejacket" -/obj/item/clothing/suit/security/warden/dnavy +/obj/item/clothing/suit/storage/security/warden/dnavy icon_state = "wardendnavyjacket" item_state = "wardendnavyjacket" -/obj/item/clothing/suit/security/hos +/obj/item/clothing/suit/storage/security/hos name = "head of security's jacket" desc = "This piece of clothing was specifically designed for asserting superior authority." icon_state = "hosjacket" item_state = "hosjacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/suit/security/hos/blue +/obj/item/clothing/suit/storage/security/hos/blue icon_state = "hosbluejacket" item_state = "hosbluejacket" -/obj/item/clothing/suit/security/hos/dnavy +/obj/item/clothing/suit/storage/security/hos/dnavy icon_state = "hosdnavyjacket" item_state = "hosdnavyjacket" diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index 8349c1f4a21..2040cd0b096 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -494,12 +494,12 @@ var/list/worths = list( /obj/item/clothing/suit/armor/reactive = 5000, /obj/item/clothing/suit/armor/centcomm = 2000, /obj/item/clothing/suit/armor/heavy = 1000, - /obj/item/clothing/suit/security/hos = 100, + /obj/item/clothing/suit/storage/security/hos = 100, /obj/item/clothing/suit/armor/tactical = 1500, /obj/item/clothing/suit/armor = 500, /obj/item/clothing/suit/bio_suit = 150, /obj/item/clothing/suit/captunic/capjacket = 100, - /obj/item/clothing/suit/security/hos/dnavy = 80, + /obj/item/clothing/suit/storage/security/hos/dnavy = 80, /obj/item/clothing/suit/storage/hazardvest = 60, /obj/item/clothing/suit/storage/toggle/labcoat = 55, /obj/item/clothing/suit/armor/riot/laser_tag = 125, diff --git a/html/changelogs/alberyk-secjacket.yml b/html/changelogs/alberyk-secjacket.yml new file mode 100644 index 00000000000..7e3fb14393b --- /dev/null +++ b/html/changelogs/alberyk-secjacket.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added pockets to the securiy jackets in the loadout."