diff --git a/code/datums/elements/clothing_adjustment.dm b/code/datums/elements/clothing_adjustment.dm index 4cf9141a51c..8cb93ebd706 100644 --- a/code/datums/elements/clothing_adjustment.dm +++ b/code/datums/elements/clothing_adjustment.dm @@ -60,3 +60,52 @@ overlay.pixel_x = pixel_x overlay.pixel_y = pixel_y + +// Clothing Adjustments Handling Skkulakin + +/datum/element/clothing_adjustment/skulk_headgear + var/alist/directions + +/datum/element/clothing_adjustment/skulk_headgear/Attach(datum/target, alist/directions) + if(!istype(directions)) + return ELEMENT_INCOMPATIBLE + + . = ..() + + directions = directions + +/datum/element/clothing_adjustment/skulk_headgear/proc/update_overlay(mob/living/carbon/human/target, face_dir = null) + if(!face_dir) + face_dir = target.dir + + var/mutable_appearance/overlay = target.overlays_standing[HEAD_LAYER] + overlay.pixel_x = directions[face_dir][0] + overlay.pixel_y = directions[face_dir][1] + +/datum/element/clothing_adjustment/skulk_headgear/on_item_equipped(datum/source, mob/target) + RegisterSignal(target, COMSIG_CARBON_APPLY_OVERLAY, PROC_REF(on_carbon_apply_overlay), override = TRUE) + RegisterSignal(target, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_atom_dir_change), override = TRUE) + +/datum/element/clothing_adjustment/skulk_headgear/on_item_dropped(datum/source, mob/target) + UnregisterSignal(target, list(COMSIG_CARBON_APPLY_OVERLAY, COMSIG_ATOM_DIR_CHANGE)) + +/datum/element/clothing_adjustment/skulk_headgear/proc/on_carbon_apply_overlay(mob/living/carbon/human/source, cache_index, mutable_appearance/overlay) + SIGNAL_HANDLER // COMSIG_CARBON_APPLY_OVERLAY + if(cache_index != HEAD_LAYER || !istype(source)) + return + + var/datum/species = source.dna?.species + if(!istype(species)) + return + + if(!istype(species, /datum/species/skulk)) + return + + update_overlay(source) + +/datum/element/clothing_adjustment/skulk_headgear/proc/on_atom_dir_change(mob/living/carbon/human/source, old_dir, new_dir) + SIGNAL_HANDLER // COMSIG_ATOM_DIR_CHANGE + if(old_dir == new_dir) + return + + update_overlay(source, new_dir) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 08b1dddb692..0a02f47c813 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -418,6 +418,7 @@ /obj/item/nullrod/fedora/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/nullrod/armblade name = "dark blessing" diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index 18b3a65a6bd..639d5b53e50 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -14,6 +14,7 @@ /obj/item/clothing/head/beret/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/beret/blue icon_state = "beret_blue" diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 3d9cb3ec80d..3f506762f02 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -13,6 +13,7 @@ /obj/item/clothing/head/collectable/petehat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/collectable/slime name = "collectable slime cap!" @@ -35,6 +36,7 @@ /obj/item/clothing/head/collectable/chef/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/collectable/paper name = "collectable paper hat" @@ -45,6 +47,7 @@ /obj/item/clothing/head/collectable/paper/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/collectable/tophat name = "collectable top hat" @@ -56,6 +59,7 @@ /obj/item/clothing/head/collectable/tophat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/collectable/captain name = "collectable captain's hat" @@ -67,6 +71,7 @@ /obj/item/clothing/head/collectable/captain/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/collectable/police name = "collectable police officer's hat" @@ -133,6 +138,7 @@ /obj/item/clothing/head/collectable/wizard/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/collectable/hardhat name = "collectable hard hat" @@ -149,6 +155,7 @@ /obj/item/clothing/head/collectable/hos/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/collectable/hop name = "collectable HoP hat" @@ -159,6 +166,7 @@ /obj/item/clothing/head/collectable/hop/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/collectable/thunderdome name = "collectable Thunderdome helmet" diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index e736e393e59..4b0352ae32b 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -109,6 +109,7 @@ /obj/item/clothing/head/hardhat/atmos/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/hardhat/durathread name = "durathread hard hat" diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 4558c2fe2b4..c94b7b4d88c 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -30,6 +30,7 @@ /obj/item/clothing/head/chefhat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //Captain /obj/item/clothing/head/caphat @@ -49,6 +50,7 @@ /obj/item/clothing/head/caphat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/caphat/parade name = "captain's parade cap" @@ -58,6 +60,7 @@ /obj/item/clothing/head/caphat/parade/Initialize(mapload) . = ..() RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/caphat/parade/white name = "captain's white parade cap" @@ -79,6 +82,7 @@ /obj/item/clothing/head/hop/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //Quartermaster /obj/item/clothing/head/qm @@ -95,6 +99,7 @@ /obj/item/clothing/head/qm/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //Nanotrasen Representative /obj/item/clothing/head/ntrep @@ -111,6 +116,7 @@ /obj/item/clothing/head/ntrep/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //Chaplain /obj/item/clothing/head/hooded/chaplain_hood @@ -294,6 +300,7 @@ /obj/item/clothing/head/hos/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/warden name = "warden's police hat" @@ -340,6 +347,7 @@ /obj/item/clothing/head/rd/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //Medical /obj/item/clothing/head/cmo @@ -357,6 +365,7 @@ /obj/item/clothing/head/cmo/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/surgery name = "blue surgical cap" @@ -402,3 +411,4 @@ /obj/item/clothing/head/drilltrainer/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index d33cb9623e6..907f522c588 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -11,6 +11,7 @@ /obj/item/clothing/head/centhat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/hairflower name = "hair flower pin" @@ -41,6 +42,7 @@ /obj/item/clothing/head/that/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/redcoat name = "redcoat's hat" @@ -71,6 +73,7 @@ /obj/item/clothing/head/plaguedoctorhat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/hasturhood name = "hastur's hood" @@ -210,6 +213,7 @@ /obj/item/clothing/head/cowboyhat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/cowboyhat/tan name = "tan cowboy hat" @@ -254,6 +258,7 @@ /obj/item/clothing/head/fedora/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/fedora/attack_self__legacy__attackchain(mob/user) tip_fedora(user) @@ -282,6 +287,7 @@ /obj/item/clothing/head/fez/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 2) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //end bs12 hats @@ -295,6 +301,7 @@ /obj/item/clothing/head/witchwig/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/chicken name = "chicken suit head" @@ -315,6 +322,7 @@ /obj/item/clothing/head/corgi/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/corgi/en name = "E-N suit head" @@ -323,6 +331,7 @@ /obj/item/clothing/head/corgi/en/Initialize(mapload) . = ..() RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/corgi/super_hero name = "super-hero corgi suit head" @@ -336,6 +345,7 @@ /obj/item/clothing/head/corgi/super_hero/en/Initialize(mapload) . = ..() RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/bearpelt name = "space bear pelt hat" @@ -367,6 +377,7 @@ /obj/item/clothing/head/xenos/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /// Why do these exist - Because they aren't specifically Nazi Germany /obj/item/clothing/head/stalhelm @@ -386,6 +397,7 @@ /obj/item/clothing/head/foragecap/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/armyofficer name = "clown officer cap" @@ -412,6 +424,7 @@ /obj/item/clothing/head/sombrero/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/sombrero/green name = "green sombrero" @@ -456,6 +469,7 @@ /obj/item/clothing/head/rice_hat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi' @@ -520,6 +534,7 @@ /obj/item/clothing/head/crown/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/crown/fancy name = "magnificent crown" @@ -530,6 +545,8 @@ . = ..() RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 2) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/zepelli name = "chequered diamond hat" @@ -539,6 +556,7 @@ /obj/item/clothing/head/zepelli/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/cuban_hat name = "rhumba hat" @@ -549,6 +567,7 @@ /obj/item/clothing/head/cuban_hat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/flower_crown name = "flower crown" @@ -563,6 +582,7 @@ /obj/item/clothing/head/flower_crown/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/sunflower_crown name = "sunflower crown" @@ -577,6 +597,7 @@ /obj/item/clothing/head/sunflower_crown/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/poppy_crown name = "poppy crown" @@ -591,6 +612,7 @@ /obj/item/clothing/head/poppy_crown/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/lily_crown name = "lily crown" @@ -616,6 +638,7 @@ /obj/item/clothing/head/geranium_crown/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/cool_bandana name = "badass bandana" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 7fc515345e6..dae2a43ecab 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -67,6 +67,7 @@ /obj/item/clothing/head/cakehat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 3) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/cakehat/process() if(!onfire) diff --git a/code/modules/clothing/spacesuits/misc_spacesuits.dm b/code/modules/clothing/spacesuits/misc_spacesuits.dm index c2058eb7bcc..a4b2346603e 100644 --- a/code/modules/clothing/spacesuits/misc_spacesuits.dm +++ b/code/modules/clothing/spacesuits/misc_spacesuits.dm @@ -81,6 +81,7 @@ /obj/item/clothing/head/helmet/space/deathsquad/beret/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/helmet/space/deathsquad/beret/solgov name = "\improper TSF staff officer's beret" diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 5f96c895271..62ea4039970 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -15,6 +15,7 @@ /obj/item/clothing/head/wizard/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/wizard/red name = "red wizard hat" @@ -59,6 +60,7 @@ /obj/item/clothing/head/wizard/fake/Initialize(mapload) . = ..() RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/wizard/marisa name = "witch hat" @@ -77,6 +79,7 @@ /obj/item/clothing/head/wizard/magus/Initialize(mapload) . = ..() RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/head/wizard/amp name = "psychic amplifier" @@ -88,6 +91,7 @@ /obj/item/clothing/head/wizard/amp/Initialize(mapload) . = ..() RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) /obj/item/clothing/suit/wizrobe name = "wizard robe" diff --git a/code/modules/holiday/christmas.dm b/code/modules/holiday/christmas.dm index 00a5c06b3e7..8f34635a770 100644 --- a/code/modules/holiday/christmas.dm +++ b/code/modules/holiday/christmas.dm @@ -71,3 +71,4 @@ /obj/item/clothing/head/festive/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, directions = alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0)))