cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
This commit is contained in:
PsiOmega
2014-11-29 10:09:03 +01:00
parent 2899bb31af 6b50ada69b
commit 0f8156e77e
13 changed files with 42 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/inflatable.dm
+1 -7
View File
@@ -34,12 +34,6 @@
update_nearby_tiles()
..()
/obj/structure/inflatable/proc/update_nearby_tiles(need_rebuild) //Copypasta from airlock code
if(!air_master)
return 0
air_master.mark_for_update(get_turf(src))
return 1
/obj/structure/inflatable/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
return 0
@@ -265,4 +259,4 @@
new /obj/item/inflatable(src)
new /obj/item/inflatable(src)
new /obj/item/inflatable(src)
new /obj/item/inflatable(src)
new /obj/item/inflatable(src)