shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Fixes a ... likely important bug with shuttle code.... (#2061)

Browse Source 
* Fixes a ... likely important bug with shuttle code....

* Delete turf.dm.rej

* Update turf.dm
This commit is contained in:
CitadelStationBot
2017-07-18 08:01:02 -05:00
committed by kevinz000
parent 556a8b7216
commit 8d9dc6dd13
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/turf.dm
+1 -1
View File
@@ -410,7 +410,7 @@
/turf/proc/empty(turf_type=/turf/open/space, baseturf_type) /turf/proc/empty(turf_type=/turf/open/space, baseturf_type)
// Remove all atoms except observers, landmarks, docking ports // Remove all atoms except observers, landmarks, docking ports
var/turf/T0 = src var/turf/T0 = src
var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object)) var/static/list/ignored_atoms = typecacheof(list(/turf, /mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object))
var/list/allowed_contents = typecache_filter_list(T0.GetAllContents(),ignored_atoms,reversed=TRUE) var/list/allowed_contents = typecache_filter_list(T0.GetAllContents(),ignored_atoms,reversed=TRUE)
for(var/i in 1 to allowed_contents.len) for(var/i in 1 to allowed_contents.len)
var/thing = allowed_contents[i] var/thing = allowed_contents[i]
code/modules/shuttle/on_move.dm
+2 -2
View File
@@ -13,8 +13,8 @@ All ShuttleMove procs go here
// Called from the new turf before anything has been moved // Called from the new turf before anything has been moved
// Only gets called if fromShuttleMove returns true first // Only gets called if fromShuttleMove returns true first
/turf/proc/toShuttleMove(turf/oldT, shuttle_dir) /turf/proc/toShuttleMove(turf/oldT, shuttle_dir)
for(var/i in 1 to contents.len) for(var/i in contents)
var/atom/movable/thing = contents[i] var/atom/movable/thing = i
if(ismob(thing)) if(ismob(thing))
if(isliving(thing)) if(isliving(thing))
var/mob/living/M = thing var/mob/living/M = thing