Merge branch 'master' into translate

ss220club · Dec 16, 2023 · 64f1237 · 64f1237
2 parents e301ac1 + 07390a4
commit 64f1237
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git 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)

diff --git 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
@@ -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
@@ -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)
 	. = ..()