diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 82578839108..cde4da046c1 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -46,9 +46,9 @@ #define GLASSES_LAYER 13 #define BELT_LAYER 12 //Possible make this an overlay of somethign required to wear a belt? #define SUIT_STORE_LAYER 11 -#define BACK_LAYER 10 -#define HAIR_LAYER 9 //TODO: make part of head layer? -#define NECK_LAYER 8 +#define NECK_LAYER 10 +#define BACK_LAYER 9 +#define HAIR_LAYER 8 //TODO: make part of head layer? #define FACEMASK_LAYER 7 #define HEAD_LAYER 6 #define HANDCUFF_LAYER 5 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 cffae32fa4a..7fdcc626778 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -5,7 +5,7 @@ /obj/structure/closet/secure_closet/quartermaster/New() ..() - new /obj/item/clothing/suit/cloak/qm(src) + new /obj/item/clothing/neck/cloak/qm(src) new /obj/item/clothing/under/rank/cargo(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/device/radio/headset/headset_cargo(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 d351b44af88..a3ca6805bff 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -5,7 +5,7 @@ /obj/structure/closet/secure_closet/engineering_chief/New() ..() - new /obj/item/clothing/suit/cloak/ce(src) + new /obj/item/clothing/neck/cloak/ce(src) new /obj/item/clothing/under/rank/chief_engineer(src) new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/welding(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 3db76dbcc69..0632457c1ab 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -54,7 +54,7 @@ /obj/structure/closet/secure_closet/CMO/New() ..() - new /obj/item/clothing/suit/cloak/cmo(src) + new /obj/item/clothing/neck/cloak/cmo(src) new /obj/item/weapon/storage/backpack/dufflebag/med(src) new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(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 16e5ec00e0f..4ed65937977 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -5,7 +5,7 @@ /obj/structure/closet/secure_closet/RD/New() ..() - new /obj/item/clothing/suit/cloak/rd(src) + new /obj/item/clothing/neck/cloak/rd(src) 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) 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 d2143b13ba0..8a3e6da43b4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -10,7 +10,7 @@ new /obj/item/weapon/storage/backpack/captain(src) else new /obj/item/weapon/storage/backpack/satchel/cap(src) - new /obj/item/clothing/suit/cloak/cap(src) + new /obj/item/clothing/neck/cloak/cap(src) new /obj/item/weapon/storage/backpack/dufflebag/captain(src) new /obj/item/clothing/head/crown/fancy(src) new /obj/item/clothing/suit/captunic(src) @@ -60,7 +60,7 @@ /obj/structure/closet/secure_closet/hos/New() ..() - new /obj/item/clothing/suit/cloak/hos(src) + new /obj/item/clothing/neck/cloak/hos(src) new /obj/item/weapon/cartridge/hos(src) new /obj/item/device/radio/headset/heads/hos(src) new /obj/item/clothing/under/hosparadefem(src) diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index 0cf15c7a6e4..222c4c070fc 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -1,8 +1,8 @@ //Cloaks. No, not THAT kind of cloak. -/obj/item/clothing/suit/cloak +/obj/item/clothing/neck/cloak name = "brown cloak" - desc = "It's a cape that can be worn on your back." + desc = "It's a cape that can be worn around your neck." icon = 'icons/obj/clothing/cloaks.dmi' icon_state = "qmcloak" item_state = "qmcloak" @@ -18,48 +18,38 @@ flags = NODROP flags_inv = HIDEHAIR|HIDEEARS -/obj/item/clothing/suit/cloak/suicide_act(mob/user) +/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/suit/cloak/hos +/obj/item/clothing/neck/cloak/hos name = "head of security's cloak" desc = "Worn by Securistan, ruling the station with an iron fist. It's slightly armored." icon_state = "hoscloak" - allowed = list(/obj/item/weapon/gun/energy/e_gun/hos) - armor = list(melee = 30, bullet = 30, laser = 10, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 60) -/obj/item/clothing/suit/cloak/qm +/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/suit/cloak/cmo +/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. It's slightly shielded from contaminants." icon_state = "cmocloak" - allowed = list(/obj/item/weapon/reagent_containers/hypospray/CMO) - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 25, rad = 0, fire = 0, acid = 25) -/obj/item/clothing/suit/cloak/ce +/obj/item/clothing/neck/cloak/ce name = "chief engineer's cloak" desc = "Worn by Engitopia, wielders of an unlimited power. It's slightly shielded against radiation." icon_state = "cecloak" - allowed = list(/obj/item/weapon/rcd, /obj/item/weapon/pipe_dispenser) - armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10, fire = 0, acid = 25) -/obj/item/clothing/suit/cloak/rd +/obj/item/clothing/neck/cloak/rd name = "research director's cloak." desc = "Worn by Sciencia, thaumaturges and researchers of the universe. It's slightly shielded from contaminants." icon_state = "rdcloak" - allowed = list(/obj/item/weapon/hand_tele, /obj/item/weapon/storage/part_replacer) - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 25) -/obj/item/clothing/suit/cloak/cap +/obj/item/clothing/neck/cloak/cap name = "captain's cloak" desc = "Worn by the commander of Space Station 13." icon_state = "capcloak" - allowed = list(/obj/item/weapon/gun/energy/laser/captain) - armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 10, rad = 10, fire = 0, acid = 50) /obj/item/clothing/suit/hooded/cloak/drake name = "drake armour" @@ -82,54 +72,3 @@ heat_protection = HEAD max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF - -/* //wip -/obj/item/clothing/cloak/wizard //Not actually obtainable until proper balancing can be done - name = "cloak of invisibility" - desc = "A tattered old thing that apparently gifts the wearer with near-invisibility." - armor = list(melee = 10, bullet = 10, laser = 10, energy = 10, bomb = 10, bio = 10, rad = 10, fire = 10, acid = 10) - action_button_name = "Flaunt Cloak" - var/invisible = 0 - -/obj/item/clothing/cloak/wizard/ui_action_click() - toggleInvisibility(usr) - return - -/obj/item/clothing/cloak/wizard/proc/toggleInvisibility(mob/user) - if(user.slot_back != src) - user << "You need to be wearing the cloak first!" - return - user.visible_message("[user] flaunts [src]!") - if(!invisible) - makeInvisible(user) - return - if(invisible) - breakInvisible(user) - return - -/obj/item/clothing/cloak/wizard/proc/makeInvisible(mob/user) - if(!invisible) - user.visible_message("[user] suddenly fades away!", \ - "You have become nearly invisible. This will require slow movement and will break upon taking damage.") - flags |= NODROP //Cannot unequip while invisible - user.alpha = 10 - slowdown = 2 - invisible = 1 - -/obj/item/clothing/cloak/wizard/proc/breakInvisible(mob/user) - if(invisible) - user.visible_message("[user] suddenly appears from thin air!", \ - "The enchantment has broken! You are visible again.") - flags -= NODROP - user.alpha = 255 - slowdown = 0 - invisible = 0 - -/obj/item/clothing/cloak/wizard/IsShield() - breakInvisible(src.loc) - return 0 - -/obj/item/clothing/cloak/wizard/IsReflect() - breakInvisible(src.loc) - return 0 -*/ diff --git a/icons/mob/neck.dmi b/icons/mob/neck.dmi index 2b33ede1f6e..17b366d9ea9 100644 Binary files a/icons/mob/neck.dmi and b/icons/mob/neck.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 46090c50f78..b162503d9c6 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ