cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3301 from CHOMPStation2/upstream-merge-11968

Browse Source 
[MIRROR] Allows simplemobs climb ladders + trash pile interaction fix
This commit is contained in:
Nadyr
2021-12-12 06:22:42 -05:00
committed by GitHub
parent 6c94ceeb20 a7be1f5512
commit dfdf720ee9
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/structures/trash_pile_vr.dm
View File

@@ -69,13 +69,13 @@
var/mob/living/L = user var/mob/living/L = user
//They're in it, and want to get out. //They're in it, and want to get out.
if(L.loc == src) 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(choice == "Exit")
if(L == hider) if(L == hider)
hider = null hider = null
L.forceMove(get_turf(src)) L.forceMove(get_turf(src))
else if(!hider) 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 if(choice == "Hide" && !hider) //Check again because PROMPT
L.forceMove(src) L.forceMove(src)
hider = L hider = L

7
code/modules/multiz/ladders.dm
View File

@@ -33,6 +33,13 @@
target_up = null target_up = null
return ..() 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) /obj/structure/ladder/attackby(obj/item/C as obj, mob/user as mob)
attack_hand(user) attack_hand(user)
return return