From 7663d18243893e8439a1ea30b7f2dfb305a98679 Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Thu, 9 Jan 2025 23:57:07 +0000 Subject: [PATCH] [MIRROR] Inflatables + Ladders Fixes --- code/game/objects/structures/inflatable.dm | 10 ++++++++++ code/modules/multiz/structures.dm | 1 + 2 files changed, 11 insertions(+) diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index c2e6a0d0c8762..9aeee20a97fee 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -14,6 +14,9 @@ var/turf/T = get_turf(target) if (!user.TurfAdjacent(T)) return + if (health_dead()) + USE_FEEDBACK_FAILURE("\The [src] is too torn to be inflated.") + return TRUE if (isspaceturf(T) || isopenspace(T)) to_chat(user, SPAN_WARNING("You cannot use \the [src] in open space.")) return TRUE @@ -29,6 +32,9 @@ ) if (!do_after(user, 1 SECOND, target, DO_PUBLIC_UNIQUE) || QDELETED(src)) return TRUE + if (health_dead()) + USE_FEEDBACK_FAILURE("\The [src] is too torn to be inflated.") + return TRUE obstruction = T.get_obstruction() if (obstruction) to_chat(user, SPAN_WARNING("\The [english_list(obstruction)] is blocking that spot.")) @@ -314,6 +320,10 @@ icon = 'icons/obj/structures/inflatable.dmi' icon_state = "folded_wall_torn" +/obj/item/inflatable/torn/Initialize() + . = ..() + kill_health() + /obj/item/inflatable/torn/attack_self(mob/user) to_chat(user, SPAN_NOTICE("The inflatable wall is too torn to be inflated!")) add_fingerprint(user) diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index edc7477ad4bf6..9707d41a1beae 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -57,6 +57,7 @@ /obj/structure/ladder/use_tool(obj/item/tool, mob/user, list/click_params) SHOULD_CALL_PARENT(FALSE) climb(user, tool) + return TRUE /turf/hitby(atom/movable/AM)