diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index a1050ad65e..0524f11548 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -291,6 +291,11 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) display_name = "USCM cap" path = /obj/item/clothing/head/cmcap +/datum/gear/headwear/uscm/cap/sulaco + display_name = "USS Sulaco cap" + path = /obj/item/clothing/head/sulacocap + cost = 0 + /datum/gear/headwear/uscm/cap/flap display_name = "USCM flapcap" path = /obj/item/clothing/head/cmcap/flap diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 4e135a7918..0573259831 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -198,6 +198,20 @@ WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' ) +/obj/item/clothing/head/sulacocap + name = "uss sulaco cap" + desc = "A casual cap able to be purchased and worn by Marines stationed on the USS Sulaco. While it only protects from the sun, it's much more comfortable than a helmet." + icon_state = "sulacocap" + icon = 'icons/obj/items/clothing/cm_hats.dmi' + var/helmet_overlays[] + var/flipped_cap = FALSE + var/list/flipping_message = list( + "flipped" = "You spin the hat backwards! You look like a tool.", + "unflipped" = "You spin the hat back forwards. That's better." + ) + var/base_cap_icon + var/flags_marine_hat = HAT_GARB_OVERLAY|HAT_CAN_FLIP + /obj/item/clothing/head/cmcap name = "patrol cap" desc = "A casual cap issued as part of the non-combat uniform. While it only protects from the sun, it's much more comfortable than a helmet." diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 3110c4bf75..78c36b1087 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ