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 95c45dfbdf5..4434f30204b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -131,9 +131,11 @@ new /obj/item/clothing/suit/storage/toggle/armor/hos(src) new /obj/item/clothing/suit/armor/hos(src) new /obj/item/clothing/suit/storage/vest/hos(src) - new /obj/item/clothing/head/helmet/hos/cap(src) + new /obj/item/clothing/head/hos/cap(src) + new /obj/item/clothing/head/hos/cap/alt(src) new /obj/item/clothing/head/helmet/hos(src) new /obj/item/clothing/head/beret/sec/hos(src) + new /obj/item/clothing/head/beret/sec/hos/alt(src) new /obj/item/clothing/accessory/badge/hos(src) new /obj/item/clothing/gloves/black_leather(src) //Tools @@ -151,6 +153,8 @@ new /obj/item/device/flash(src) new /obj/item/device/holowarrant(src) new /obj/item/device/breath_analyzer(src) + new /obj/item/handcuffs(src) + new /obj/item/crowbar/red(src) //Belts new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/storage/belt/security(src) @@ -174,7 +178,9 @@ new /obj/item/clothing/under/rank/head_of_security/corp(src) new /obj/item/clothing/suit/storage/vest/hos(src) new /obj/item/clothing/head/beret/sec/hos(src) - new /obj/item/clothing/head/helmet/hos/cap(src) + new /obj/item/clothing/head/beret/sec/hos/alt(src) + new /obj/item/clothing/head/hos/cap(src) + new /obj/item/clothing/head/hos/cap/alt(src) new /obj/item/clothing/head/helmet/hos(src) //Tools new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src) @@ -212,8 +218,9 @@ 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/sec/warden(src) - new /obj/item/clothing/head/helmet/warden(src) - new /obj/item/clothing/head/helmet/warden/commissar(src) + new /obj/item/clothing/head/warden/commissar(src) + new /obj/item/clothing/head/warden(src) + new /obj/item/clothing/head/warden/alt(src) new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/accessory/badge/warden(src) new /obj/item/clothing/gloves/black_leather(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index c6c860b4101..20f9498a213 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -56,16 +56,37 @@ path = /obj/item/clothing/head/beret/sec allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician") -/datum/gear/head/beret/warden - display_name = "beret, security (warden)" - path = /obj/item/clothing/head/beret/sec/warden - allowed_roles = list("Head of Security", "Warden") -/datum/gear/head/beret/hos - display_name = "beret, security (head of security)" - path = /obj/item/clothing/head/beret/sec/hos +/datum/gear/head/warden + display_name = "headwear, security (warden)" + description = "A selection of warden headwear." + path = /obj/item/clothing/head + allowed_roles = list("Head of Security" , "Warden") + +/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/sec/warden + gear_tweaks += new/datum/gear_tweak/path(wardenhead) + +/datum/gear/head/hos + display_name = "headwear, security (head of security)" + description = "A selection of head of security headwear." + path = /obj/item/clothing/head allowed_roles = list("Head of Security") +/datum/gear/head/hos/New() + ..() + var/hoshead = list() + hoshead["blue commander beret"] = /obj/item/clothing/head/beret/sec/hos + hoshead["black commander beret"] = /obj/item/clothing/head/beret/sec/hos/alt + hoshead["blue commander hat"] = /obj/item/clothing/head/hos/cap + hoshead["black commander hat"] = /obj/item/clothing/head/hos/cap/alt + gear_tweaks += new/datum/gear_tweak/path(hoshead) + /datum/gear/head/beret/medical display_name = "beret, medical" path = /obj/item/clothing/head/beret/medical diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index de43f4c4029..b6678bbc81f 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -7,7 +7,7 @@ slot_r_hand_str = "helmet" ) item_flags = THICKMATERIAL - armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0) + armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) flags_inv = HIDEEARS|BLOCKHEADHAIR cold_protection = HEAD min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE @@ -27,24 +27,6 @@ flags_inv ^= BLOCKHEADHAIR to_chat(usr, "[src] will now [flags_inv & BLOCKHEADHAIR ? "hide" : "show"] hair.") -/obj/item/clothing/head/helmet/warden - name = "warden's hat" - desc = "It's a special helmet issued to the Warden of a security force. Protects the head from impacts." - icon_state = "policehelm" - flags_inv = 0 - -/obj/item/clothing/head/helmet/warden/commissar - name = "commissar's cap" - desc = "A security commissar's cap." - icon_state = "commissarcap" - -/obj/item/clothing/head/helmet/hos/cap - name = "head of security hat" - desc = "The hat of the Head of Security. For showing the officers who's in charge." - icon_state = "hoscap" - armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) - flags_inv = HIDEEARS - /obj/item/clothing/head/helmet/hos name = "head of security helmet" desc = "A special Internal Security Division helmet designed to protect the precious craniums of important installation security officers." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index e5eb333acc4..67c8b6ffe26 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -88,10 +88,15 @@ icon_state = "cadetberet" /obj/item/clothing/head/beret/sec/hos - name = "commander beret" + name = "blue commander beret" desc = "A navy blue beret with a commander's rank emblem. For officers that are more inclined towards style than safety." icon_state = "hosberet" +/obj/item/clothing/head/beret/sec/hos/alt + name = "black commander beret" + desc = "A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety." + icon_state = "hosberet_alt" + /obj/item/clothing/head/beret/sec/warden name = "warden beret" desc = "A navy blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety." @@ -199,3 +204,30 @@ /obj/item/clothing/head/det/grey icon_state = "grey_fedora" 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" + flags_inv = HIDEEARS + +/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/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" + flags_inv = HIDEEARS + +/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" diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index debf4956e2f..566cc3c96b0 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -527,7 +527,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/helmet/hos/cap = 400, + /obj/item/clothing/head/hos/cap = 100, + /obj/item/clothing/head/hos/cap/alt = 100, /obj/item/clothing/head/helmet = 250, /obj/item/clothing/head/culthood = 150, /obj/item/clothing/head/caphat/hop = 100, diff --git a/html/changelogs/Aboshehab - beretAndLockerStuff.yml b/html/changelogs/Aboshehab - beretAndLockerStuff.yml new file mode 100644 index 00000000000..905aa5182b8 --- /dev/null +++ b/html/changelogs/Aboshehab - beretAndLockerStuff.yml @@ -0,0 +1,45 @@ +################################ +# 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: Aboshehab, Stryker, Wowzewow + +# 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: + - rscadd: "Added a black beret for the Head of Security, courtesy of Stryker. Now found in the loadout and relevant lockers." + - rscadd: "Added black hats for both the Warden and Head of Security, courtesy of Wowzewow." + - rscadd: "Added a crowbar and handcuffs to the Head of Security locker." + - tweak: "Adjusted the loadout for headwear for both the Warden and Head of Security to be selection based from a list to condense tab size." + - tweak: "Hats for the Head of Security and Warden that once had armor values no longer do, becoming regular headwear." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index ed56900d573..b9a7e714e04 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 9c717f2f9ae..2d21754529e 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ