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

This commit is contained in:
datlo
2019-06-13 13:58:56 +01:00
186 changed files with 2259 additions and 1803 deletions
+2 -4
View File
@@ -58,12 +58,10 @@
var/contcount
for(var/atom/A in T.contents)
if(istype(A,/atom/movable/lighting_object))
continue
if(istype(A,/obj/machinery/light))
continue //hacky but whatever, shuttles need three spots each for this shit
if(!A.simulated)
continue
if(istype(A, /obj/machinery/light))
continue //hacky but whatever, shuttles need three spots each for this shit
contcount++
if(contcount)