Skip to content

Commit

Permalink
[MIRROR] Inflatables + Ladders Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
SierraKomodo authored and SierraHelper committed Jan 9, 2025
1 parent 8265ea5 commit 7663d18
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
10 changes: 10 additions & 0 deletions code/game/objects/structures/inflatable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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."))
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/multiz/structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 7663d18

Please sign in to comment.