From 2d93d61699e85472d7ab4e78c6a74168c3e6a716 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Sat, 20 Dec 2025 17:37:57 -0500 Subject: [PATCH] improve skulk headwear offset --- code/datums/elements/clothing_adjustment.dm | 43 +++++++++-------- .../objects/items/weapons/holy_weapons.dm | 2 +- code/modules/clothing/head/beret.dm | 2 +- code/modules/clothing/head/collectable.dm | 16 +++---- code/modules/clothing/head/hardhat.dm | 2 +- code/modules/clothing/head/job_hats.dm | 20 ++++---- code/modules/clothing/head/misc_hats.dm | 46 +++++++++---------- code/modules/clothing/head/misc_special.dm | 2 +- .../clothing/spacesuits/misc_spacesuits.dm | 2 +- code/modules/clothing/suits/wiz_robe.dm | 8 ++-- code/modules/holiday/christmas.dm | 2 +- .../living/carbon/human/human_update_icons.dm | 7 ++- 12 files changed, 75 insertions(+), 77 deletions(-) diff --git a/code/datums/elements/clothing_adjustment.dm b/code/datums/elements/clothing_adjustment.dm index 8cb93ebd706..886835e135e 100644 --- a/code/datums/elements/clothing_adjustment.dm +++ b/code/datums/elements/clothing_adjustment.dm @@ -44,7 +44,7 @@ /datum/element/clothing_adjustment/monitor_headgear/on_item_dropped(datum/source, mob/target) UnregisterSignal(target, COMSIG_CARBON_APPLY_OVERLAY) -/datum/element/clothing_adjustment/monitor_headgear/proc/on_carbon_apply_overlay(mob/living/carbon/source, cache_index, mutable_appearance/overlay) +/datum/element/clothing_adjustment/monitor_headgear/proc/on_carbon_apply_overlay(mob/living/carbon/human/source, cache_index) SIGNAL_HANDLER // COMSIG_CARBON_APPLY_OVERLAY if(cache_index != HEAD_LAYER || !istype(source)) return @@ -58,6 +58,7 @@ if(!robohead?.is_monitor) return + var/mutable_appearance/overlay = source.overlays_standing[cache_index] overlay.pixel_x = pixel_x overlay.pixel_y = pixel_y @@ -66,30 +67,27 @@ /datum/element/clothing_adjustment/skulk_headgear var/alist/directions -/datum/element/clothing_adjustment/skulk_headgear/Attach(datum/target, alist/directions) - if(!istype(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] + directions = directions_ /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)) + UnregisterSignal(target, list(COMSIG_CARBON_APPLY_OVERLAY)) -/datum/element/clothing_adjustment/skulk_headgear/proc/on_carbon_apply_overlay(mob/living/carbon/human/source, cache_index, mutable_appearance/overlay) + var/mob/living/carbon/human/human = target + if(!istype(human)) + return + + human.update_inv_head() + +/datum/element/clothing_adjustment/skulk_headgear/proc/on_carbon_apply_overlay(mob/living/carbon/human/source, cache_index) SIGNAL_HANDLER // COMSIG_CARBON_APPLY_OVERLAY if(cache_index != HEAD_LAYER || !istype(source)) return @@ -101,11 +99,12 @@ if(!istype(species, /datum/species/skulk)) return - update_overlay(source) + var/icon/I = new() + var/image/overlay = source.overlays_standing[cache_index] + for(var/dir in GLOB.cardinal) + var/icon/dir_image = icon(overlay.icon, overlay.icon_state) + dir_image.Shift(NORTH, directions[dir][1]) + dir_image.Shift(WEST, directions[dir][2]) + I.Insert(dir_image, dir = dir) -/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) + source.overlays_standing[cache_index] = I diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 0a02f47c813..4ffa45685b5 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -418,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 639d5b53e50..04294c6cd5f 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -14,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 3f506762f02..ceadb525b50 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -13,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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!" @@ -36,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -47,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -59,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -71,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -138,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -155,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -166,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 4b0352ae32b..058e75135c8 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -109,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 c94b7b4d88c..fb6b18f1997 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -30,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //Captain /obj/item/clothing/head/caphat @@ -50,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -60,7 +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))) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -82,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //Quartermaster /obj/item/clothing/head/qm @@ -99,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //Nanotrasen Representative /obj/item/clothing/head/ntrep @@ -116,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 @@ -300,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -347,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //Medical /obj/item/clothing/head/cmo @@ -365,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -411,4 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 907f522c588..44fdd4bcd49 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -11,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -42,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -73,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -213,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -258,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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) @@ -287,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) //end bs12 hats @@ -301,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -322,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -331,7 +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))) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -345,7 +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))) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -377,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 @@ -397,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -424,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -469,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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' @@ -534,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -545,8 +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))) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -556,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -567,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -582,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -597,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -612,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -638,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 dae2a43ecab..3d029477e7f 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -67,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 a4b2346603e..06772ef35ab 100644 --- a/code/modules/clothing/spacesuits/misc_spacesuits.dm +++ b/code/modules/clothing/spacesuits/misc_spacesuits.dm @@ -81,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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 62ea4039970..35f4fc7bb91 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -15,7 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -60,7 +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))) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -79,7 +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))) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, 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" @@ -91,7 +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))) + RemoveElement(/datum/element/clothing_adjustment/skulk_headgear, 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 8f34635a770..02556775d0c 100644 --- a/code/modules/holiday/christmas.dm +++ b/code/modules/holiday/christmas.dm @@ -71,4 +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))) + AddElement(/datum/element/clothing_adjustment/skulk_headgear, alist(SOUTH = list(0, -1), NORTH = list(0, -1), EAST = list(-2, 0), WEST = list(2, 0))) diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 94edb4df234..e32f1938037 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -104,10 +104,9 @@ Please contact me on #coderbus IRC. ~Carn x */ /mob/living/carbon/human/proc/apply_overlay(cache_index) - . = overlays_standing[cache_index] - SEND_SIGNAL(src, COMSIG_CARBON_APPLY_OVERLAY, cache_index, .) - if(.) - add_overlay(.) + SEND_SIGNAL(src, COMSIG_CARBON_APPLY_OVERLAY, cache_index) + if(overlays_standing[cache_index]) + add_overlay(overlays_standing[cache_index]) /mob/living/carbon/human/proc/remove_overlay(cache_index) var/I = overlays_standing[cache_index]