cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-09 17:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11702 from PsiOmegaDelta/151217-PolarFixesMaster

Browse Source 
No verbose cantouch check when not climbable
This commit is contained in:
Chinsky
2015-12-19 03:13:45 +03:00
parent cb4dd32a9c dc2ad43dc5
commit 4a0d121f25
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>"
if(!user.Adjacent(M) || user.restrained() || user.lying || user.stat || istype(user, /mob/living/silicon/pai))
return
if(M == buckled_mob)
return
if(istype(M, /mob/living/carbon/slime))
user << "<span class='warning'>The [M] is too squishy to buckle in.</span>"
return

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

@@ -79,7 +79,7 @@
return ..()
/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
if (!user.Adjacent(src))