diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index d6daa4c3419..8c5f1034936 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -11630,7 +11630,7 @@ /obj/structure/statue/snow/snowman{ name = "Snow-Luc Price" }, -/obj/item/clothing/head/hats/hos{ +/obj/item/clothing/head/hats/hos/cap{ pixel_y = 10 }, /turf/open/misc/asteroid/snow, diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index b4a0cb3b2ba..a8fe363c285 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -821,7 +821,7 @@ }, /area/shuttle/syndicate/medical) "vv" = ( -/obj/item/clothing/head/hats/hos/syndicate, +/obj/item/clothing/head/hats/hos/cap/syndicate, /obj/item/stamp/syndicate{ pixel_x = -7 }, diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index 47e812f3029..f0434551600 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -2658,7 +2658,7 @@ pixel_x = 2 }, /obj/item/card/id/advanced/black/syndicate_command/captain_id/syndie_spare, -/obj/item/clothing/head/hats/hos/syndicate, +/obj/item/clothing/head/hats/hos/cap/syndicate, /obj/item/clothing/head/hats/hos/beret/syndicate, /obj/item/clothing/under/syndicate/skirt, /obj/item/clothing/under/syndicate, diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index f7864032df6..7adc8e99dfa 100644 --- a/code/datums/components/crafting/tailoring.dm +++ b/code/datums/components/crafting/tailoring.dm @@ -304,3 +304,16 @@ /obj/item/pillow = 1, ) category = CAT_CLOTHING + +/datum/crafting_recipe/sturdy_shako + name = "Sturdy Shako" + result = /obj/item/clothing/head/hats/hos/shako + tool_behaviors = list(TOOL_WELDER, TOOL_KNIFE) + time = 5 SECONDS + reqs = list( + /obj/item/clothing/head/hats/hos/cap = 1, + /obj/item/stack/sheet/plasteel = 2, //Stout shako for two refined + /obj/item/stack/sheet/mineral/gold = 2, + ) + + category = CAT_CLOTHING diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 210b772f089..5ce65ae8608 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -84,7 +84,7 @@ new /obj/item/clothing/suit/armor/vest/leather(src) new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src) new /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga(src) - new /obj/item/clothing/head/hats/hos(src) + new /obj/item/clothing/head/hats/hos/cap(src) new /obj/item/clothing/mask/gas/sechailer/swat(src) new /obj/item/clothing/neck/cloak/hos(src) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 96fa2ab0a85..1c02a8785f1 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -169,11 +169,15 @@ //Security /obj/item/clothing/head/hats/hos + name = "generic head of security hat" + desc = "Please contact the Nanotrasen Costuming Department if found." + armor_type = /datum/armor/hats_hos + strip_delay = 8 SECONDS + +/obj/item/clothing/head/hats/hos/cap name = "head of security cap" desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge." - armor_type = /datum/armor/hats_hos icon_state = "hoscap" - strip_delay = 80 /datum/armor/hats_hos melee = 40 @@ -186,10 +190,18 @@ acid = 60 wound = 10 -/obj/item/clothing/head/hats/hos/syndicate +/obj/item/clothing/head/hats/hos/cap/syndicate name = "syndicate cap" desc = "A black cap fit for a high ranking syndicate officer." +/obj/item/clothing/head/hats/hos/shako + name = "sturdy shako" + desc = "Wearing this makes you want to shout \"Down and give me twenty!\" at someone." + icon_state = "hosshako" + worn_icon = 'icons/mob/large-worn-icons/64x64/head.dmi' + worn_x_dimension = 64 + worn_y_dimension = 64 + /obj/item/clothing/head/hats/hos/beret name = "head of security's beret" desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection." diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm index 162c21d0d49..3567857ed6a 100644 --- a/code/modules/mob_spawn/ghost_roles/space_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm @@ -180,7 +180,7 @@ back = /obj/item/storage/backpack/satchel/leather ears = /obj/item/radio/headset/syndicate/alt/leader glasses = /obj/item/clothing/glasses/thermal/eyepatch - head = /obj/item/clothing/head/hats/hos/syndicate + head = /obj/item/clothing/head/hats/hos/cap/syndicate mask = /obj/item/clothing/mask/cigarette/cigar/havana l_pocket = /obj/item/melee/energy/sword/saber/red r_pocket = /obj/item/melee/baton/telescopic diff --git a/icons/mob/large-worn-icons/64x64/head.dmi b/icons/mob/large-worn-icons/64x64/head.dmi new file mode 100644 index 00000000000..ac6163ddbed Binary files /dev/null and b/icons/mob/large-worn-icons/64x64/head.dmi differ diff --git a/icons/obj/clothing/head/hats.dmi b/icons/obj/clothing/head/hats.dmi index 4455b7a449a..52d63975d4f 100644 Binary files a/icons/obj/clothing/head/hats.dmi and b/icons/obj/clothing/head/hats.dmi differ diff --git a/tools/UpdatePaths/Scripts/74277_hos_cap.txt b/tools/UpdatePaths/Scripts/74277_hos_cap.txt new file mode 100644 index 00000000000..d245897ddf0 --- /dev/null +++ b/tools/UpdatePaths/Scripts/74277_hos_cap.txt @@ -0,0 +1,2 @@ +/obj/item/clothing/head/hats/hos : /obj/item/clothing/head/hats/hos/cap{@OLD} +/obj/item/clothing/head/hats/hos/syndicate : /obj/item/clothing/head/hats/hos/cap/syndicate{@OLD} \ No newline at end of file