diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 94c7890c890..21e3be6408a 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -490,3 +490,12 @@ desc = "A gauzy white veil." icon_state = "weddingveil" inhand_icon_state = "weddingveil" + +/obj/item/clothing/head/centom_cap + name = "\improper CentCom Commander Cap" + icon_state = "centcom_cap" + desc = "Worn by the finest of CentCom Commanders. Inside the lining of the cap, lies two faint initials." + inhand_icon_state = "that" + flags_inv = 0 + armor = list(MELEE = 30, BULLET = 15, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) + strip_delay = (8 SECONDS) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index ec5339d8e63..5c108a8d875 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -304,3 +304,12 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + +/obj/item/clothing/suit/armor/vest/centcom_formal + name = "\improper CentCom Formal Coat" + desc = "A stylish coat given to CentCom Commanders. Perfect for sending ERTs to suicide missions with style!" + icon_state = "centcom_formal" + inhand_icon_state = "centcom" + body_parts_covered = CHEST|GROIN|ARMS + armor = list(MELEE = 35, BULLET = 40, LASER = 40, ENERGY = 50, BOMB = 35, BIO = 10, RAD = 10, FIRE = 10, ACID = 60) + diff --git a/code/modules/clothing/under/jobs/centcom.dm b/code/modules/clothing/under/jobs/centcom.dm index b9afe75a81c..50a3055a164 100644 --- a/code/modules/clothing/under/jobs/centcom.dm +++ b/code/modules/clothing/under/jobs/centcom.dm @@ -2,13 +2,6 @@ icon = 'icons/obj/clothing/under/centcom.dmi' worn_icon = 'icons/mob/clothing/under/centcom.dmi' -/obj/item/clothing/under/rank/centcom/officer - name = "\improper CentCom officer's jumpsuit" - desc = "It's a jumpsuit worn by CentCom Officers." - icon_state = "officer" - inhand_icon_state = "g_suit" - alt_covers_chest = TRUE - /obj/item/clothing/under/rank/centcom/commander name = "\improper CentCom officer's jumpsuit" desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders." @@ -21,3 +14,33 @@ icon_state = "intern" inhand_icon_state = "g_suit" can_adjust = FALSE + +/obj/item/clothing/under/rank/centcom/officer + name = "\improper CentCom turtleneck suit" + desc = "A casual, yet refined green turtleneck, used by CentCom Officials. It has a fragrance of aloe." + icon_state = "officer" + inhand_icon_state = "dg_suit" + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/centcom/officer/replica + name = "\improper CentCom turtleneck replica" + desc = "A cheap copy of the CentCom turtleneck! A Donk Co. logo can be seen on the collar." + +/obj/item/clothing/under/rank/centcom/officer_skirt + name = "\improper CentCom turtleneck skirt" + desc = "A skirt version of the CentCom turtleneck, rarer and more sought after than the original." + icon_state = "officer_skirt" + inhand_icon_state = "dg_suit" + alt_covers_chest = TRUE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/centcom/officer_skirt/replica + name = "\improper CentCom turtleneck skirt replica" + desc = "A cheap copy of the CentCom turtleneck skirt! A Donk Co. logo can be seen on the collar." + +/obj/item/clothing/under/rank/centcom/centcom_skirt + name = "\improper CentCom officer's jumpskirt" + desc = "It's a jumpskirt worn by CentCom's highest-tier Commanders." + icon_state = "centcom_skirt" + inhand_icon_state = "dg_suit" + fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 5bc08b073e2..8edf06e7dc3 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -119,7 +119,9 @@ /obj/item/clothing/suit/jacket/letterman_syndie = 1, /obj/item/clothing/under/costume/jabroni = 1, /obj/item/clothing/suit/vapeshirt = 1, - /obj/item/clothing/under/costume/geisha = 1) + /obj/item/clothing/under/costume/geisha = 1, + /obj/item/clothing/under/rank/centcom/officer/replica = 1, + /obj/item/clothing/under/rank/centcom/officer_skirt/replica = 1) premium = list(/obj/item/clothing/under/suit/checkered = 1, /obj/item/clothing/head/mailman = 1, /obj/item/clothing/under/misc/mailman = 1, diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index bd41b2f15ff..26da91bd004 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index dad15ac811e..7f2f7a3cf29 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/under/centcom.dmi b/icons/mob/clothing/under/centcom.dmi index 31585b2c11f..b906a8e4812 100644 Binary files a/icons/mob/clothing/under/centcom.dmi and b/icons/mob/clothing/under/centcom.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 97efb0dc22b..d67e2b86ff1 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index ff2163386b2..5bee8fc5100 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/centcom.dmi b/icons/obj/clothing/under/centcom.dmi index b1c76e4f7e3..2052f740428 100644 Binary files a/icons/obj/clothing/under/centcom.dmi and b/icons/obj/clothing/under/centcom.dmi differ