Makes the station Z level into a list instead of a single define #30297

imtakingabreakdontatme · 2017-08-31T04:26:19Z

For multi z

I left a define for the main/first floor of multi z maps because I don't want to rewrite weather right now, and we might want some things to only impact the main floor.

I'll either add mapping helpers that add more zs to the list or beg for help to add/read lists from the map jsons

TechnoAlchemisto · 2017-08-31T04:36:31Z

Really good PR Kor, keep it up! Really looking forward to more work like this in the future!

Stay frosty!

ChangelingRain · 2017-08-31T04:44:10Z

code/_globalvars/lists/mapping.dm

@@ -14,6 +14,8 @@ GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
 //Go away Urist, I'm restoring this to the longer list. ~Errorage
 GLOBAL_LIST_INIT(accessable_z_levels, list(1,3,4,5,6,7)) //Keep this to six maps, repeating z-levels is ok if needed

+GLOBAL_LIST_INIT(station_z_levels, list(2))
+


why don't these use defines?
make these use defines.
the one above it too.

…sisterrible

…into thisisterrible

Cyberboss · 2017-09-01T15:27:28Z

Trevis

Cyberboss · 2017-09-01T21:11:36Z

code/datums/mind.dm

@@ -519,7 +519,7 @@
 				if(I == src)
 					continue
 				var/mob/M = I
-				if(M.z in GLOB.z_levels_station && !M.stat)
+				if(M.z in GLOB.station_z_levels && !M.stat)


Brackets around the in statement. Precedence is stupid with it

Do you mean if((M.z in glob.station_z_levels) && !M.stat)

Also is it really important enough to warrant manually changing 130 lines if the rest of the codebase is already doing it

yes, it is that important, since there's a very good chance byond will go "okay, that list exists, okay, M.stat is FALSE, let's continue under this if"

imtakingabreakdontatme · 2017-09-03T03:43:50Z

@Cyberboss

I did the thing

Cyberboss

A lot more of the same, have to say I really dislike the ZLEVEL_STATION_PRIMARY defne in most cases its used

Cyberboss · 2017-09-05T14:25:13Z

code/game/gamemodes/game_mode.dm

@@ -488,7 +488,7 @@
 			text += " <span class='boldannounce'>died</span>"
 		else
 			text += " <span class='greenannounce'>survived</span>"
-		if(fleecheck && ply.current.z > ZLEVEL_STATION)
+		if(fleecheck && ply.current.z > ZLEVEL_STATION_PRIMARY)


This doesn't seem right for this context. Should work on all station z levels no?

Most of the use of the define is just autoreplace to put off having to refactor so many systems in a single PR/make sure it still works in the man time

Cyberboss · 2017-09-05T14:25:58Z

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -373,7 +373,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 			milestones[key] = TRUE
 			minor_announce("[key] SECONDS UNTIL DOOMSDAY DEVICE ACTIVATION!", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE)

-/obj/machinery/doomsday_device/proc/detonate(z_level = ZLEVEL_STATION)
+/obj/machinery/doomsday_device/proc/detonate(z_level = ZLEVEL_STATION_PRIMARY)


This proc need refactoring to use a list

Cyberboss · 2017-09-05T14:26:24Z

code/game/gamemodes/meteor/meteors.dm

-		pickedstart = spaceDebrisStartLoc(startSide, ZLEVEL_STATION)
-		pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION)
+		pickedstart = spaceDebrisStartLoc(startSide, ZLEVEL_STATION_PRIMARY)
+		pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION_PRIMARY)


Should work for all zs

Cyberboss · 2017-09-05T14:26:40Z

code/game/gamemodes/miniantags/abduction/machinery/camera.dm

@@ -9,7 +9,7 @@
 	var/datum/action/innate/vest_disguise_swap/vest_disguise_action = new
 	var/datum/action/innate/set_droppoint/set_droppoint_action = new
 	var/obj/machinery/abductor/console/console
-	z_lock = ZLEVEL_STATION
+	z_lock = ZLEVEL_STATION_PRIMARY


Needs refactoring

Cyberboss · 2017-09-05T14:27:14Z

code/game/gamemodes/miniantags/bot_swarm/swarmer.dm

-		if(ZLEVEL_STATION)
-			F =find_safe_turf(zlevels = ZLEVEL_STATION, extended_safety_checks = TRUE)
+		if(ZLEVEL_STATION_PRIMARY)
+			F =find_safe_turf(zlevels = ZLEVEL_STATION_PRIMARY, extended_safety_checks = TRUE)


refactoring

Cyberboss · 2017-09-05T14:27:35Z

code/game/gamemodes/objective.dm

@@ -126,7 +126,7 @@
 		if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey)
 			return 1
 		var/turf/T = get_turf(target.current)
-		if(T && (T.z > ZLEVEL_STATION) || (target.current.client && target.current.client.is_afk()))			//If they leave the station or go afk they count as dead for this
+		if(T && (T.z > ZLEVEL_STATION_PRIMARY) || (target.current.client && target.current.client.is_afk()))			//If they leave the station or go afk they count as dead for this


again, all station zs should be valid

Cyberboss · 2017-09-05T14:31:01Z

code/modules/awaymissions/signpost.dm

@@ -5,7 +5,7 @@
 	anchored = TRUE
 	density = TRUE
 	var/question = "Travel back?"
-	var/zlevels = list(ZLEVEL_STATION)
+	var/zlevels = list(ZLEVEL_STATION_PRIMARY)


why not use the GLOB list?

Cyberboss · 2017-09-07T15:07:59Z

@KorPhaeron do the last one ^

imtakingabreakdontatme · 2017-09-08T17:40:48Z

@Cyberboss I did the signpost and rev checks

AnturK · 2017-09-10T13:01:35Z

This is just personal opinion but i feel like a function that checks this would be good even if bit more expensive so you don't have to worry about in precedence.

AnturK

Don't see any obvious issues beside few systems that probably should work for all z's

cyberboss back at it again

Cyberboss

Just make sure to do the refactors after this

imtakingabreakdontatme added 2 commits August 30, 2017 23:19

Makes Station Z Levels a global list

57b451e

Things didnt get committed

87c9fa2

ChangelingRain reviewed Aug 31, 2017

View reviewed changes

Define

53e697b

AnturK added Tweak Refactor Makes the code harder to read and removed Tweak labels Aug 31, 2017

imtakingabreakdontatme and others added 5 commits August 31, 2017 15:35

Merge remote-tracking branch 'refs/remotes/tgstation/master' into thi…

392b757

…sisterrible

Merge branch 'thisisterrible' of https://github.com/KorPhaeron/kortg …

e086b0e

…into thisisterrible

Removes files

42b8e54

Merge branch 'master' into thisisterrible

6048414

Fix mind.dm

10b2f7f

Wrong list name

740445b

Cyberboss requested changes Sep 1, 2017

View reviewed changes

(

735e927

Merge branch 'master' into thisisterrible

6b11f9f

Cyberboss previously requested changes Sep 5, 2017

View reviewed changes

Fixes rev checks and signpost

6061546

imtakingabreakdontatme added the Ready for Review label Sep 7, 2017

imtakingabreakdontatme added 3 commits September 7, 2017 12:58

Makes it actually compile

3bc6e9a

Signpost fix

70cb1fe

I hate these sign posts

c2e32f0

AnturK reviewed Sep 10, 2017

View reviewed changes

Merge branch 'master' into thisisterrible

2079ece

Cyberboss approved these changes Sep 11, 2017

View reviewed changes

Cyberboss removed the Ready for Review label Sep 11, 2017

Never use the web editor

0952a1a

tgstation-server added the Ready for Review label Sep 11, 2017

Cyberboss removed the Ready for Review label Sep 11, 2017

Cyberboss merged commit 10a3238 into tgstation:master Sep 11, 2017

ghost mentioned this pull request Sep 11, 2017

[MIRROR] Makes the station Z level into a list instead of a single define HippieStation/HippieStationdeprecated2020#3238

Merged

FTL13-Bot mentioned this pull request Sep 11, 2017

[MIRROR] Makes the station Z level into a list instead of a single define FTL13/FTL13#2312

Closed

CitadelStationBot mentioned this pull request Sep 11, 2017

[MIRROR] Makes the station Z level into a list instead of a single define Citadel-Station-13/Citadel-Station-13#2704

Merged

scrubmcnoob mentioned this pull request Oct 31, 2017

Port Many prs v2 OracleStation/OracleStation#222

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Makes the station Z level into a list instead of a single define #30297

Makes the station Z level into a list instead of a single define #30297

imtakingabreakdontatme commented Aug 31, 2017

TechnoAlchemisto commented Aug 31, 2017

ChangelingRain Aug 31, 2017

Cyberboss commented Sep 1, 2017

Cyberboss Sep 1, 2017

imtakingabreakdontatme Sep 1, 2017 •

edited

ChangelingRain Sep 2, 2017

imtakingabreakdontatme commented Sep 3, 2017

Cyberboss left a comment

Cyberboss Sep 5, 2017

imtakingabreakdontatme Sep 5, 2017

Cyberboss Sep 5, 2017

Cyberboss Sep 5, 2017

Cyberboss Sep 5, 2017

Cyberboss Sep 5, 2017

Cyberboss Sep 5, 2017

Cyberboss Sep 5, 2017 •

edited

Cyberboss commented Sep 7, 2017

imtakingabreakdontatme commented Sep 8, 2017

AnturK commented Sep 10, 2017

AnturK left a comment

Cyberboss left a comment

Makes the station Z level into a list instead of a single define #30297

Makes the station Z level into a list instead of a single define #30297

Conversation

imtakingabreakdontatme commented Aug 31, 2017

TechnoAlchemisto commented Aug 31, 2017

Choose a reason for hiding this comment

Cyberboss commented Sep 1, 2017

Choose a reason for hiding this comment

imtakingabreakdontatme Sep 1, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

imtakingabreakdontatme commented Sep 3, 2017

Cyberboss left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Cyberboss Sep 5, 2017 • edited

Choose a reason for hiding this comment

Cyberboss commented Sep 7, 2017

imtakingabreakdontatme commented Sep 8, 2017

AnturK commented Sep 10, 2017

AnturK left a comment

Choose a reason for hiding this comment

Cyberboss left a comment

Choose a reason for hiding this comment

imtakingabreakdontatme Sep 1, 2017 •

edited

Cyberboss Sep 5, 2017 •

edited