diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 8b37fef12dae..cd919ab581b1 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -651,6 +651,7 @@ new /obj/item/clothing/suit/armor/vest/rurmcoat(src) new /obj/item/clothing/suit/armor/vest/sovietcoat(src) new /obj/item/clothing/under/yogs/hopcasual(src) + new /obj/item/clothing/suit/hooded/wintercoat/hop(src) /obj/item/storage/backpack/duffelbag/clothing/rd name = "Research Directors clothing duffelbag" @@ -666,6 +667,7 @@ new /obj/item/clothing/under/rank/research_director/alt/skirt(src) new /obj/item/clothing/under/rank/research_director/turtleneck(src) new /obj/item/clothing/under/rank/research_director/turtleneck/skirt(src) + new /obj/item/clothing/suit/hooded/wintercoat/science/rd(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/under/yogs/rdema(src) @@ -688,6 +690,7 @@ new /obj/item/clothing/under/yogs/cecasual(src) new /obj/item/clothing/head/beret/ce(src) new /obj/item/clothing/suit/hazardvest(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/glasses/meson/engine(src) @@ -759,6 +762,7 @@ new /obj/item/clothing/under/yogs/hoslatenight(src) new /obj/item/clothing/under/yogs/hoscasual(src) new /obj/item/clothing/suit/armor/vest/hosjacket(src) + new /obj/item/clothing/suit/hooded/wintercoat/security/hos(src) /obj/item/storage/backpack/duffelbag/clothing/med/chief name = "Chief Medical Officer's clothing duffelbag" @@ -774,3 +778,4 @@ new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/head/beret/cmo(src) + new /obj/item/clothing/suit/hooded/wintercoat/medical/cmo(src) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 22345cb8829e..fddf21d783fa 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -561,6 +561,20 @@ /obj/item/clothing/head/hooded/winterhood/captain icon_state = "winterhood_captain" +/obj/item/clothing/suit/hooded/wintercoat/hop + name = "head of personnel's winter coat" + desc = "A cozy winter coat, covered in thick fur. The breast features a proud yellow chevron, reminding everyone that you're the second banana." + icon_state = "coathop" + item_state = "coathop" + armor = list(MELEE = 10, BULLET = 15, LASER = 15, ENERGY = 25, BOMB = 10, BIO = 0, RAD = 0, FIRE = 0, ACID = 35) + allowed = list( + /obj/item/melee/classic_baton, + ) + hoodtype = /obj/item/clothing/head/hooded/winterhood/hop + +/obj/item/clothing/head/hooded/winterhood/hop + icon_state = "winterhood_hop" + /obj/item/clothing/suit/hooded/wintercoat/security name = "security winter coat" icon_state = "coatsecurity" @@ -575,6 +589,19 @@ /obj/item/clothing/head/hooded/winterhood/security icon_state = "winterhood_security" +/obj/item/clothing/suit/hooded/wintercoat/security/hos + name = "head of security's winter coat" + desc = "A red, armour-padded winter coat, lovingly woven with a Kevlar interweave and reinforced with semi-ablative polymers and a silver azide fill material. The zipper tab looks like a tiny replica of Beepsky." + icon_state = "coathos" + item_state = "coathos" + armor = list(MELEE = 35, BULLET = 25, LASER = 40, ENERGY = 20, BOMB = 35, BIO = 0, RAD = 0, FIRE = 0, ACID = 55) + hoodtype = /obj/item/clothing/head/hooded/winterhood/security/hos + +/obj/item/clothing/head/hooded/winterhood/security/hos + desc = "A red, armour-padded winter hood, lovingly woven with a Kevlar interweave. Definitely not bulletproof, especially not the part where your face goes." + icon_state = "winterhood_hos" + armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, BIO = 0, RAD = 0, FIRE = 0, ACID = 55) + /obj/item/clothing/suit/hooded/wintercoat/medical name = "medical winter coat" icon_state = "coatmedical" @@ -586,6 +613,25 @@ /obj/item/clothing/head/hooded/winterhood/medical icon_state = "winterhood_medical" +/obj/item/clothing/suit/hooded/wintercoat/medical/cmo + name = "chief medical officer's winter coat" + desc = "A winter coat in a vibrant shade of blue with a small silver caduceus instead of a plastic zipper tab. The normal liner is replaced with an exceptionally thick, soft layer of fur." + icon_state = "coatcmo" + item_state = "coatcmo" + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, RAD = 0, FIRE = 20, ACID = 30) + hoodtype = /obj/item/clothing/head/hooded/winterhood/medical/cmo + +/obj/item/clothing/suit/hooded/wintercoat/medical/cmo/Initialize(mapload) + . = ..() + allowed += list( + /obj/item/melee/classic_baton, + ) + +/obj/item/clothing/head/hooded/winterhood/medical/cmo + desc = "A blue winter coat hood." + icon_state = "winterhood_cmo" + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, RAD = 0, FIRE = 20, ACID = 30) + /obj/item/clothing/suit/hooded/wintercoat/science name = "science winter coat" icon_state = "coatscience" @@ -597,6 +643,25 @@ /obj/item/clothing/head/hooded/winterhood/science icon_state = "winterhood_science" +/obj/item/clothing/suit/hooded/wintercoat/science/rd + name = "research director's advanced thermal insulator" + desc = "A thick arctic winter coat with an outdated atomic model instead of a plastic zipper tab. Most in the know are heavily aware that Bohr's model of the atom was outdated by the time of the 1930s when the Heisenbergian and Schrodinger models were generally accepted for true. Nevertheless, we still see its use in anachronism, roleplaying, and, in this case, as a zipper tab. At least it should keep you warm on your ivory pillar." + icon_state = "coatrd" + item_state = "coatrd" + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 20, BIO = 0, RAD = 0, FIRE = 30, ACID = 0) + hoodtype = /obj/item/clothing/head/hooded/winterhood/science/rd + +/obj/item/clothing/suit/hooded/wintercoat/science/rd/Initialize(mapload) + . = ..() + allowed += list( + /obj/item/melee/classic_baton, + ) + +/obj/item/clothing/head/hooded/winterhood/science/rd + desc = "A white winter coat hood. It smells faintly of hair gel." + icon_state = "winterhood_rd" + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 20, BIO = 0, RAD = 0, FIRE = 30, ACID = 0) + /obj/item/clothing/suit/hooded/wintercoat/engineering name = "engineering winter coat" icon_state = "coatengineer" @@ -607,6 +672,26 @@ /obj/item/clothing/head/hooded/winterhood/engineering icon_state = "winterhood_engineer" + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 10, FIRE = 20, ACID = 10) + +/obj/item/clothing/suit/hooded/wintercoat/engineering/ce + name = "chief engineer's winter coat" + desc = "A white winter coat with reflective green and yellow stripes made for the truly insane. Stuffed with asbestos, treated with fire retardant PBDE, lined with a micro thin sheet of lead foil and snugly fitted to your body's measurements. This baby's ready to save you from anything except the thyroid cancer and systemic fibrosis you'll get from wearing it. The zipper tab is a tiny golden wrench." + icon_state = "coatce" + item_state = "coatce" + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 30, FIRE = 40, ACID = 10) + hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/ce + +/obj/item/clothing/suit/hooded/wintercoat/engineering/ce/Initialize(mapload) + . = ..() + allowed += list( + /obj/item/melee/classic_baton, + ) + +/obj/item/clothing/head/hooded/winterhood/engineering/ce + desc = "A white winter coat hood. Feels surprisingly heavy. The tag says that it's not child safe." + icon_state = "winterhood_ce" + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 15, FIRE = 30, ACID = 10) /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos name = "atmospherics winter coat" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 8c0580550e3b..cab2f5225a62 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 723fc4c19c48..13cdd51cec54 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index 6c89fcbbd31b..eb408d4108fa 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index f65429117272..9d539e6498ef 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 1b1ca6b3d3d7..c499921d8609 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 2c8abfd76d42..7b9b4b3002b2 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ