From 796aae194c828a89d578de8e03fbbb4270516cf9 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 5 Dec 2021 09:36:39 +1000 Subject: [PATCH] Allows simplemobs climb ladders + trash pile interaction fix --- code/game/objects/structures/trash_pile_vr.dm | 4 ++-- code/modules/multiz/ladders.dm | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 4fea789eb2f..600adb63518 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -69,13 +69,13 @@ var/mob/living/L = user //They're in it, and want to get out. if(L.loc == src) - var/choice = tgui_alert(usr, "Do you want to exit \the [src]?","Un-Hide?",list("Exit","Stay")) + var/choice = tgui_alert(user, "Do you want to exit \the [src]?","Un-Hide?",list("Exit","Stay")) if(choice == "Exit") if(L == hider) hider = null L.forceMove(get_turf(src)) else if(!hider) - var/choice = tgui_alert(usr, "Do you want to hide in \the [src]?","Un-Hide?",list("Hide","Stay")) + var/choice = tgui_alert(user, "Do you want to hide in \the [src]?","Un-Hide?",list("Hide","Stay")) if(choice == "Hide" && !hider) //Check again because PROMPT L.forceMove(src) hider = L diff --git a/code/modules/multiz/ladders.dm b/code/modules/multiz/ladders.dm index b4626022bb7..0f9edf04c88 100644 --- a/code/modules/multiz/ladders.dm +++ b/code/modules/multiz/ladders.dm @@ -33,6 +33,13 @@ target_up = null return ..() +/obj/structure/ladder/attack_generic(mob/user) + //Simple Animal + if(isanimal(user)) + attack_hand(user) + else + return ..() + /obj/structure/ladder/attackby(obj/item/C as obj, mob/user as mob) attack_hand(user) return