cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Missed some parentheses in multi Z

Browse Source
This commit is contained in:
Jordan Brown
2017-09-11 16:43:24 -04:00
committed by CitadelStationBot
parent 2d29b49985
commit 799ae80b8a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mining/aux_base.dm
View File

@@ -86,7 +86,11 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
return
if(href_list["move"])
<<<<<<< HEAD
if(z != ZLEVEL_STATION && shuttleId == "colony_drop")
=======
if(!(z in GLOB.station_z_levels) && shuttleId == "colony_drop")
>>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing)
to_chat(usr, "<span class='warning'>You can't move the base again!</span>")
return
var/shuttle_error = SSshuttle.moveShuttle(shuttleId, href_list["move"], 1)

4
code/modules/modular_computers/file_system/programs/sm_monitor.dm
View File

@@ -44,7 +44,11 @@
//var/valid_z_levels = (GetConnectedZlevels(T.z) & using_map.station_levels)
for(var/obj/machinery/power/supermatter_shard/S in GLOB.machines)
// Delaminating, not within coverage, not on a tile.
<<<<<<< HEAD
if(!(S.z == ZLEVEL_STATION || S.z == ZLEVEL_MINING || S.z == T.z) || !istype(S.loc, /turf/))
=======
if(!(S.z in GLOB.station_z_levels) || S.z == ZLEVEL_MINING || S.z == T.z || !istype(S.loc, /turf/))
>>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing)
continue
supermatters.Add(S)