diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index c5ab6c0f1124..8ddf1db6f09e 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -28,8 +28,8 @@ #define GLASSES_LAYER 14 #define BELT_LAYER 13 //Possible make this an overlay of somethign required to wear a belt? #define SUIT_STORE_LAYER 12 -#define NECK_LAYER 11 -#define BACK_LAYER 10 +#define BACK_LAYER 11 +#define NECK_LAYER 10 #define HAIR_LAYER 9 //TODO: make part of head layer? #define FACEMASK_LAYER 8 #define HEAD_LAYER 7 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 500c430965ec..cfd161d9e359 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -168,7 +168,7 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \ new/datum/stack_recipe("leather shoes", /obj/item/clothing/shoes/laceup, 2), \ new/datum/stack_recipe("footwraps", /obj/item/clothing/shoes/xeno_wraps, 2), \ new/datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10), \ - new/datum/stack_recipe("leather shawl", /obj/item/clothing/neck/yogs/shawl, 5), \ + new/datum/stack_recipe("leather cloak", /obj/item/clothing/neck/cloak, 5), \ )) /obj/item/stack/sheet/leather/Initialize(mapload, new_amount, merge = TRUE) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 0664460b25af..209d00aeb131 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -644,7 +644,6 @@ new /obj/item/clothing/under/rank/head_of_personnel(src) new /obj/item/clothing/under/rank/head_of_personnel/skirt(src) new /obj/item/clothing/head/hopcap(src) - new /obj/item/clothing/neck/yogs/shawl/hop(src) //Yogs new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/suit/armor/vest/rurmcoat(src) new /obj/item/clothing/suit/armor/vest/sovietcoat(src) @@ -655,7 +654,6 @@ desc = "A large duffel bag filled with clothing." /obj/item/storage/backpack/duffelbag/clothing/rd/PopulateContents() - new /obj/item/clothing/neck/yogs/shawl/rd(src) //Yogs new /obj/item/clothing/suit/bio_suit/scientist(src) new /obj/item/clothing/head/bio_hood/scientist(src) new /obj/item/clothing/suit/toggle/labcoat(src) @@ -674,8 +672,8 @@ item_state = "duffel-eng" icon_state = "duffel-eng" + /obj/item/storage/backpack/duffelbag/clothing/ce/PopulateContents() - new /obj/item/clothing/neck/yogs/shawl/ce(src) //Yogs new /obj/item/clothing/under/rank/chief_engineer(src) new /obj/item/clothing/under/rank/chief_engineer/skirt(src) new /obj/item/clothing/head/hardhat/white(src) @@ -752,7 +750,6 @@ new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src) new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src) new /obj/item/clothing/under/rank/head_of_security/grey(src) - new /obj/item/clothing/neck/yogs/shawl/hos(src) //Yogs new /obj/item/clothing/under/yogs/lieutgeneral(src) new /obj/item/clothing/under/yogs/dictatorhos(src) new /obj/item/clothing/suit/armor/hos/germancoat(src) @@ -773,5 +770,4 @@ new /obj/item/clothing/under/rank/chief_medical_officer(src) new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src) new /obj/item/clothing/shoes/sneakers/brown(src) - new /obj/item/clothing/neck/yogs/shawl/cmo(src) //Yogs new /obj/item/clothing/head/beret/cmo(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index e3d2ff05be09..a2fc15b286f4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -5,13 +5,13 @@ /obj/structure/closet/secure_closet/quartermaster/PopulateContents() ..() - new /obj/item/clothing/neck/yogs/shawl/qm(src) //Yogs new /obj/item/storage/lockbox/medal/cargo(src) new /obj/item/clothing/under/rank/cargo(src) new /obj/item/clothing/under/rank/cargo/skirt(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/radio/headset/headset_cargo(src) new /obj/item/clothing/suit/fire/firefighter(src) + new /obj/item/clothing/neck/cloak/qm(src) new /obj/item/clothing/gloves/fingerless(src) new /obj/item/megaphone/cargo(src) new /obj/item/tank/internals/emergency_oxygen(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 848d91f3ffc1..4e9b9bf9b49c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -10,6 +10,7 @@ new /obj/item/radio/headset/heads/ce(src) new /obj/item/storage/toolbox/mechanical(src) new /obj/item/megaphone/command(src) + new /obj/item/clothing/neck/cloak/ce(src) new /obj/item/areaeditor/blueprints(src) new /obj/item/airlock_painter(src) new /obj/item/holosign_creator/atmos(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 87ecb618f1a2..33f6a954a487 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -55,6 +55,7 @@ new /obj/item/cartridge/cmo(src) new /obj/item/radio/headset/heads/cmo(src) new /obj/item/megaphone/command(src) + new /obj/item/clothing/neck/cloak/cmo(src) new /obj/item/defibrillator/compact/loaded(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/storage/belt/medical(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index b3c32c68619c..2539209b5316 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -10,6 +10,7 @@ new /obj/item/radio/headset/heads/rd(src) new /obj/item/tank/internals/air(src) new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/neck/cloak/rd(src) new /obj/item/megaphone/command(src) new /obj/item/storage/lockbox/medal/sci(src) new /obj/item/clothing/suit/armor/reactive/teleport(src) 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 f62d60b0e57f..0785fa79764b 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -9,6 +9,7 @@ new /obj/item/pet_carrier(src) new /obj/item/cartridge/captain(src) new /obj/item/storage/box/silver_ids(src) + new /obj/item/clothing/neck/cloak/cap(src) new /obj/item/radio/headset/heads/captain/alt(src) new /obj/item/radio/headset/heads/captain(src) new /obj/item/restraints/handcuffs/cable/zipties(src) @@ -30,6 +31,7 @@ new /obj/item/radio/headset/heads/hop(src) new /obj/item/storage/box/ids(src) new /obj/item/storage/box/ids(src) + new /obj/item/clothing/neck/cloak/hop(src) new /obj/item/megaphone/command(src) new /obj/item/clothing/suit/armor/vest/alt(src) new /obj/item/assembly/flash/handheld(src) @@ -55,6 +57,7 @@ new /obj/item/radio/headset/heads/hos/alt(src) new /obj/item/radio/headset/heads/hos(src) new /obj/item/storage/lockbox/medal/sec(src) + new /obj/item/clothing/neck/cloak/hos(src) new /obj/item/megaphone/sec(src) new /obj/item/holosign_creator/security(src) new /obj/item/storage/lockbox/loyalty(src) diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 26659057a590..8ab31b16b904 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -297,3 +297,96 @@ desc = "A sizable white cape with gold connects." icon_state = "grandadmiral" item_state = "grand_admiral" + + +//Cloaks. No, not THAT kind of cloak. + + +/obj/item/clothing/neck/cloak + name = "brown cloak" + desc = "It's a cape that can be worn around your neck." + icon = 'icons/obj/clothing/neck.dmi' + icon_state = "leather" + item_state = "leather" + w_class = WEIGHT_CLASS_SMALL + body_parts_covered = CHEST|GROIN|LEGS|ARMS + flags_inv = HIDESUITSTORAGE + +/obj/item/clothing/neck/cloak/suicide_act(mob/user) + user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return(OXYLOSS) + +/obj/item/clothing/neck/cloak/hos + name = "head of security's cloak" + desc = "Worn by a stressed spaceman. Also comes in red." + icon_state = "hoscloak" + +/obj/item/clothing/neck/cloak/qm + name = "quartermaster's cloak" + desc = "Worn by a false idol. Possibly stolen property." + icon_state = "qmcloak" + +/obj/item/clothing/neck/cloak/cmo + name = "chief medical officer's cloak" + desc = "Worn by a dedicated life-saver. It's remarkably clean, and elegant." + icon_state = "cmocloak" + +/obj/item/clothing/neck/cloak/ce + name = "chief engineer's cloak" + desc = "Worn by the wielder of an unlimited power. Fireproof!" + icon_state = "cecloak" + resistance_flags = FIRE_PROOF + +/obj/item/clothing/neck/cloak/rd + name = "research director's external fabric accentuator" + desc = "Worn by the head of plasma research. Not fireproof." + icon_state = "rdcloak" + +/obj/item/clothing/neck/cloak/cap + name = "captain's cloak" + desc = "Worn by the commander of Space Station 13." + icon_state = "capcloak" + +/obj/item/clothing/neck/cloak/hop + name = "head of personnel's cloak" + desc = "Worn by the right hand of the captain. It smells faintly of bureaucracy." + icon_state = "hopcloak" + +/obj/item/clothing/suit/hooded/cloak/goliath + name = "goliath cloak" + icon_state = "goliath_cloak" + desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits." + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/twohanded/bonespear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival) + armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot + hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath + body_parts_covered = CHEST|GROIN|ARMS + +/obj/item/clothing/head/hooded/cloakhood/goliath + name = "goliath cloak hood" + icon_state = "golhood" + desc = "A protective & concealing hood." + armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) + flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR + transparent_protection = HIDEMASK + +/obj/item/clothing/suit/hooded/cloak/drake + name = "drake armour" + icon_state = "dragon" + desc = "A suit of armour fashioned from the remains of an ash drake." + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/spear) + armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100) + hoodtype = /obj/item/clothing/head/hooded/cloakhood/drake + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + resistance_flags = FIRE_PROOF | ACID_PROOF + transparent_protection = HIDEGLOVES|HIDESUITSTORAGE|HIDEJUMPSUIT|HIDESHOES + +/obj/item/clothing/head/hooded/cloakhood/drake + name = "drake helm" + icon_state = "dragon" + desc = "The skull of a dragon." + armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100) + heat_protection = HEAD + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm deleted file mode 100644 index 935c0bc38a45..000000000000 --- a/code/modules/clothing/suits/cloaks.dm +++ /dev/null @@ -1,89 +0,0 @@ -//Cloaks. No, not THAT kind of cloak. - -/obj/item/clothing/neck/cloak - name = "brown cloak" - desc = "It's a cape that can be worn around your neck." - icon = 'icons/obj/clothing/cloaks.dmi' - icon_state = "qmcloak" - item_state = "qmcloak" - w_class = WEIGHT_CLASS_SMALL - body_parts_covered = CHEST|GROIN|LEGS|ARMS - flags_inv = HIDESUITSTORAGE - -/obj/item/clothing/neck/cloak/suicide_act(mob/user) - user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) - return(OXYLOSS) - -/obj/item/clothing/neck/cloak/hos - name = "head of security's cloak" - desc = "Worn by Securistan, ruling the station with an iron fist." - icon_state = "hoscloak" - -/obj/item/clothing/neck/cloak/qm - name = "quartermaster's cloak" - desc = "Worn by Cargonia, supplying the station with the necessary tools for survival." - -/obj/item/clothing/neck/cloak/cmo - name = "chief medical officer's cloak" - desc = "Worn by Meditopia, the valiant men and women keeping pestilence at bay." - icon_state = "cmocloak" - -/obj/item/clothing/neck/cloak/ce - name = "chief engineer's cloak" - desc = "Worn by Engitopia, wielders of an unlimited power." - icon_state = "cecloak" - resistance_flags = FIRE_PROOF - -/obj/item/clothing/neck/cloak/rd - name = "research director's cloak" - desc = "Worn by Sciencia, thaumaturges and researchers of the universe." - icon_state = "rdcloak" - -/obj/item/clothing/neck/cloak/cap - name = "captain's cloak" - desc = "Worn by the commander of Space Station 13." - icon_state = "capcloak" - -/obj/item/clothing/neck/cloak/hop - name = "head of personnel's cloak" - desc = "Worn by the Head of Personnel. It smells faintly of bureaucracy." - icon_state = "hopcloak" - -/obj/item/clothing/suit/hooded/cloak/goliath - name = "goliath cloak" - icon_state = "goliath_cloak" - desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits." - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/twohanded/bonespear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival) - armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot - hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath - body_parts_covered = CHEST|GROIN|ARMS - -/obj/item/clothing/head/hooded/cloakhood/goliath - name = "goliath cloak hood" - icon_state = "golhood" - desc = "A protective & concealing hood." - armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) - flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR - transparent_protection = HIDEMASK - -/obj/item/clothing/suit/hooded/cloak/drake - name = "drake armour" - icon_state = "dragon" - desc = "A suit of armour fashioned from the remains of an ash drake." - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/spear) - armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100) - hoodtype = /obj/item/clothing/head/hooded/cloakhood/drake - heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - resistance_flags = FIRE_PROOF | ACID_PROOF - transparent_protection = HIDEGLOVES|HIDESUITSTORAGE|HIDEJUMPSUIT|HIDESHOES - -/obj/item/clothing/head/hooded/cloakhood/drake - name = "drake helm" - icon_state = "dragon" - desc = "The skull of a dragon." - armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100) - heat_protection = HEAD - max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index beface72fb8c..822033444066 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -244,7 +244,6 @@ /obj/item/storage/backpack/captain = 1, /obj/item/storage/backpack/satchel/cap = 1, /obj/item/storage/backpack/duffelbag/captain = 1, - /obj/item/clothing/neck/yogs/shawl/cap = 1, //Yogs /obj/item/clothing/shoes/sneakers/brown = 1, /obj/item/clothing/under/rank/captain = 1, /obj/item/clothing/under/rank/captain/skirt = 1, diff --git a/icons/mob/neck.dmi b/icons/mob/neck.dmi index 2961b0abebb7..0cb2da3e6e5d 100644 Binary files a/icons/mob/neck.dmi and b/icons/mob/neck.dmi differ diff --git a/icons/obj/clothing/cloaks.dmi b/icons/obj/clothing/cloaks.dmi deleted file mode 100644 index dd1ae7d72754..000000000000 Binary files a/icons/obj/clothing/cloaks.dmi and /dev/null differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index af4b5dd2c015..a1f1fd019683 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/yogstation.dme b/yogstation.dme index ce9abe0f3bf7..d64bfdb9dbaf 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -1771,7 +1771,6 @@ #include "code\modules\clothing\suits\armor.dm" #include "code\modules\clothing\suits\bio.dm" #include "code\modules\clothing\suits\chaplainsuits.dm" -#include "code\modules\clothing\suits\cloaks.dm" #include "code\modules\clothing\suits\jobs.dm" #include "code\modules\clothing\suits\labcoat.dm" #include "code\modules\clothing\suits\miscellaneous.dm" @@ -3433,7 +3432,6 @@ #include "yogstation\code\modules\clothing\head\misc_special.dm" #include "yogstation\code\modules\clothing\masks\hailer.dm" #include "yogstation\code\modules\clothing\neck\_neck.dm" -#include "yogstation\code\modules\clothing\neck\shawls.dm" #include "yogstation\code\modules\clothing\outfits\event.dm" #include "yogstation\code\modules\clothing\shoes\miscellaneous.dm" #include "yogstation\code\modules\clothing\shoes\special_shoes.dm" diff --git a/yogstation/code/modules/clothing/neck/shawls.dm b/yogstation/code/modules/clothing/neck/shawls.dm deleted file mode 100644 index 6447ade41e17..000000000000 --- a/yogstation/code/modules/clothing/neck/shawls.dm +++ /dev/null @@ -1,90 +0,0 @@ -//Shawls -/obj/item/clothing/neck/yogs/shawl - name = "leather shawl" - desc = "A leather shawl made to protect the wearer from the dangers of lavaland." - icon_state = "leathershawl" - item_state = "leathershawl" - var/alticon_state = null - var/altitem_state = null - -/obj/item/clothing/neck/yogs/shawl/AltClick(mob/user) - var/mob/living/carbon/human/human_user = null - if(..()) - return 1 - - if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) - return - if(istype(user, /mob/living/carbon/human)) - human_user = user - if(human_user.wear_neck == src) - to_chat(user, span_warning("You can't adjust [src] while wearing it!")) - return - if(alticon_state) - toggle_alt(user) - -/obj/item/clothing/neck/yogs/shawl/proc/toggle_alt(mob/user) - if(!altitem_state) - altitem_state = alticon_state - if(icon_state == alticon_state) - icon_state = initial(icon_state) - item_state = initial(item_state) - else - icon_state = alticon_state - item_state = altitem_state - -/obj/item/clothing/neck/yogs/shawl/examine(mob/user) - . = ..() - if(alticon_state) - . += "[src] has a different design on the inside. You can wear it inside out with alt click." - -//Head's Shawls - These are replacements for the old head cloaks. Leaving them here so I dont have to copy code over for the functionality. -/obj/item/clothing/neck/yogs/shawl/cap - name = "captain's cloak" - desc = "A hand crafted cloak made for the captain to protect them from the dangers of the station." - icon_state = "capshawl" - item_state = "capshawl" - resistance_flags = FIRE_PROOF - -/obj/item/clothing/neck/yogs/shawl/hop - name = "head of personnel's cloak" - desc = "A hand crafted cloak made for the head of personnel to protect them from the dangers of paperwork." - icon_state = "hopshawl" - item_state = "hopshawl" - resistance_flags = FIRE_PROOF - -/obj/item/clothing/neck/yogs/shawl/hos - name = "head of security's cloak" - desc = "A hand crafted cloak made for the head of security to protect them from the dangers of looking unrobust." - icon_state = "hosshawl" - item_state = "hosshawl" - resistance_flags = FIRE_PROOF - -/obj/item/clothing/neck/yogs/shawl/cmo - name = "chief medical officer's cloak" - desc = "A hand crafted cloak made for the chief medical officer to protect them from the dangers of the medicine." - icon_state = "cmoshawl" - item_state = "cmoshawl" - resistance_flags = FIRE_PROOF - -/obj/item/clothing/neck/yogs/shawl/ce - name = "chief engineer's cloak" - desc = "A hand crafted cloak made for the chief engineer to protect them from the dangers of the engineering." - icon_state = "ceshawl" - item_state = "ceshawl" - resistance_flags = FIRE_PROOF - alticon_state = "ceshawlalt" //Uses an orange shawl that I dint use originaly, gives a little diversity - -/obj/item/clothing/neck/yogs/shawl/rd - name = "research director's cloak" - desc = "A hand crafted cloak made for the research director to protect them from the dangers of the science." - icon_state = "rdshawl" - item_state = "rdshawl" - resistance_flags = FIRE_PROOF - -/obj/item/clothing/neck/yogs/shawl/qm - name = "quartermaster's cloak" - desc = "A hand crafted cloak made for the quarter master to protect them from the dangers of lavaland." - icon_state = "qmshawl" - item_state = "qmshawl" - resistance_flags = FIRE_PROOF - alticon_state = "leathershawl" //I originaly made this icon for the QM's cloak before I noticed the curent one, this is for the people who prefer the old QM cloak diff --git a/yogstation/icons/mob/neck.dmi b/yogstation/icons/mob/neck.dmi index f70df3a84ae5..445b5727be45 100644 Binary files a/yogstation/icons/mob/neck.dmi and b/yogstation/icons/mob/neck.dmi differ