cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into a_intent

Browse Source 
Conflicts:
	code/modules/mob/mob_defines.dm
This commit is contained in:
Mervill
2016-12-04 00:38:37 -08:00
parent d4a49d509d 4a37f57e7c
commit 3f68bd7202
40 changed files with 171 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/holosign.dm
+2 -2
View File
@@ -49,7 +49,7 @@
obj_integrity = 20
max_integrity = 20
var/allow_walk = 1 //can we pass through it on walk intent
/obj/structure/holosign/barrier/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(!density)
return 1
@@ -59,7 +59,7 @@
return 1
if(iscarbon(mover))
var/mob/living/carbon/C = mover
if(allow_walk && C.m_intent == "walk")
if(allow_walk && C.m_intent == MOVE_INTENT_WALK)
return 1
/obj/structure/holosign/barrier/engineering