cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes not being able to push/pull/move a roller bed (and more generally any structure) when it has a mob buckled to it.

Browse Source 
Fixes stopping a climber from climbing on a climbable structure only applying to tables instead of all climbable structures.
This commit is contained in:
phil235
2016-04-12 18:42:07 +02:00
parent 98291ed10a
commit 321bb5f4c9
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures.dm
+4 -20
View File
@@ -38,6 +38,10 @@
/obj/structure/attack_hand(mob/user)
. = ..()
add_fingerprint(user)
if(structureclimber && structureclimber != user)
user.changeNext_move(CLICK_CD_MELEE)
structureclimber.Weaken(2)
structureclimber.visible_message("<span class='warning'>[structureclimber.name] has been knocked off the [src]", "You're knocked off the [src]!", "You see [structureclimber.name] get knocked off the [src]</span>")
interact(user)
/obj/structure/interact(mob/user)
@@ -92,23 +96,3 @@
return 1
structureclimber = null
return ..()
/obj/structure/table/attack_hand(mob/living/user)
. = ..()
if(structureclimber && structureclimber != user)
user.changeNext_move(CLICK_CD_MELEE)
structureclimber.Weaken(2)
structureclimber.visible_message("<span class='warning'>[structureclimber.name] has been knocked off the [src]", "You're knocked off the [src]!", "You see [structureclimber.name] get knocked off the [src]</span>")
/obj/structure/CanPass(atom/movable/mover, turf/target, height=0)
if(height==0)
return 1
else
return !density
obj/structure/CanAStarPass(ID,dir,caller)
. = !density