Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2

This commit is contained in:
Aurorablade
2015-10-11 22:50:27 -04:00
146 changed files with 609 additions and 1749 deletions
@@ -53,7 +53,7 @@
//If you want to re-add fire, just add "fire" = 15 to the pick list.
/*if ("fire")
new /obj/structure/closet/firecloset(src.loc)
del(src)*/
qdel(src)*/
/obj/structure/closet/emcloset/legacy/New()
new /obj/item/weapon/tank/oxygen(src)
+1 -1
View File
@@ -66,7 +66,7 @@
/obj/structure/lattice/proc/updateOverlays()
//if(!(istype(src.loc, /turf/space)))
// del(src)
// qdel(src)
spawn(1)
overlays = list()
@@ -7,8 +7,6 @@
var/propelled = 0 // Check for fire-extinguisher-driven chairs
/obj/structure/stool/bed/chair/New()
if(anchored)
src.verbs -= /atom/movable/verb/pull
..()
spawn(3) //sorry. i don't think there's a better way to do this.
handle_rotation()
@@ -90,7 +90,7 @@
moving = 0
// Should I return a copy here? If the caller edits or del()s the returned
// Should I return a copy here? If the caller edits or qdel()s the returned
// datum, there might be problems if I don't...
/obj/structure/transit_tube_pod/return_air()
var/datum/gas_mixture/GM = new()