cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve skulk headwear offset

Browse Source
This commit is contained in:
warriorstar-orion
2025-12-20 18:22:00 -05:00
parent bd4ebcba21
commit 2d93d61699
12 changed files with 75 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/clothing_adjustment.dm
+21 -22
View File
@@ -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
code/game/objects/items/weapons/holy_weapons.dm
+1 -1
View File
@@ -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"
code/modules/clothing/head/beret.dm
+1 -1
View File
@@ -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"
code/modules/clothing/head/collectable.dm
+8 -8
View File
@@ -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"
code/modules/clothing/head/hardhat.dm
+1 -1
View File
@@ -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"
code/modules/clothing/head/job_hats.dm
+10 -10
View File
@@ -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)))
code/modules/clothing/head/misc_hats.dm
+23 -23
View File
@@ -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"
code/modules/clothing/head/misc_special.dm
+1 -1
View File
@@ -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)
code/modules/clothing/spacesuits/misc_spacesuits.dm
+1 -1
View File
@@ -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"
code/modules/clothing/suits/wiz_robe.dm
+4 -4
View File
@@ -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"
code/modules/holiday/christmas.dm
+1 -1
View File
@@ -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)))
code/modules/mob/living/carbon/human/human_update_icons.dm
+3 -4
View File
@@ -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]