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

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/_onclick/click.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/modules/mob/living/silicon/ai/ai.dm
This commit is contained in:
PsiOmegaDelta
2015-12-20 11:55:53 +01:00
parent 9a156c56de 89b6f62695
commit f6eec096e7
14 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,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))