diff --git a/code/controllers/subsystems/traumas.dm b/code/controllers/subsystems/traumas.dm index 388fd21e429..024cd769631 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/armor/vest/security, /obj/item/clothing/suit/bio_suit/security, - /obj/item/clothing/suit/bomb_suit/security, /obj/item/clothing/suit/security/navyofficer, /obj/item/clothing/suit/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/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/armor/vest/security)), + /obj/item/gun/energy/captain, /obj/item/stamp/captain, /obj/item/storage/backpack/captain, /obj/item/clothing/suit/security)), "filth" = typecacheof(list(/obj/effect/decal/cleanable,/obj/effect/decal/remains,/obj/item/trash, /obj/machinery/portable_atmospherics/hydroponics)), diff --git a/code/datums/outfits/event/outfit_nanotrasen.dm b/code/datums/outfits/event/outfit_nanotrasen.dm index 01823fed2c0..19877d114ba 100644 --- a/code/datums/outfits/event/outfit_nanotrasen.dm +++ b/code/datums/outfits/event/outfit_nanotrasen.dm @@ -193,7 +193,7 @@ name = "FIB Agent" uniform = /obj/item/clothing/under/rank/fib - suit = /obj/item/clothing/suit/storage/fib + suit = /obj/item/clothing/suit/storage/toggle/fib gloves = /obj/item/clothing/gloves/black l_pocket = /obj/item/reagent_containers/spray/pepper diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index 4236f868f52..b2719a5059f 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -232,13 +232,13 @@ /obj/item/clothing/suit/apron/overalls/random, /obj/item/clothing/suit/captunic/capjacket, /obj/item/clothing/suit/ianshirt, - /obj/item/clothing/suit/storage/fib, + /obj/item/clothing/suit/storage/toggle/fib, /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat/red, /obj/item/clothing/suit/storage/hooded/wintercoat/miner, /obj/item/clothing/suit/storage/leathercoat, - /obj/item/clothing/suit/storage/vest/csi, + /obj/item/clothing/suit/storage/vest/ft, /obj/item/clothing/suit/storage/toggle/dominia/bomber, /obj/item/clothing/suit/storage/toggle/dominia/gold, /obj/item/clothing/suit/storage/toggle/flannel, diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index bb353c77ae1..0ecc6923356 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -298,4 +298,4 @@ tab_pda = /obj/item/modular_computer/handheld/pda/security wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security - tablet = /obj/item/modular_computer/handheld/preset/security \ No newline at end of file + tablet = /obj/item/modular_computer/handheld/preset/security 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 df5f5834a62..9411185e338 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -118,20 +118,24 @@ //Supply new /obj/item/storage/box/flashbangs(src) //Appearance - new /obj/item/storage/backpack/security(src) - new /obj/item/storage/backpack/satchel_sec(src) - new /obj/item/clothing/under/rank/head_of_security(src) - new /obj/item/clothing/under/rank/head_of_security/corp(src) - new /obj/item/clothing/suit/storage/toggle/armor/hos(src) - new /obj/item/clothing/suit/armor/hos(src) + if(prob(50)) + new /obj/item/storage/backpack/security(src) + else + new /obj/item/storage/backpack/satchel_sec(src) new /obj/item/clothing/suit/storage/vest/hos(src) - new /obj/item/clothing/head/hos/cap(src) - new /obj/item/clothing/head/hos/cap/alt(src) + if(prob(50)) + new /obj/item/clothing/under/rank/head_of_security(src) + new /obj/item/clothing/head/beret/security/hos(src) + new /obj/item/clothing/head/hos(src) + else + new /obj/item/clothing/under/rank/head_of_security/corp(src) + 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/head/beret/security/hos(src) - new /obj/item/clothing/head/beret/security/hos/alt(src) + new /obj/item/clothing/suit/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) //Tools new /obj/item/device/radio/headset/heads/hos(src) new /obj/item/device/radio/headset/heads/hos/alt(src) @@ -165,16 +169,21 @@ /obj/structure/closet/secure_closet/hos2/fill() //Appearance - new /obj/item/storage/backpack/security(src) - new /obj/item/storage/backpack/satchel_sec(src) - new /obj/item/clothing/under/rank/head_of_security(src) - new /obj/item/clothing/under/rank/head_of_security/corp(src) + if(prob(50)) + new /obj/item/storage/backpack/security(src) + else + new /obj/item/storage/backpack/satchel_sec(src) new /obj/item/clothing/suit/storage/vest/hos(src) - new /obj/item/clothing/head/beret/security/hos(src) - new /obj/item/clothing/head/beret/security/hos/alt(src) - new /obj/item/clothing/head/hos/cap(src) - new /obj/item/clothing/head/hos/cap/alt(src) + if(prob(50)) // chance to spawn either corporate or regular outfit. to prevent locker bloat which makes it lag when right clicked + new /obj/item/clothing/under/rank/head_of_security(src) + new /obj/item/clothing/head/beret/security/hos(src) + new /obj/item/clothing/head/hos(src) + else + new /obj/item/clothing/under/rank/head_of_security/corp(src) + 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) //Tools new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src) new /obj/item/device/radio/headset/heads/hos(src) @@ -206,15 +215,19 @@ else new /obj/item/storage/backpack/satchel_sec(src) new /obj/item/clothing/suit/storage/vest/warden(src) - new /obj/item/clothing/under/rank/warden(src) - new /obj/item/clothing/under/rank/warden/corp(src) - new /obj/item/clothing/suit/armor/vest/warden(src) - new /obj/item/clothing/suit/armor/vest/warden/commissar(src) - new /obj/item/clothing/head/beret/security/warden(src) - new /obj/item/clothing/head/warden/commissar(src) - new /obj/item/clothing/head/warden(src) - new /obj/item/clothing/head/warden/alt(src) + if(prob(50)) + if(prob(50)) + new /obj/item/clothing/under/rank/warden(src) + else + new /obj/item/clothing/under/rank/warden/blue(src) + new /obj/item/clothing/head/beret/security/warden(src) + new /obj/item/clothing/head/warden(src) + else + new /obj/item/clothing/under/rank/warden/corp(src) + new /obj/item/clothing/head/beret/security/corp(src) + new /obj/item/clothing/head/warden/corp(src) new /obj/item/clothing/head/helmet(src) + new /obj/item/clothing/suit/security/warden(src) new /obj/item/clothing/accessory/badge/warden(src) new /obj/item/clothing/gloves/black_leather(src) //Tools @@ -251,6 +264,7 @@ else new /obj/item/storage/backpack/satchel_sec(src) new /obj/item/clothing/head/beret/security(src) + new /obj/item/clothing/head/softcap/security(src) new /obj/item/clothing/suit/storage/hazardvest/cadet(src) new /obj/item/clothing/under/rank/cadet(src) //Tools @@ -285,11 +299,20 @@ new /obj/item/storage/backpack/security(src) else new /obj/item/storage/backpack/satchel_sec(src) - new /obj/item/clothing/head/softcap/security/corp(src) - new /obj/item/clothing/head/beret/security/corp(src) - new /obj/item/clothing/under/rank/security/corp(src) new /obj/item/clothing/suit/storage/vest/officer(src) + if(prob(50)) + if(prob(50)) + new /obj/item/clothing/under/rank/security(src) + else + new /obj/item/clothing/under/rank/security/blue(src) + new /obj/item/clothing/head/beret/security/officer(src) + new /obj/item/clothing/head/softcap/security(src) + else + new /obj/item/clothing/under/rank/security/corp(src) + new /obj/item/clothing/head/beret/security/corp(src) + new /obj/item/clothing/head/softcap/security/corp(src) new /obj/item/clothing/head/helmet(src) + new /obj/item/clothing/suit/security/officer(src) new /obj/item/clothing/accessory/badge/officer(src) new /obj/item/clothing/mask/gas/alt(src) //Tools @@ -375,9 +398,9 @@ /obj/structure/closet/secure_closet/csi/fill() //Appearance - new /obj/item/clothing/suit/storage/forensics/blue(src) - new /obj/item/clothing/suit/storage/forensics/red(src) - new /obj/item/clothing/suit/storage/vest/csi(src) + new /obj/item/clothing/gloves/black(src) + new /obj/item/clothing/suit/storage/toggle/forensics(src) + new /obj/item/clothing/suit/storage/vest/ft(src) new /obj/item/clothing/under/det/forensics(src) new /obj/item/clothing/under/det/black(src) new /obj/item/clothing/under/det/classic(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index f31ec72ddcf..f1bd3d18120 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -21,6 +21,7 @@ bandanas["bandana, red"] = /obj/item/clothing/head/bandana/red bandanas["bandana, captain"] = /obj/item/clothing/head/bandana/captain bandanas["bandana, security"] = /obj/item/clothing/head/bandana/security + bandanas["bandana, security (corporate)"] = /obj/item/clothing/head/bandana/security/corp bandanas["bandana, science"] = /obj/item/clothing/head/bandana/science bandanas["bandana, medical"] = /obj/item/clothing/head/bandana/medical bandanas["bandana, engineering"] = /obj/item/clothing/head/bandana/engineering @@ -51,6 +52,7 @@ softcaps["softcap, red"] = /obj/item/clothing/head/softcap/red softcaps["softcap, captain"] = /obj/item/clothing/head/softcap/captain softcaps["softcap, security"] = /obj/item/clothing/head/softcap/security + softcaps["softcap, security (corporate)"] = /obj/item/clothing/head/softcap/security/corp softcaps["softcap, science"] = /obj/item/clothing/head/softcap/science softcaps["softcap, medical"] = /obj/item/clothing/head/softcap/medical softcaps["softcap, engineering"] = /obj/item/clothing/head/softcap/engineering @@ -80,6 +82,7 @@ berets["beret, red"] = /obj/item/clothing/head/beret/red berets["beret, captain"] = /obj/item/clothing/head/beret/captain berets["beret, security"] = /obj/item/clothing/head/beret/security + berets["beret, security (corporate)"] = /obj/item/clothing/head/beret/security/corp berets["beret, science"] = /obj/item/clothing/head/beret/science berets["beret, medical"] = /obj/item/clothing/head/beret/medical berets["beret, engineering"] = /obj/item/clothing/head/beret/engineering @@ -105,10 +108,10 @@ /datum/gear/head/warden/New() ..() var/wardenhead = list() - wardenhead["blue warden hat"] = /obj/item/clothing/head/warden - wardenhead["black warden hat"] = /obj/item/clothing/head/warden/alt - wardenhead["commissar's cap"] = /obj/item/clothing/head/warden/commissar - wardenhead["warden beret"] = /obj/item/clothing/head/beret/security/warden + wardenhead["warden hat, standard"] = /obj/item/clothing/head/warden + wardenhead["warden hat, corporate"] = /obj/item/clothing/head/warden/corp + wardenhead["warden beret, standard"] = /obj/item/clothing/head/beret/security/warden + wardenhead["warden beret, corporate"] = /obj/item/clothing/head/beret/security/warden/corp gear_tweaks += new/datum/gear_tweak/path(wardenhead) /datum/gear/head/hos @@ -120,22 +123,12 @@ /datum/gear/head/hos/New() ..() var/hoshead = list() - hoshead["blue commander beret"] = /obj/item/clothing/head/beret/security/hos - hoshead["black commander beret"] = /obj/item/clothing/head/beret/security/hos/alt - hoshead["blue commander hat"] = /obj/item/clothing/head/hos/cap - hoshead["black commander hat"] = /obj/item/clothing/head/hos/cap/alt + hoshead["head of security hat, standard"] = /obj/item/clothing/head/hos + hoshead["head of security hat, corporate"] = /obj/item/clothing/head/hos/corp + hoshead["head of security beret, standard"] = /obj/item/clothing/head/beret/security/hos + hoshead["head of security beret, corporate"] = /obj/item/clothing/head/beret/security/hos/corp gear_tweaks += new/datum/gear_tweak/path(hoshead) -/datum/gear/head/corp - display_name = "cap, corporate (security)" - path = /obj/item/clothing/head/softcap/security/corp - allowed_roles = list("Security Officer","Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",) - -/datum/gear/head/sec - display_name = "cap, security" - path = /obj/item/clothing/head/softcap/security - allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",) - /datum/gear/head/hardhat display_name = "hardhat selection" path = /obj/item/clothing/head/hardhat diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 1cca87f102e..51a5329bd59 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -201,21 +201,58 @@ wintercoat["winter coat, mining"] = /obj/item/clothing/suit/storage/hooded/wintercoat/miner gear_tweaks += new/datum/gear_tweak/path(wintercoat) -/datum/gear/suit/secjacket - display_name = "navy security jacket (Security Officer)" - path = /obj/item/clothing/suit/security/navyofficer +/datum/gear/suit/secjacketofficer + display_name = "security jacket selection (Security Officer)" + path = /obj/item/clothing/suit/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 + gear_tweaks += new/datum/gear_tweak/path(secjacket) + /datum/gear/suit/secjacketwarden - display_name = "navy security jacket (Warden)" - path = /obj/item/clothing/suit/security/navywarden + display_name = "security jacket selection (Warden)" + path = /obj/item/clothing/suit/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 + gear_tweaks += new/datum/gear_tweak/path(secjacket) + /datum/gear/suit/secjackethos - display_name = "navy security jacket (Head of Security)" - path = /obj/item/clothing/suit/security/navyhos + display_name = "security jacket selection (Head of Security)" + path = /obj/item/clothing/suit/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 + gear_tweaks += new/datum/gear_tweak/path(secjacket) + +/datum/gear/suit/secjacketforensictech + display_name = "security jacket selection (Forensic Technician)" + path = /obj/item/clothing/suit/storage/toggle/forensics + allowed_roles = list("Forensic Technician") + +/datum/gear/suit/secjacketforensictech/New() + ..() + var/secjacket = list() + secjacket["security jacket"] = /obj/item/clothing/suit/storage/toggle/forensics + secjacket["security jacket, blue"] = /obj/item/clothing/suit/storage/toggle/forensics/blue + secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/storage/toggle/forensics/dnavy + gear_tweaks += new/datum/gear_tweak/path(secjacket) + /datum/gear/suit/dominia_cape display_name = "dominian cape" path = /obj/item/clothing/accessory/poncho/dominia_cape @@ -353,4 +390,4 @@ /datum/gear/suit/gadpathur display_name = "gadpathurian overcoat" path = /obj/item/clothing/suit/storage/gadpathur - flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file + flags = GEAR_HAS_DESC_SELECTION diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index fa9b198c984..593db51462b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -284,7 +284,7 @@ var/uniform = list() uniform["warden uniform, standard"] = /obj/item/clothing/under/rank/warden uniform["warden uniform, corporate"] = /obj/item/clothing/under/rank/warden/corp - uniform["warden uniform, dark blue"] = /obj/item/clothing/under/rank/warden/dark_blue + uniform["warden uniform, blue"] = /obj/item/clothing/under/rank/warden/blue gear_tweaks += new/datum/gear_tweak/path(uniform) /datum/gear/uniform/hos @@ -333,4 +333,4 @@ /datum/gear/uniform/gadpathur display_name = "gadpathurian fatigues" path = /obj/item/clothing/under/uniform/gadpathur - flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file + flags = GEAR_HAS_DESC_SELECTION diff --git a/code/modules/clothing/head/bandanas.dm b/code/modules/clothing/head/bandanas.dm index ae62a802af0..322218d3b4f 100644 --- a/code/modules/clothing/head/bandanas.dm +++ b/code/modules/clothing/head/bandanas.dm @@ -82,3 +82,11 @@ desc = "It's a janitor bandana with some fine nanotech lining. For the viscera cleaners of today!" icon_state = "bandana_janitor" item_state = "bandana_janitor" + +// Corporate. + +/obj/item/clothing/head/bandana/security/corp + name = "corporate security bandana" + desc = "It's a security bandana with some fine nanotech lining. Who knew a do-rag could be so oppresive?" + icon_state = "corp" + item_state = "corp" diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index 0d492c6c09f..f2d66884833 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -83,7 +83,7 @@ icon_state = "beret_janitor" item_state = "beret_janitor" -// alt. sec stuff, because security needs berets for every link in the chain of command +// alt. sec stuff, because security needs berets for every link in the chain of command for some reason /obj/item/clothing/head/beret/security/officer name = "officer beret" @@ -92,13 +92,13 @@ item_state = "beret_officer" /obj/item/clothing/head/beret/security/hos - name = "blue commander beret" - desc = "A beret in security navy blue beret with a commander's rank emblem. For heads of security that are more inclined towards style than safety." + name = "commander beret" + desc = "A beret in security navy blue with a commander's rank emblem. For heads of security that are more inclined towards style than safety." icon_state = "beret_hos" item_state = "beret_hos" -/obj/item/clothing/head/beret/security/hos/alt - name = "black commander beret" +/obj/item/clothing/head/beret/security/hos/corp + name = "corporate commander beret" desc = "A beret in corporate black with a commander's rank emblem. For heads of security that are more inclined towards style than safety." icon_state = "corp" item_state = "corp" @@ -109,6 +109,12 @@ icon_state = "beret_warden" item_state = "beret_warden" +/obj/item/clothing/head/beret/security/warden/corp + name = "corporate warden beret" + desc = "A beret in corporate black with a warden's rank emblem. For wardens that are more inclined towards style than safety." + icon_state = "corp" + item_state = "corp" + // Corporate. /obj/item/clothing/head/beret/security/corp diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 0c3547e3d0b..6f99a3faf7a 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -67,28 +67,31 @@ desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it." /obj/item/clothing/head/warden - name = "blue warden hat" - desc = "A navy blue warden hat. For showing who is in charge of the brig." - icon_state = "wardencap" + name = "warden hat" + desc = "A blue warden hat. For showing who is in charge of the brig." + icon = 'icons/obj/clothing/hats/security.dmi' + icon_state = "warden" + item_state = "warden" flags_inv = HIDEEARS + contained_sprite = TRUE -/obj/item/clothing/head/warden/alt - name = "black warden hat" - desc = "A black warden hat. For showing who is in charge of the brig." - icon_state = "wardencap_alt" +/obj/item/clothing/head/warden/corp + name = "corporate warden hat" + desc = "A black warden parade hat. For showing who is in charge of the brig." + icon_state = "corp" + item_state = "corp" -/obj/item/clothing/head/warden/commissar - name = "commissar's cap" - desc = "A security commissar's cap." - icon_state = "commissarcap" - -/obj/item/clothing/head/hos/cap - name = "blue commander hat" - desc = "The navy blue hat of the Head of Security. For showing the officers who's in charge." - icon_state = "hoscap" +/obj/item/clothing/head/hos + name = "head of security hat" + desc = "The navy blue parade hat of the Head of Security. For showing the officers who's in charge." + icon = 'icons/obj/clothing/hats/security.dmi' + icon_state = "hos" + item_state = "hos" flags_inv = HIDEEARS + contained_sprite = TRUE -/obj/item/clothing/head/hos/cap/alt - name = "black commander hat" - desc = "The black hat of the Head of Security. For showing the officers who's in charge." - icon_state = "hoscap_alt" +/obj/item/clothing/head/hos/corp + name = "corporate head of security hat" + desc = "The black parade hat of the Head of Security. For showing the officers who's in charge." + icon_state = "corp" + item_state = "corp" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 8a109443abe..6b4c2de26ee 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -65,41 +65,12 @@ blood_overlay_type = "armor" armor = list(melee = 50, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0) -/obj/item/clothing/suit/armor/vest/security - name = "security armor" - desc = "An armored vest that protects against some damage. This one has a corporate badge." - icon_state = "armorsec" - item_state = "armor" - -/obj/item/clothing/suit/armor/vest/warden - name = "warden's jacket" - desc = "An armored jacket with silver rank pips and livery." - icon_state = "warden_jacket" - item_state = "warden_jacket" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - pocket_slots = 4//Jackets have more slots - -/obj/item/clothing/suit/armor/vest/warden/commissar - name = "commissar's jacket" - desc = "An tasteful dark blue jacket with silver and white highlights. Has hard-plate inserts for armor." - icon_state = "commissar_warden" - item_state = "commissar_warden" - /obj/item/clothing/suit/armor/vest/fib name = "\improper FIB armored vest" desc = "An armored vest used by Federal Investigations Bureau agents during operations." icon_state = "fib_armor" item_state = "fib_armor" -/obj/item/clothing/suit/armor/hos - name = "head of security's jacket" - desc = "An armored jacket with golden rank pips and livery." - icon_state = "hos" - item_state = "hos" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - armor = list(melee = 65, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0) - pocket_slots = 4//More slots because coat - /obj/item/clothing/suit/storage/toggle/armor/hos name = "armored trenchcoat" desc = "A trenchcoat lined with a protective alloy and some slick leather." @@ -194,15 +165,6 @@ body_parts_covered = UPPER_TORSO|ARMS pocket_slots = 4//coat, so more slots -/obj/item/clothing/suit/armor/det_suit - name = "armor" - desc = "An armored vest with a detective's badge on it." - icon_state = "detective-armor" - item_state = "armor" - blood_overlay_type = "armor" - body_parts_covered = UPPER_TORSO|LOWER_TORSO - armor = list(melee = 50, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0) - //Reactive armor //When the wearer gets hit, this armor will teleport the user a short distance away (to safety or to more danger, no one knows. That's the fun of it!) /obj/item/clothing/suit/armor/reactive @@ -391,19 +353,19 @@ /obj/item/clothing/suit/storage/vest/detective name = "detective armor vest" - desc = "A simple kevlar plate carrier in a vintage brown, it has a detective's badge clipped to the chest." + desc = "A simple kevlar plate carrier belonging to Nanotrasen. This one has a detective's badge clipped to the chest." icon_state = "detectivevest_nobadge" item_state = "detectivevest_nobadge" icon_badge = "detectivevest_badge" icon_nobadge = "detectivevest_nobadge" -/obj/item/clothing/suit/storage/vest/csi +/obj/item/clothing/suit/storage/vest/ft name = "forensic technician armor vest" desc = "A simple kevlar plate carrier belonging to Nanotrasen. This one has a forensic technician's badge clipped to the chest." - icon_state = "csivest_nobadge" - item_state = "csivest_nobadge" - icon_badge = "csivest_badge" - icon_nobadge = "csivest_nobadge" + icon_state = "forensictech_nobadge" + item_state = "forensictech_nobadge" + icon_badge = "forensictech_badge" + icon_nobadge = "forensictech_nobadge" /obj/item/clothing/suit/storage/hazardvest/cadet name = "cadet hazard vest" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index a6cc8fad029..c6153ea2f33 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -81,73 +81,90 @@ obj/item/clothing/suit/apron/overalls/blue body_parts_covered = 0 //Security -/obj/item/clothing/suit/security/navyofficer + +/obj/item/clothing/suit/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 icon_state = "officerbluejacket" item_state = "officerbluejacket" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/suit/security/navywarden +/obj/item/clothing/suit/security/officer/dnavy + icon_state = "officerdnavyjacket" + item_state = "officerdnavyjacket" + +/obj/item/clothing/suit/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 = "wardenbluejacket" - item_state = "wardenbluejacket" + icon_state = "wardenjacket" + item_state = "wardenjacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/suit/security/navyhos +/obj/item/clothing/suit/security/warden/blue + icon_state = "wardenbluejacket" + item_state = "wardenbluejacket" + +/obj/item/clothing/suit/security/warden/dnavy + icon_state = "wardendnavyjacket" + item_state = "wardendnavyjacket" + +/obj/item/clothing/suit/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 icon_state = "hosbluejacket" item_state = "hosbluejacket" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + +/obj/item/clothing/suit/security/hos/dnavy + icon_state = "hosdnavyjacket" + item_state = "hosdnavyjacket" //Detective /obj/item/clothing/suit/storage/det_jacket name = "detective's jacket" - desc = "Stylish yet comfortable professional jacket manufactured by CL corporation for NT detectives. Unique fiber structure will offer moderate protection from various hazards investigators may encounter in the line of duty." + desc = "Stylish yet comfortable professional jacket manufactured by CL corporation for NT detectives." icon_state = "det_jacket" item_state = "det_jacket" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder) - armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.7 /obj/item/clothing/suit/storage/toggle/det_trench name = "brown trenchcoat" - desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration!" + desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Perfect for your next act of autodefenestration!" icon_state = "detective" item_state = "detective" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS - allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder) - armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.7 - + allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder) /obj/item/clothing/suit/storage/toggle/det_trench/black name = "black trenchcoat" icon_state = "detective2" //Forensics -/obj/item/clothing/suit/storage/forensics - name = "jacket" - desc = "A forensics technician jacket." - item_state = "det_suit" +/obj/item/clothing/suit/storage/toggle/forensics + name = "forensic technician's jacket" + desc = "A jacket for the slick, on the beat sleuth." + icon_state = "forensics" + item_state = "forensics" body_parts_covered = UPPER_TORSO|ARMS - allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/taperecorder) - armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/suit/storage/forensics/red - name = "red jacket" - desc = "A red forensics technician jacket." - icon_state = "forensics_red" +/obj/item/clothing/suit/storage/toggle/forensics/blue + icon_state = "forensicsblue" + item_state = "forensicsblue" -/obj/item/clothing/suit/storage/forensics/blue - name = "blue jacket" - desc = "A blue forensics technician jacket." - icon_state = "forensics_blue" +/obj/item/clothing/suit/storage/toggle/forensics/dnavy + icon_state = "forensicsdnavy" + item_state = "forensicsdnavy" //Engineering /obj/item/clothing/suit/storage/hazardvest diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index bde567292a4..e2663fe8625 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -57,13 +57,6 @@ fire_resist = T0C+5200 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/suit/johnny_coat - name = "johnny~~ coat" - desc = "Johnny~~" - icon_state = "johnny" - item_state = "johnny" - - /obj/item/clothing/suit/justice name = "justice suit" desc = "This pretty much looks ridiculous." @@ -509,7 +502,7 @@ icon_state = "serv_dep_jacket" item_state = "serv_dep_jacket" -/obj/item/clothing/suit/storage/fib +/obj/item/clothing/suit/storage/toggle/fib name = "\improper FIB agent jacket" desc = "A jacket used by Federal Investigations Bureau agents while on the field." icon_state = "fib_jacket" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 144dc6d3fb3..391058b195f 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -45,9 +45,9 @@ icon_state = "warden_corporate" worn_state = "warden_corporate" -/obj/item/clothing/under/rank/warden/dark_blue - icon_state = "warden_darkblue" - worn_state = "warden_darkblue" +/obj/item/clothing/under/rank/warden/blue + icon_state = "warden_blue" + worn_state = "warden_blue" /obj/item/clothing/under/rank/warden/remote name = "remote warden's uniform" diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index 57ef122015f..b4d35b30a78 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -495,12 +495,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/armor/hos = 1000, + /obj/item/clothing/suit/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/navyhos = 80, + /obj/item/clothing/suit/security/hos/dnavy = 80, /obj/item/clothing/suit/storage/hazardvest = 60, /obj/item/clothing/suit/storage/toggle/labcoat = 55, /obj/item/clothing/suit/bluetag = 20, @@ -524,8 +524,8 @@ var/list/worths = list( /obj/item/clothing/head/helmet/gladiator = 300, /obj/item/clothing/head/helmet/ert = 1000, /obj/item/clothing/head/helmet/hos = 800, - /obj/item/clothing/head/hos/cap = 100, - /obj/item/clothing/head/hos/cap/alt = 100, + /obj/item/clothing/head/hos = 100, + /obj/item/clothing/head/hos/corp = 100, /obj/item/clothing/head/helmet = 250, /obj/item/clothing/head/culthood = 150, /obj/item/clothing/head/caphat/hop = 100, @@ -885,4 +885,3 @@ var/list/worths = list( /obj/vehicle/bike = 1500, /obj/vehicle = 1000 ) //Must be in descending order. Child before parents, otherwise it doesn't work., - diff --git a/html/changelogs/wezzy_securitytweaks.yml b/html/changelogs/wezzy_securitytweaks.yml new file mode 100644 index 00000000000..3573dabeff2 --- /dev/null +++ b/html/changelogs/wezzy_securitytweaks.yml @@ -0,0 +1,48 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Changes dark blue warden uniform to match the rest of the department, for consistency reasons and the fact it did not match with any other security accessories" + - imageadd: "Added unused blue and navy blue security jackets to the loadout, with some tweaking." + - imageadd: "Red forensic tech jacket has been removed for being out of place. In lieu of this, similar blue and navy blue variants have been added. The badge has been removed in order to further distance resemblance from the FIB jacket." + - imageadd: "FIB jacket has also been updated." + - rscadd: "FIB and forensic technician jackets are now able to open and close like labcoats." + - balance: "Removed the armor values from cosmetic coats in security lockers." + - rscadd: "Resprited warden and hos caps. added a corporate version as well, and moved them to an appropriate file, along with the commissar's cap." + - rscadd: "Finally, added corporate bandanas" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 121734bc19d..9c6457b924f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 82aa75c0eb2..95ab0a622d8 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 0bc855fcb7d..c752860bde6 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 4b4ea5c8aa5..edafc81d89f 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/hats/bandanas.dmi b/icons/obj/clothing/hats/bandanas.dmi index c08710b9ff5..61333337884 100644 Binary files a/icons/obj/clothing/hats/bandanas.dmi and b/icons/obj/clothing/hats/bandanas.dmi differ diff --git a/icons/obj/clothing/hats/security.dmi b/icons/obj/clothing/hats/security.dmi new file mode 100644 index 00000000000..bf5c44fc1fd Binary files /dev/null and b/icons/obj/clothing/hats/security.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index f14148e1bc5..79c13bf4006 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 89e050c8d2c..bd53f8bb6c8 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ