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

No verbose cantouch check when not climbable

Browse Source
This commit is contained in:
Hubblenaut
2015-12-16 02:28:19 +01:00
parent 89431c2dc5
commit e10393324d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/buckling.dm
View File

@@ -56,7 +56,8 @@
user << "<span class='warning'>You can't buckle anyone in before the game starts.</span>" user << "<span class='warning'>You can't buckle anyone in before the game starts.</span>"
if(!user.Adjacent(M) || user.restrained() || user.lying || user.stat || istype(user, /mob/living/silicon/pai)) if(!user.Adjacent(M) || user.restrained() || user.lying || user.stat || istype(user, /mob/living/silicon/pai))
return return
if(M == buckled_mob)
return
if(istype(M, /mob/living/carbon/slime)) if(istype(M, /mob/living/carbon/slime))
user << "<span class='warning'>The [M] is too squishy to buckle in.</span>" user << "<span class='warning'>The [M] is too squishy to buckle in.</span>"
return return

2
code/game/objects/structures.dm
View File

@@ -69,7 +69,7 @@
return ..() return ..()
/obj/structure/proc/can_climb(var/mob/living/user, post_climb_check=0) /obj/structure/proc/can_climb(var/mob/living/user, post_climb_check=0)
if (!can_touch(user) || !climbable || (!post_climb_check && (user in climbers))) if (!climbable || !can_touch(user) || (!post_climb_check && (user in climbers)))
return 0 return 0
if (!user.Adjacent(src)) if (!user.Adjacent(src))