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 1c0e7759f14..0fdc9aaa965 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -132,7 +132,8 @@ new /obj/item/clothing/suit/storage/toggle/armor/hos/jensen(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(src) + new /obj/item/clothing/head/helmet/hos/cap(src) + new /obj/item/clothing/head/helmet/hos(src) new /obj/item/clothing/head/beret/sec/hos(src) new /obj/item/clothing/accessory/badge/hos(src) new /obj/item/clothing/shoes/black_boots(src) @@ -175,7 +176,8 @@ 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(src) + new /obj/item/clothing/head/helmet/hos/cap(src) + new /obj/item/clothing/head/helmet/hos(src) //Tools new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src) new /obj/item/device/radio/headset/heads/hos(src) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index e7aed244140..bb08bb1641a 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -29,7 +29,7 @@ /obj/item/clothing/head/helmet/warden name = "warden's hat" - desc = "It's a special helmet issued to the Warden of a securiy force. Protects the head from impacts." + 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 @@ -38,14 +38,22 @@ desc = "A security commissar's cap." icon_state = "commissarcap" -/obj/item/clothing/head/helmet/HoS +/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/dermal +/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." + description_fluff = "What the heck did you just hecking say about me, you little honker? I'll have you know I graduated top of my class in the Sol Army, and I've been involved in numerous secret raids on the Jargon Federation, and I have over 300 confirmed kills. I am trained in gorilla warfare and I'm the top sniper in the entire Sol armed forces. You are nothing to me but just another target. I will wipe you the heck out with precision the likes of which has never been seen before on Biesel, mark my hecking words." + icon_state = "hoshelmet" + item_state = "hoshelmet" + armor = list(melee = 62, bullet = 50, laser = 50, energy = 35, bomb = 10, bio = 2, rad = 0) + +/obj/item/clothing/head/helmet/hos/dermal name = "dermal armour patch" desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head." icon_state = "dermal" diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index 712ae1b61d8..e9a4c878891 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -532,7 +532,8 @@ var/list/worths = list( /obj/item/clothing/head/helmet/tactical = 800, /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 = 800, + /obj/item/clothing/head/helmet/hos/cap = 400, /obj/item/clothing/head/helmet = 250, /obj/item/clothing/head/culthood = 150, /obj/item/clothing/head/caphat/hop = 100, diff --git a/html/changelogs/geeves-hosHelmet.yml b/html/changelogs/geeves-hosHelmet.yml new file mode 100644 index 00000000000..8553ff227da --- /dev/null +++ b/html/changelogs/geeves-hosHelmet.yml @@ -0,0 +1,43 @@ +################################ +# 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: Geeves + +# 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: "Changed the regular helmet in the Head of Security's locker into a proper HoS Helmet." + - rscadd: "Added oxygen tank to the HoS locker." + - experiment: "The gnome is still on the run." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 8dc6a746aa6..5ba3297f1ad 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 1a48dfd936b..5323262a6b4 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 5ff602a3488..3f698c4bde7 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -24059,8 +24059,8 @@ /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/clothing/suit/space/void/hos, /obj/item/clothing/head/helmet/space/void/hos, -/obj/item/clothing/head/helmet, /obj/item/clothing/shoes/magboots, +/obj/item/weapon/tank/oxygen, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "aQC" = (