From e6b2339424fd1eee0dce2199ddbdea2a520e7674 Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Fri, 15 Dec 2023 21:33:25 -0300 Subject: [PATCH 1/2] Another jani HUD runtime fix (#23569) --- code/game/objects/effects/decals/cleanable.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 0c5600e7f080..35d339aebcb7 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -87,6 +87,10 @@ /obj/effect/decal/cleanable/Initialize(mapload) . = ..() + var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR] + prepare_huds() + jani_hud.add_to_hud(src) + jani_hud_set_sign() if(try_merging_decal()) return TRUE if(random_icon_states && length(src.random_icon_states) > 0) @@ -96,10 +100,6 @@ QUEUE_SMOOTH_NEIGHBORS(src) if(iswallturf(loc) && plane == FLOOR_PLANE) plane = GAME_PLANE // so they can be seen above walls - var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR] - prepare_huds() - jani_hud.add_to_hud(src) - jani_hud_set_sign() /obj/effect/decal/cleanable/Destroy() if(smoothing_flags) From 6a84d3219096c7a79c36dbb9d2ba93254f682c1f Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sat, 16 Dec 2023 01:35:32 +0100 Subject: [PATCH 2/2] I forgor to open this yesterday (#23572) --- code/modules/clothing/clothing.dm | 3 --- code/modules/clothing/shoes/magboots.dm | 3 --- code/modules/mob/living/carbon/human/human_movement.dm | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index de356a7bd45e..efdaafea15ff 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -524,9 +524,6 @@ icon_state = "[icon_state]_opentoe" item_state = "[item_state]_opentoe" -/obj/item/proc/negates_gravity() - return - //Suit /obj/item/clothing/suit name = "suit" diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index b91d89b178e6..88b9be267c52 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -60,9 +60,6 @@ if(HAS_TRAIT(user, TRAIT_MAGPULSE)) // User has trait and the magboots were turned off, remove trait REMOVE_TRAIT(user, TRAIT_MAGPULSE, "magboots") -/obj/item/clothing/shoes/magboots/negates_gravity() - return flags & NOSLIP - /obj/item/clothing/shoes/magboots/examine(mob/user) . = ..() . += "Its [magpulse_name] appears to be [magpulse ? "enabled" : "disabled"]." diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 74c15e48f1c1..dd035515c2e2 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -33,7 +33,7 @@ . = 1 /mob/living/carbon/human/mob_negates_gravity() - return shoes && shoes.negates_gravity() + return HAS_TRAIT(src, TRAIT_MAGPULSE) /mob/living/carbon/human/Move(NewLoc, direct) . = ..()