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

Merge pull request #2708 from Citadel-Station-13/upstream-merge-30633

Browse Source 
[MIRROR] Missed some parentheses in multi Z
This commit is contained in:
LetterJay
2017-09-13 08:36:05 -05:00
committed by GitHub
parent 83793fb57d 63c94a5c2b
commit c34b5c805f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/aux_base.dm
+2 -2
View File
@@ -86,7 +86,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
return
if(href_list["move"])
if(!(z in GLOB.station_z_levels && shuttleId == "colony_drop"))
if(!(z in GLOB.station_z_levels) && shuttleId == "colony_drop")
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)
@@ -345,4 +345,4 @@ obj/docking_port/stationary/public_mining_dock
#undef BAD_ZLEVEL
#undef BAD_AREA
#undef BAD_COORDS
#undef ZONE_SET
#undef ZONE_SET
code/modules/modular_computers/file_system/programs/sm_monitor.dm
+1 -1
View File
@@ -44,7 +44,7 @@
//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.
if(!(S.z in GLOB.station_z_levels || 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/))
continue
supermatters.Add(S)