It is storing [GLOB.ratvar_awakens ? "INFINITY":"[power_charge]"]W of power, \
+ to_chat(user, "It is storing [GLOB.ratvar_awakens ? "INFINITE":"[DisplayPower(power_charge)] of"] power, \
and [structure_number] Clockwork Structure[structure_number == 1 ? " is":"s are"] in range.")
to_chat(user, "While active, it will gradually drain power from nearby electronics. It is currently [isprocessing ? "active":"disabled"].")
if(iscyborg(user))
to_chat(user, "You can recharge from the [sigil_name] by crossing it.")
else if(!GLOB.ratvar_awakens)
- to_chat(user, "Hitting the [sigil_name] with brass sheets will convert them to power at a rate of 1 brass sheet to [POWER_FLOOR]W power.")
+ to_chat(user, "Hitting the [sigil_name] with brass sheets will convert them to power at a rate of 1 brass sheet to [DisplayPower(POWER_FLOOR)] power.")
if(!GLOB.ratvar_awakens)
to_chat(user, "You can recharge Replica Fabricators from the [sigil_name].")
@@ -207,7 +207,7 @@
if(is_servant_of_ratvar(user) && istype(I, /obj/item/stack/tile/brass) && !GLOB.ratvar_awakens)
var/obj/item/stack/tile/brass/B = I
user.visible_message("[user] places [B] on [src], causing it to disintegrate into glowing orange energy!", \
- "You charge the [sigil_name] with [B], providing it with [B.amount * POWER_FLOOR]W of power.")
+ "You charge the [sigil_name] with [B], providing it with [DisplayPower(B.amount * POWER_FLOOR)] of power.")
modify_charge(-(B.amount * POWER_FLOOR))
playsound(src, 'sound/effects/light_flicker.ogg', (B.amount * POWER_FLOOR) * 0.01, 1)
qdel(B)
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm
index 18c8103eef..a4409cf22c 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm
@@ -269,7 +269,7 @@
fabricator.recharging = null
if(user)
user.visible_message("[user]'s [fabricator.name] stops draining glowing orange energy from [src].", \
- "You finish recharging your [fabricator.name]. It now contains [fabricator.get_power()]W/[fabricator.get_max_power()]W power.")
+ "You finish recharging your [fabricator.name]. It now contains [DisplayPower(fabricator.get_power())]/[DisplayPower(fabricator.get_max_power())] power.")
//Fabricator mob heal proc, to avoid as much copypaste as possible.
/mob/living/proc/fabricator_heal(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator)
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm b/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm
index d6e56f38d5..d8281242ef 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm
@@ -31,7 +31,7 @@
var/mob/living/silicon/ai/AI = ai
if(AI.deployed_shell && is_servant_of_ratvar(AI.deployed_shell))
continue
- if(is_servant_of_ratvar(AI) || !isturf(AI.loc) || AI.z != ZLEVEL_STATION || AI.stat == DEAD)
+ if(is_servant_of_ratvar(AI) || !isturf(AI.loc) || !(AI.z in GLOB.station_z_levels) || AI.stat == DEAD)
continue
.++
diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
index 343f2e70e7..eecfec7780 100644
--- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
@@ -500,7 +500,7 @@
anything but a last resort. Instead, it is recommended that a Sigil of Transmission is created. This sigil serves as both battery and power generator for nearby clockwork \
structures, and those structures will happily draw power from the sigil before they resort to APCs.
"
dat += "Generating power is less easy. The most reliable and efficient way is using brass sheets; attacking a sigil of transmission with brass sheets will convert them \
- to power, at a rate of [POWER_FLOOR]W per sheet. (Brass sheets are created from replica fabricators, which are explained more in detail in the Conversion section.) \
+ to power, at a rate of [DisplayPower(POWER_FLOOR)] per sheet. (Brass sheets are created from replica fabricators, which are explained more in detail in the Conversion section.) \
Activating a sigil of transmission will also cause it to drain power from the nearby area, which, while effective, serves as an obvious tell that there is something wrong.
"
dat += "Without power, many structures will not function, making a base vulnerable to attack. For this reason, it is critical that you keep an eye on your power reserves and \
ensure that they remain comfortably high.
"
diff --git a/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm
index 3f7e826017..bd356982b5 100644
--- a/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm
@@ -126,22 +126,22 @@
to_chat(user, "Can be used to replace walls, floors, tables, windows, windoors, and airlocks with Clockwork variants.")
to_chat(user, "Can construct Clockwork Walls on Clockwork Floors and deconstruct Clockwork Walls to Clockwork Floors.")
if(uses_power)
- to_chat(user, "It can consume floor tiles, rods, metal, and plasteel for power at rates of 2:[POWER_ROD]W, 1:[POWER_ROD]W, 1:[POWER_METAL]W, \
- and 1:[POWER_PLASTEEL]W, respectively.")
- to_chat(user, "It can also consume brass sheets for power at a rate of 1:[POWER_FLOOR]W.")
- to_chat(user, "It is storing [get_power()]W/[get_max_power()]W of power[charge_rate ? ", and is gaining [charge_rate*0.5]W of power per second":""].")
- to_chat(user, "Use it in-hand to produce 5 brass sheets at a cost of [POWER_WALL_TOTAL]W power.")
+ to_chat(user, "It can consume floor tiles, rods, metal, and plasteel for power at rates of 2:[DisplayPower(POWER_ROD)], 1:[DisplayPower(POWER_ROD)], 1:[DisplayPower(POWER_METAL)], \
+ and 1:[DisplayPower(POWER_PLASTEEL)], respectively.")
+ to_chat(user, "It can also consume brass sheets for power at a rate of 1:[DisplayPower(POWER_FLOOR)].")
+ to_chat(user, "It is storing [DisplayPower(get_power())]/[DisplayPower(get_max_power())] of power[charge_rate ? ", and is gaining [DisplayPower(charge_rate*0.5)] of power per second":""].")
+ to_chat(user, "Use it in-hand to produce 5 brass sheets at a cost of [DisplayPower(POWER_WALL_TOTAL)] power.")
/obj/item/clockwork/replica_fabricator/attack_self(mob/living/user)
if(is_servant_of_ratvar(user))
if(uses_power)
if(!can_use_power(POWER_WALL_TOTAL))
- to_chat(user, "[src] requires [POWER_WALL_TOTAL]W of power to produce brass sheets!")
+ to_chat(user, "[src] requires [DisplayPower(POWER_WALL_TOTAL)] of power to produce brass sheets!")
return
modify_stored_power(-POWER_WALL_TOTAL)
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
new/obj/item/stack/tile/brass(user.loc, 5)
- to_chat(user, "You use [stored_power ? "some":"all"] of [src]'s power to produce 5 brass sheets. It now stores [get_power()]W/[get_max_power()]W of power.")
+ to_chat(user, "You use [stored_power ? "some":"all"] of [src]'s power to produce 5 brass sheets. It now stores [DisplayPower(get_power())]/[DisplayPower(get_max_power())] of power.")
/obj/item/clockwork/replica_fabricator/pre_attackby(atom/target, mob/living/user, params)
if(!target || !user || !is_servant_of_ratvar(user) || istype(target, /obj/item/storage))
@@ -196,7 +196,7 @@
fabrication_values["power_cost"] = 0
var/turf/Y = get_turf(user)
- if(!Y || (Y.z != ZLEVEL_STATION && Y.z != ZLEVEL_CENTCOM && Y.z != ZLEVEL_MINING && Y.z != ZLEVEL_LAVALAND))
+ if(!Y || (!(Y.z in GLOB.station_z_levels) && Y.z != ZLEVEL_CENTCOM && Y.z != ZLEVEL_MINING && Y.z != ZLEVEL_LAVALAND))
fabrication_values["operation_time"] *= 2
if(fabrication_values["power_cost"] > 0)
fabrication_values["power_cost"] *= 2
@@ -276,7 +276,7 @@
if(!silent)
var/atom/A = fabrication_values["new_obj_type"]
if(A)
- to_chat(user, "You need [fabrication_values["power_cost"]]W power to fabricate \a [initial(A.name)] from [target]!")
+ to_chat(user, "You need [DisplayPower(fabrication_values["power_cost"])] power to fabricate \a [initial(A.name)] from [target]!")
else if(stored_power - fabrication_values["power_cost"] > max_power)
if(!silent)
var/atom/A = fabrication_values["new_obj_type"]
@@ -323,8 +323,8 @@
repair_values["power_required"] = round(repair_values["healing_for_cycle"]*MIN_CLOCKCULT_POWER, MIN_CLOCKCULT_POWER) //and get the power cost from that
if(!can_use_power(RATVAR_POWER_CHECK) && !can_use_power(repair_values["power_required"]))
if(!silent)
- to_chat(user, "You need at least [repair_values["power_required"]]W power to start repairin[target == user ? "g yourself" : "g [target]"], and at least \
- [round(repair_values["amount_to_heal"]*MIN_CLOCKCULT_POWER, MIN_CLOCKCULT_POWER)]W to fully repair [target == user ? "yourself" : "[target.p_them()]"]!")
+ to_chat(user, "You need at least [DisplayPower(repair_values["power_required"])] power to start repairin[target == user ? "g yourself" : "g [target]"], and at least \
+ [DisplayPower(repair_values["amount_to_heal"]*MIN_CLOCKCULT_POWER, MIN_CLOCKCULT_POWER)] to fully repair [target == user ? "yourself" : "[target.p_them()]"]!")
return FALSE
return TRUE
diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm
index 318d3e243d..806d08dffb 100644
--- a/code/game/gamemodes/clock_cult/clock_scripture.dm
+++ b/code/game/gamemodes/clock_cult/clock_scripture.dm
@@ -158,7 +158,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
/datum/clockwork_scripture/proc/check_offstation_penalty()
var/turf/T = get_turf(invoker)
- if(!T || (T.z != ZLEVEL_STATION && T.z != ZLEVEL_CENTCOM && T.z != ZLEVEL_MINING && T.z != ZLEVEL_LAVALAND))
+ if(!T || (!(T.z in GLOB.station_z_levels) && T.z != ZLEVEL_CENTCOM && T.z != ZLEVEL_MINING && T.z != ZLEVEL_LAVALAND))
channel_time *= 2
for(var/i in consumed_components)
if(consumed_components[i])
diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm
index d0b7f11eb4..2930088ca2 100644
--- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm
+++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm
@@ -175,7 +175,7 @@
to_chat(invoker, "\"It is too late to construct one of these, champion.\"")
return FALSE
var/turf/T = get_turf(invoker)
- if(!T || T.z != ZLEVEL_STATION)
+ if(!T || !(T.z in GLOB.station_z_levels))
to_chat(invoker, "\"You must be on the station to construct one of these, champion.\"")
return FALSE
return ..()
diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm
index e7beff846f..c7daef1450 100644
--- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm
+++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm
@@ -33,7 +33,7 @@
return FALSE
var/area/A = get_area(invoker)
var/turf/T = get_turf(invoker)
- if(!T || T.z != ZLEVEL_STATION || istype(A, /area/shuttle) || !A.blob_allowed)
+ if(!T || !(T.z in GLOB.station_z_levels) || istype(A, /area/shuttle) || !A.blob_allowed)
to_chat(invoker, "You must be on the station to activate the Ark!")
return FALSE
if(GLOB.clockwork_gateway_activated)
diff --git a/code/game/gamemodes/clock_cult/clock_structure.dm b/code/game/gamemodes/clock_cult/clock_structure.dm
index 0c29361e59..1da3053605 100644
--- a/code/game/gamemodes/clock_cult/clock_structure.dm
+++ b/code/game/gamemodes/clock_cult/clock_structure.dm
@@ -160,7 +160,7 @@
if(is_servant_of_ratvar(user) || isobserver(user))
var/powered = total_accessable_power()
var/sigil_number = LAZYLEN(check_apc_and_sigils())
- to_chat(user, "It has access to [powered == INFINITY ? "INFINITY":"[powered]"]W of power, \
+ to_chat(user, "It has access to [powered == INFINITY ? "INFINITE":"[DisplayPower(powered)] of"] power, \
and [sigil_number] Sigil[sigil_number == 1 ? "":"s"] of Transmission [sigil_number == 1 ? "is":"are"] in range.")
/obj/structure/destructible/clockwork/powered/Destroy()
diff --git a/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm b/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm
index 4df615450f..de6b058b78 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm
@@ -23,7 +23,7 @@
/obj/structure/destructible/clockwork/powered/clockwork_obelisk/examine(mob/user)
..()
if(is_servant_of_ratvar(user) || isobserver(user))
- to_chat(user, "It requires [hierophant_cost]W to broadcast over the Hierophant Network, and [gateway_cost]W to open a Spatial Gateway.")
+ to_chat(user, "It requires [DisplayPower(hierophant_cost)] to broadcast over the Hierophant Network, and [DisplayPower(gateway_cost)] to open a Spatial Gateway.")
/obj/structure/destructible/clockwork/powered/clockwork_obelisk/can_be_unfasten_wrench(mob/user, silent)
if(active)
diff --git a/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm b/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm
index 732897fda4..23a50fdd4c 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm
@@ -19,7 +19,7 @@
/obj/structure/destructible/clockwork/powered/mania_motor/examine(mob/user)
..()
if(is_servant_of_ratvar(user) || isobserver(user))
- to_chat(user, "It requires [mania_cost]W to run.")
+ to_chat(user, "It requires [DisplayPower(mania_cost)] to run.")
/obj/structure/destructible/clockwork/powered/mania_motor/forced_disable(bad_effects)
if(active)
diff --git a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm
index 9ef7fa4ab7..155413a612 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm
@@ -48,7 +48,7 @@
if(active)
return 0
var/turf/T = get_turf(src)
- if(!T || T.z != ZLEVEL_STATION)
+ if(!T || !(T.z in GLOB.station_z_levels))
to_chat(user, "[src] must be on the station to function!")
return 0
if(SSshuttle.emergency.mode != SHUTTLE_CALL)
@@ -63,7 +63,7 @@
/obj/structure/destructible/clockwork/powered/prolonging_prism/process()
var/turf/own_turf = get_turf(src)
- if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || own_turf.z != ZLEVEL_STATION)
+ if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || !(own_turf.z in GLOB.station_z_levels))
forced_disable(FALSE)
return
. = ..()
@@ -97,7 +97,7 @@
mean_x = Ceiling(mean_x)
else
mean_x = Floor(mean_x)
- var/turf/semi_random_center_turf = locate(mean_x, mean_y, ZLEVEL_STATION)
+ var/turf/semi_random_center_turf = locate(mean_x, mean_y, ZLEVEL_STATION_PRIMARY)
for(var/t in getline(src, semi_random_center_turf))
prism_turfs[t] = TRUE
var/placement_style = prob(50)
diff --git a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm
index 079fd081fe..4ceb7c3e26 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm
@@ -33,7 +33,7 @@
to_chat(user, "It is currently producing random components.")
to_chat(user, "It will produce a component every [round((production_cooldown*0.1) * get_efficiency_mod(TRUE), 0.1)] seconds and requires at least the following power for each component type:")
for(var/i in GLOB.clockwork_component_cache)
- to_chat(user, "[get_component_icon(i)] [get_component_name(i)]: [get_component_cost(i)]W ([GLOB.clockwork_component_cache[i]] exist[GLOB.clockwork_component_cache[i] == 1 ? "s" : ""])")
+ to_chat(user, "[get_component_icon(i)] [get_component_name(i)]: [DisplayPower(get_component_cost(i))] ([GLOB.clockwork_component_cache[i]] exist[GLOB.clockwork_component_cache[i] == 1 ? "s" : ""])")
/obj/structure/destructible/clockwork/powered/tinkerers_daemon/forced_disable(bad_effects)
if(active)
@@ -80,7 +80,7 @@
if("Specific Component")
var/list/components = list()
for(var/i in GLOB.clockwork_component_cache)
- components["[get_component_name(i)] ([get_component_cost(i)]W)"] = i
+ components["[get_component_name(i)] ([DisplayPower(get_component_cost(i))])"] = i
var/input_component = input(user, "Choose a component type.", name) as null|anything in components
component_id_to_produce = components[input_component]
servants = 0
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 624fa83a57..e16f991af7 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -104,7 +104,7 @@
if(!GLOB.summon_spots.len)
while(GLOB.summon_spots.len < SUMMON_POSSIBILITIES)
var/area/summon = pick(GLOB.sortedAreas - GLOB.summon_spots)
- if((summon.z == ZLEVEL_STATION) && summon.valid_territory)
+ if((summon.z in GLOB.station_z_levels) && summon.valid_territory)
GLOB.summon_spots += summon
cult_objectives += "eldergod"
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index a9255e89da..4dd5f70731 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -257,7 +257,7 @@ This file contains the arcane tome files.
to_chat(user, "There is already a rune here.")
return FALSE
- if(T.z != ZLEVEL_STATION && T.z != ZLEVEL_MINING)
+ if(!(T.z in GLOB.station_z_levels) && T.z != ZLEVEL_MINING)
to_chat(user, "The veil is not weak enough here.")
return FALSE
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 936afe9090..089265d2fb 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -465,7 +465,7 @@ structure_check() searches for nearby cultist structures required for the invoca
/obj/effect/rune/narsie/invoke(var/list/invokers)
if(used)
return
- if(z != ZLEVEL_STATION)
+ if(!(z in GLOB.station_z_levels))
return
if(locate(/obj/singularity/narsie) in GLOB.poi_list)
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index a56a2d6647..b405cc935c 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -1,80 +1,80 @@
-/proc/power_failure()
- priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg')
- for(var/obj/machinery/power/smes/S in GLOB.machines)
- if(istype(get_area(S), /area/ai_monitored/turret_protected) || S.z != ZLEVEL_STATION)
- continue
- S.charge = 0
- S.output_level = 0
- S.output_attempt = 0
- S.update_icon()
- S.power_change()
-
- var/list/skipped_areas = list(/area/engine/engineering, /area/engine/supermatter, /area/engine/atmospherics_engine, /area/ai_monitored/turret_protected/ai)
-
- for(var/area/A in world)
- if( !A.requires_power || A.always_unpowered )
- continue
-
- var/skip = 0
- for(var/area_type in skipped_areas)
- if(istype(A,area_type))
- skip = 1
- break
- if(A.contents)
- for(var/atom/AT in A.contents)
- if(AT.z != ZLEVEL_STATION) //Only check one, it's enough.
- skip = 1
- break
- if(skip) continue
+/proc/power_failure()
+ priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg')
+ for(var/obj/machinery/power/smes/S in GLOB.machines)
+ if(istype(get_area(S), /area/ai_monitored/turret_protected) || !(S.z in GLOB.station_z_levels))
+ continue
+ S.charge = 0
+ S.output_level = 0
+ S.output_attempt = 0
+ S.update_icon()
+ S.power_change()
+
+ var/list/skipped_areas = list(/area/engine/engineering, /area/engine/supermatter, /area/engine/atmospherics_engine, /area/ai_monitored/turret_protected/ai)
+
+ for(var/area/A in world)
+ if( !A.requires_power || A.always_unpowered )
+ continue
+
+ var/skip = 0
+ for(var/area_type in skipped_areas)
+ if(istype(A,area_type))
+ skip = 1
+ break
+ if(A.contents)
+ for(var/atom/AT in A.contents)
+ if(!(AT.z in GLOB.station_z_levels)) //Only check one, it's enough.
+ skip = 1
+ break
+ if(skip) continue
A.power_light = FALSE
A.power_equip = FALSE
A.power_environ = FALSE
- A.power_change()
-
- for(var/obj/machinery/power/apc/C in GLOB.apcs_list)
- if(C.cell && C.z == ZLEVEL_STATION)
+ A.power_change()
+
+ for(var/obj/machinery/power/apc/C in GLOB.apcs_list)
+ if(C.cell && (C.z in GLOB.station_z_levels))
var/area/A = C.area
-
- var/skip = 0
- for(var/area_type in skipped_areas)
- if(istype(A,area_type))
- skip = 1
- break
- if(skip) continue
-
- C.cell.charge = 0
-
-/proc/power_restore()
-
- priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg')
- for(var/obj/machinery/power/apc/C in GLOB.machines)
- if(C.cell && C.z == ZLEVEL_STATION)
- C.cell.charge = C.cell.maxcharge
- C.failure_timer = 0
- for(var/obj/machinery/power/smes/S in GLOB.machines)
- if(S.z != ZLEVEL_STATION)
- continue
- S.charge = S.capacity
- S.output_level = S.output_level_max
- S.output_attempt = 1
- S.update_icon()
- S.power_change()
- for(var/area/A in world)
+
+ var/skip = 0
+ for(var/area_type in skipped_areas)
+ if(istype(A,area_type))
+ skip = 1
+ break
+ if(skip) continue
+
+ C.cell.charge = 0
+
+/proc/power_restore()
+
+ priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg')
+ for(var/obj/machinery/power/apc/C in GLOB.machines)
+ if(C.cell && (C.z in GLOB.station_z_levels))
+ C.cell.charge = C.cell.maxcharge
+ C.failure_timer = 0
+ for(var/obj/machinery/power/smes/S in GLOB.machines)
+ if(!(S.z in GLOB.station_z_levels))
+ continue
+ S.charge = S.capacity
+ S.output_level = S.output_level_max
+ S.output_attempt = 1
+ S.update_icon()
+ S.power_change()
+ for(var/area/A in world)
if(!istype(A, /area/space) && !istype(A, /area/shuttle) && !istype(A, /area/arrival))
A.power_light = TRUE
A.power_equip = TRUE
A.power_environ = TRUE
- A.power_change()
-
-/proc/power_restore_quick()
-
- priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg')
- for(var/obj/machinery/power/smes/S in GLOB.machines)
- if(S.z != ZLEVEL_STATION)
- continue
- S.charge = S.capacity
- S.output_level = S.output_level_max
- S.output_attempt = 1
- S.update_icon()
- S.power_change()
-
+ A.power_change()
+
+/proc/power_restore_quick()
+
+ priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg')
+ for(var/obj/machinery/power/smes/S in GLOB.machines)
+ if(!(S.z in GLOB.station_z_levels))
+ continue
+ S.charge = S.capacity
+ S.output_level = S.output_level_max
+ S.output_attempt = 1
+ S.update_icon()
+ S.power_change()
+
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 1c134205b2..311f2e505a 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -1,592 +1,560 @@
-
-
-/*
- * GAMEMODES (by Rastaf0)
- *
- * In the new mode system all special roles are fully supported.
- * You can have proper wizards/traitors/changelings/cultists during any mode.
- * Only two things really depends on gamemode:
- * 1. Starting roles, equipment and preparations
- * 2. Conditions of finishing the round.
- *
- */
-
-
-/datum/game_mode
- var/name = "invalid"
- var/config_tag = null
- var/votable = 1
- var/probability = 0
- var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm
- var/explosion_in_progress = 0 //sit back and relax
- var/round_ends_with_antag_death = 0 //flags_1 the "one verse the station" antags as such
- var/list/datum/mind/modePlayer = new
- var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here
- var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist
- var/list/protected_jobs = list() // Jobs that can't be traitors because
- var/required_players = 0
- var/maximum_players = -1 // -1 is no maximum, positive numbers limit the selection of a mode on overstaffed stations
- var/required_enemies = 0
- var/recommended_enemies = 0
- var/antag_flag = null //preferences flag such as BE_WIZARD that need to be turned on for players to be antag
- var/mob/living/living_antag_player = null
- var/list/datum/game_mode/replacementmode = null
- var/round_converted = 0 //0: round not converted, 1: round going to convert, 2: round converted
- var/reroll_friendly //During mode conversion only these are in the running
- var/continuous_sanity_checked //Catches some cases where config options could be used to suggest that modes without antagonists should end when all antagonists die
- var/enemy_minimum_age = 7 //How many days must players have been playing before they can play this antagonist
-
- var/announce_span = "warning" //The gamemode's name will be in this span during announcement.
- var/announce_text = "This gamemode forgot to set a descriptive text! Uh oh!" //Used to describe a gamemode when it's announced.
-
- var/const/waittime_l = 600
- var/const/waittime_h = 1800 // started at 1800
-
- var/list/datum/station_goal/station_goals = list()
-
- var/allow_persistence_save = TRUE
-
-/datum/game_mode/proc/announce() //Shows the gamemode's name and a fast description.
- to_chat(world, "The gamemode is: [name]!")
- to_chat(world, "[announce_text]")
-
-
-///Checks to see if the game can be setup and ran with the current number of players or whatnot.
-/datum/game_mode/proc/can_start()
- var/playerC = 0
- for(var/mob/dead/new_player/player in GLOB.player_list)
- if((player.client)&&(player.ready == PLAYER_READY_TO_PLAY))
- playerC++
- if(!GLOB.Debug2)
- if(playerC < required_players || (maximum_players >= 0 && playerC > maximum_players))
- return 0
- antag_candidates = get_players_for_role(antag_flag)
- if(!GLOB.Debug2)
- if(antag_candidates.len < required_enemies)
- return 0
- return 1
- else
- message_admins("DEBUG: GAME STARTING WITHOUT PLAYER NUMBER CHECKS, THIS WILL PROBABLY BREAK SHIT.")
- return 1
-
-
-///Attempts to select players for special roles the mode might have.
-/datum/game_mode/proc/pre_setup()
- return 1
-
-
-///Everyone should now be on the station and have their normal gear. This is the place to give the special roles extra things
-/datum/game_mode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report.
- if(!report)
- report = config.intercept
- addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME)
-
- if(SSdbcore.Connect())
- var/sql
- if(SSticker.mode)
- sql += "game_mode = '[SSticker.mode]'"
- if(GLOB.revdata.originmastercommit)
- if(sql)
- sql += ", "
- sql += "commit_hash = '[GLOB.revdata.originmastercommit]'"
- if(sql)
- var/datum/DBQuery/query_round_game_mode = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET [sql] WHERE id = [GLOB.round_id]")
- query_round_game_mode.Execute()
- if(report)
- addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h))
- generate_station_goals()
- return 1
-
-
-///Handles late-join antag assignments
-/datum/game_mode/proc/make_antag_chance(mob/living/carbon/human/character)
- if(replacementmode && round_converted == 2)
- replacementmode.make_antag_chance(character)
- return
-
-
-///Allows rounds to basically be "rerolled" should the initial premise fall through. Also known as mulligan antags.
-/datum/game_mode/proc/convert_roundtype()
- set waitfor = FALSE
- var/list/living_crew = list()
-
- for(var/mob/Player in GLOB.mob_list)
- if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client)
- living_crew += Player
- if(living_crew.len / GLOB.joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh
- message_admins("Convert_roundtype failed due to too many dead people. Limit is [config.midround_antag_life_check * 100]% living crew")
- return null
-
- var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len)
- var/list/datum/game_mode/usable_modes = list()
- for(var/datum/game_mode/G in runnable_modes)
- if(G.reroll_friendly && living_crew >= G.required_players)
- usable_modes += G
- else
- qdel(G)
-
- if(!usable_modes)
- message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.")
- return null
-
- replacementmode = pickweight(usable_modes)
-
- switch(SSshuttle.emergency.mode) //Rounds on the verge of ending don't get new antags, they just run out
- if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE)
- return 1
- if(SHUTTLE_CALL)
- if(SSshuttle.emergency.timeLeft(1) < initial(SSshuttle.emergencyCallTime)*0.5)
- return 1
-
- if(world.time >= (config.midround_antag_time_check * 600))
- message_admins("Convert_roundtype failed due to round length. Limit is [config.midround_antag_time_check] minutes.")
- return null
-
- var/list/antag_candidates = list()
-
- for(var/mob/living/carbon/human/H in living_crew)
- if(H.client && H.client.prefs.allow_midround_antag)
- antag_candidates += H
-
- if(!antag_candidates)
- message_admins("Convert_roundtype failed due to no antag candidates.")
- return null
-
- antag_candidates = shuffle(antag_candidates)
-
- if(config.protect_roles_from_antagonist)
- replacementmode.restricted_jobs += replacementmode.protected_jobs
- if(config.protect_assistant_from_antagonist)
- replacementmode.restricted_jobs += "Assistant"
-
- message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.")
-
- . = 1
- sleep(rand(600,1800))
- if(!SSticker.IsRoundInProgress())
- message_admins("Roundtype conversion cancelled, the game appears to have finished!")
- round_converted = 0
- return
- //somewhere between 1 and 3 minutes from now
- if(!config.midround_antag[SSticker.mode.config_tag])
- round_converted = 0
- return 1
- for(var/mob/living/carbon/human/H in antag_candidates)
- replacementmode.make_antag_chance(H)
- round_converted = 2
- message_admins("-- IMPORTANT: The roundtype has been converted to [replacementmode.name], antagonists may have been created! --")
-
-
-///Called by the gameSSticker
-/datum/game_mode/process()
- return 0
-
-
-/datum/game_mode/proc/check_finished(force_ending) //to be called by SSticker
- if(replacementmode && round_converted == 2)
- return replacementmode.check_finished()
- if(SSshuttle.emergency && (SSshuttle.emergency.mode == SHUTTLE_ENDGAME))
- return TRUE
- if(station_was_nuked)
- return TRUE
- if(!round_converted && (!config.continuous[config_tag] || (config.continuous[config_tag] && config.midround_antag[config_tag]))) //Non-continuous or continous with replacement antags
- if(!continuous_sanity_checked) //make sure we have antags to be checking in the first place
- for(var/mob/Player in GLOB.mob_list)
- if(Player.mind)
- if(Player.mind.special_role)
- continuous_sanity_checked = 1
- return 0
- if(!continuous_sanity_checked)
- message_admins("The roundtype ([config_tag]) has no antagonists, continuous round has been defaulted to on and midround_antag has been defaulted to off.")
- config.continuous[config_tag] = 1
- config.midround_antag[config_tag] = 0
- SSshuttle.clearHostileEnvironment(src)
- return 0
-
-
- if(living_antag_player && living_antag_player.mind && isliving(living_antag_player) && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player))
- return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark.
-
- for(var/mob/Player in GLOB.living_mob_list)
- if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client)
- if(Player.mind.special_role) //Someone's still antaging!
- living_antag_player = Player
- return 0
-
- if(!config.continuous[config_tag] || force_ending)
- return 1
-
- else
- round_converted = convert_roundtype()
- if(!round_converted)
- if(round_ends_with_antag_death)
- return 1
- else
- config.midround_antag[config_tag] = 0
- return 0
-
- return 0
-
-
-/datum/game_mode/proc/declare_completion()
- var/clients = 0
- var/surviving_humans = 0
- var/surviving_total = 0
- var/ghosts = 0
- var/escaped_humans = 0
- var/escaped_total = 0
-
- for(var/mob/M in GLOB.player_list)
- if(M.client)
- clients++
- if(ishuman(M))
- if(!M.stat)
- surviving_humans++
- if(M.z == ZLEVEL_CENTCOM)
- escaped_humans++
- if(!M.stat)
- surviving_total++
- if(M.z == ZLEVEL_CENTCOM)
- escaped_total++
-
-
- if(isobserver(M))
- ghosts++
-
- if(clients > 0)
- SSblackbox.set_val("round_end_clients",clients)
- if(ghosts > 0)
- SSblackbox.set_val("round_end_ghosts",ghosts)
- if(surviving_humans > 0)
- SSblackbox.set_val("survived_human",surviving_humans)
- if(surviving_total > 0)
- SSblackbox.set_val("survived_total",surviving_total)
- if(escaped_humans > 0)
- SSblackbox.set_val("escaped_human",escaped_humans)
- if(escaped_total > 0)
- SSblackbox.set_val("escaped_total",escaped_total)
- send2irc("Server", "Round just ended.")
- if(cult.len && !istype(SSticker.mode, /datum/game_mode/cult))
- datum_cult_completion()
-
-
- if(GLOB.borers.len)
- var/borertext = "
The borers were:"
- for(var/mob/living/simple_animal/borer/B in GLOB.borers)
- if((B.key || B.controlling) && B.stat != DEAD)
- borertext += "
[B.controlling ? B.victim.key : B.key] was [B.truename]"
- var/count = 1
- for(var/datum/objective/objective in B.mind.objectives)
- if(objective.check_completion())
- borertext += "
Objective #[count]: [objective.explanation_text] Success!"
- else
- borertext += "
Objective #[count]: [objective.explanation_text] Fail."
- count++
-
-
- to_chat(world, borertext)
-
- var/total_borers = 0
- for(var/mob/living/simple_animal/borer/B in GLOB.borers)
- if((B.key || B.victim) && B.stat != DEAD)
- total_borers++
- if(total_borers)
- var/total_borer_hosts = 0
- for(var/mob/living/carbon/C in GLOB.mob_list)
- var/mob/living/simple_animal/borer/D = C.has_brain_worms()
- var/turf/location = get_turf(C)
- if(location.z == ZLEVEL_CENTCOM && D && D.stat != DEAD)
- total_borer_hosts++
- to_chat(world, "There were [total_borers] borers alive at round end!")
- to_chat(world, "A total of [total_borer_hosts] borers with hosts escaped on the shuttle alive.")
-
- CHECK_TICK
- return 0
-
-
-/datum/game_mode/proc/check_win() //universal trigger to be called at mob death, nuke explosion, etc. To be called from everywhere.
- return 0
-
-
-/datum/game_mode/proc/send_intercept()
- var/intercepttext = "Central Command Status Summary
"
- intercepttext += "Central Command has intercepted and partially decoded a Syndicate transmission with vital information regarding their movements. The following report outlines the most \
- likely threats to appear in your sector."
- var/list/possible_modes = list()
- possible_modes.Add("blob", "changeling", "clock_cult", "cult", "extended", "malf", "nuclear", "revolution", "traitor", "wizard")
- possible_modes -= name //remove the current gamemode to prevent it from being randomly deleted, it will be readded later
-
- for(var/i in 1 to 6) //Remove a few modes to leave four
- possible_modes -= pick(possible_modes)
-
- possible_modes |= name //Re-add the actual gamemode - the intercept will thus always have the correct mode in its list
- possible_modes = shuffle(possible_modes) //Meta prevention
-
- var/datum/intercept_text/i_text = new /datum/intercept_text
- for(var/V in possible_modes)
- intercepttext += i_text.build(V)
-
- if(station_goals.len)
- intercepttext += "
Special Orders for [station_name()]:"
- for(var/datum/station_goal/G in station_goals)
- G.on_report()
- intercepttext += G.get_report()
-
- print_command_report(intercepttext, "Central Command Status Summary", announce=FALSE)
- priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/ai/intercept.ogg')
- if(GLOB.security_level < SEC_LEVEL_BLUE)
- set_security_level(SEC_LEVEL_BLUE)
-
-
-/datum/game_mode/proc/get_players_for_role(role)
- var/list/players = list()
- var/list/candidates = list()
- var/list/drafted = list()
- var/datum/mind/applicant = null
-
- // Ultimate randomizing code right here
- for(var/mob/dead/new_player/player in GLOB.player_list)
- if(player.client && player.ready == PLAYER_READY_TO_PLAY)
- players += player
-
- // Shuffling, the players list is now ping-independent!!!
- // Goodbye antag dante
- players = shuffle(players)
-
- for(var/mob/dead/new_player/player in players)
- if(player.client && player.ready == PLAYER_READY_TO_PLAY)
- if(role in player.client.prefs.be_special)
- if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans
- if(age_check(player.client)) //Must be older than the minimum age
- candidates += player.mind // Get a list of all the people who want to be the antagonist for this round
-
- if(restricted_jobs)
- for(var/datum/mind/player in candidates)
- for(var/job in restricted_jobs) // Remove people who want to be antagonist but have a job already that precludes it
- if(player.assigned_role == job)
- candidates -= player
-
- if(candidates.len < recommended_enemies)
- for(var/mob/dead/new_player/player in players)
- if(player.client && player.ready == PLAYER_READY_TO_PLAY)
- if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one
- if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans
- drafted += player.mind
-
- if(restricted_jobs)
- for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist
- for(var/job in restricted_jobs)
- if(player.assigned_role == job)
- drafted -= player
-
- drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie
-
- while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates
- if(drafted.len > 0)
- applicant = pick(drafted)
- if(applicant)
- candidates += applicant
- drafted.Remove(applicant)
-
- else // Not enough scrubs, ABORT ABORT ABORT
- break
-
- if(restricted_jobs)
- for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist
- for(var/job in restricted_jobs)
- if(player.assigned_role == job)
- drafted -= player
-
- drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie
-
- while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates
- if(drafted.len > 0)
- applicant = pick(drafted)
- if(applicant)
- candidates += applicant
- drafted.Remove(applicant)
-
- else // Not enough scrubs, ABORT ABORT ABORT
- break
-
- return candidates // Returns: The number of people who had the antagonist role set to yes, regardless of recomended_enemies, if that number is greater than recommended_enemies
- // recommended_enemies if the number of people with that role set to yes is less than recomended_enemies,
- // Less if there are not enough valid players in the game entirely to make recommended_enemies.
-
-
-
-/datum/game_mode/proc/num_players()
- . = 0
- for(var/mob/dead/new_player/P in GLOB.player_list)
- if(P.client && P.ready == PLAYER_READY_TO_PLAY)
- . ++
-
-///////////////////////////////////
-//Keeps track of all living heads//
-///////////////////////////////////
-/datum/game_mode/proc/get_living_heads()
- . = list()
- for(var/mob/living/carbon/human/player in GLOB.mob_list)
- if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.command_positions))
- . |= player.mind
-
-
-////////////////////////////
-//Keeps track of all heads//
-////////////////////////////
-/datum/game_mode/proc/get_all_heads()
- . = list()
- for(var/mob/player in GLOB.mob_list)
- if(player.mind && (player.mind.assigned_role in GLOB.command_positions))
- . |= player.mind
-
-//////////////////////////////////////////////
-//Keeps track of all living security members//
-//////////////////////////////////////////////
-/datum/game_mode/proc/get_living_sec()
- . = list()
- for(var/mob/living/carbon/human/player in GLOB.mob_list)
- if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions))
- . |= player.mind
-
-////////////////////////////////////////
-//Keeps track of all security members//
-////////////////////////////////////////
-/datum/game_mode/proc/get_all_sec()
- . = list()
- for(var/mob/living/carbon/human/player in GLOB.mob_list)
- if(player.mind && (player.mind.assigned_role in GLOB.security_positions))
- . |= player.mind
-
-//////////////////////////
-//Reports player logouts//
-//////////////////////////
-/proc/display_roundstart_logout_report()
- var/msg = "Roundstart logout report\n\n"
- for(var/mob/living/L in GLOB.mob_list)
-
- if(L.ckey)
- var/found = 0
- for(var/client/C in GLOB.clients)
- if(C.ckey == L.ckey)
- found = 1
- break
- if(!found)
- msg += "[L.name] ([L.ckey]), the [L.job] (Disconnected)\n"
-
-
- if(L.ckey && L.client)
- if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2)) //Connected, but inactive (alt+tabbed or something)
- msg += "[L.name] ([L.ckey]), the [L.job] (Connected, Inactive)\n"
- continue //AFK client
- if(L.stat)
- if(L.suiciding) //Suicider
- msg += "[L.name] ([L.ckey]), the [L.job] (Suicide)\n"
- continue //Disconnected client
- if(L.stat == UNCONSCIOUS)
- msg += "[L.name] ([L.ckey]), the [L.job] (Dying)\n"
- continue //Unconscious
- if(L.stat == DEAD)
- msg += "[L.name] ([L.ckey]), the [L.job] (Dead)\n"
- continue //Dead
-
- continue //Happy connected client
- for(var/mob/dead/observer/D in GLOB.mob_list)
- if(D.mind && D.mind.current == L)
- if(L.stat == DEAD)
- if(L.suiciding) //Suicider
- msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Suicide)\n"
- continue //Disconnected client
- else
- msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n"
- continue //Dead mob, ghost abandoned
- else
- if(D.can_reenter_corpse)
- continue //Adminghost, or cult/wizard ghost
- else
- msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n"
- continue //Ghosted while alive
-
-
-
- for(var/mob/M in GLOB.mob_list)
- if(M.client && M.client.holder)
- to_chat(M, msg)
-
-/datum/game_mode/proc/printplayer(datum/mind/ply, fleecheck)
- var/text = "
[ply.key] was [ply.name] the [ply.assigned_role] and"
- if(ply.current)
- if(ply.current.stat == DEAD)
- text += " died"
- else
- text += " survived"
- if(fleecheck && ply.current.z > ZLEVEL_STATION)
- text += " while fleeing the station"
- if(ply.current.real_name != ply.name)
- text += " as [ply.current.real_name]"
- else
- text += " had their body destroyed"
- return text
-
-/datum/game_mode/proc/printobjectives(datum/mind/ply)
- var/text = ""
- var/count = 1
- for(var/datum/objective/objective in ply.objectives)
- if(objective.check_completion())
- text += "
Objective #[count]: [objective.explanation_text] Success!"
- else
- text += "
Objective #[count]: [objective.explanation_text] Fail."
- count++
- return text
-
-//If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1
-/datum/game_mode/proc/age_check(client/C)
- if(get_remaining_days(C) == 0)
- return 1 //Available in 0 days = available right now = player is old enough to play.
- return 0
-
-
-/datum/game_mode/proc/get_remaining_days(client/C)
- if(!C)
- return 0
- if(!config.use_age_restriction_for_jobs)
- return 0
- if(!isnum(C.player_age))
- return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced
- if(!isnum(enemy_minimum_age))
- return 0
-
- return max(0, enemy_minimum_age - C.player_age)
-
-/datum/game_mode/proc/replace_jobbaned_player(mob/living/M, role_type, pref)
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [role_type]?", "[role_type]", null, pref, 50, M)
- var/mob/dead/observer/theghost = null
- if(candidates.len)
- theghost = pick(candidates)
- to_chat(M, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")
- message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbaned player.")
- M.ghostize(0)
- M.key = theghost.key
-
-/datum/game_mode/proc/remove_antag_for_borging(datum/mind/newborgie)
- SSticker.mode.remove_cultist(newborgie, 0, 0)
- SSticker.mode.remove_revolutionary(newborgie, 0)
-
-/datum/game_mode/proc/generate_station_goals()
- var/list/possible = list()
- for(var/T in subtypesof(/datum/station_goal))
- var/datum/station_goal/G = T
- if(config_tag in initial(G.gamemode_blacklist))
- continue
- possible += T
- var/goal_weights = 0
- while(possible.len && goal_weights < STATION_GOAL_BUDGET)
- var/datum/station_goal/picked = pick_n_take(possible)
- goal_weights += initial(picked.weight)
- station_goals += new picked
-
-
-/datum/game_mode/proc/declare_station_goal_completion()
- for(var/V in station_goals)
- var/datum/station_goal/G = V
- G.print_result()
+
+
+/*
+ * GAMEMODES (by Rastaf0)
+ *
+ * In the new mode system all special roles are fully supported.
+ * You can have proper wizards/traitors/changelings/cultists during any mode.
+ * Only two things really depends on gamemode:
+ * 1. Starting roles, equipment and preparations
+ * 2. Conditions of finishing the round.
+ *
+ */
+
+
+/datum/game_mode
+ var/name = "invalid"
+ var/config_tag = null
+ var/votable = 1
+ var/probability = 0
+ var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm
+ var/explosion_in_progress = 0 //sit back and relax
+ var/round_ends_with_antag_death = 0 //flags the "one verse the station" antags as such
+ var/list/datum/mind/modePlayer = new
+ var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here
+ var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist
+ var/list/protected_jobs = list() // Jobs that can't be traitors because
+ var/required_players = 0
+ var/maximum_players = -1 // -1 is no maximum, positive numbers limit the selection of a mode on overstaffed stations
+ var/required_enemies = 0
+ var/recommended_enemies = 0
+ var/antag_flag = null //preferences flag such as BE_WIZARD that need to be turned on for players to be antag
+ var/mob/living/living_antag_player = null
+ var/list/datum/game_mode/replacementmode = null
+ var/round_converted = 0 //0: round not converted, 1: round going to convert, 2: round converted
+ var/reroll_friendly //During mode conversion only these are in the running
+ var/continuous_sanity_checked //Catches some cases where config options could be used to suggest that modes without antagonists should end when all antagonists die
+ var/enemy_minimum_age = 7 //How many days must players have been playing before they can play this antagonist
+
+ var/announce_span = "warning" //The gamemode's name will be in this span during announcement.
+ var/announce_text = "This gamemode forgot to set a descriptive text! Uh oh!" //Used to describe a gamemode when it's announced.
+
+ var/const/waittime_l = 600
+ var/const/waittime_h = 1800 // started at 1800
+
+ var/list/datum/station_goal/station_goals = list()
+
+ var/allow_persistence_save = TRUE
+
+/datum/game_mode/proc/announce() //Shows the gamemode's name and a fast description.
+ to_chat(world, "The gamemode is: [name]!")
+ to_chat(world, "[announce_text]")
+
+
+///Checks to see if the game can be setup and ran with the current number of players or whatnot.
+/datum/game_mode/proc/can_start()
+ var/playerC = 0
+ for(var/mob/dead/new_player/player in GLOB.player_list)
+ if((player.client)&&(player.ready == PLAYER_READY_TO_PLAY))
+ playerC++
+ if(!GLOB.Debug2)
+ if(playerC < required_players || (maximum_players >= 0 && playerC > maximum_players))
+ return 0
+ antag_candidates = get_players_for_role(antag_flag)
+ if(!GLOB.Debug2)
+ if(antag_candidates.len < required_enemies)
+ return 0
+ return 1
+ else
+ message_admins("DEBUG: GAME STARTING WITHOUT PLAYER NUMBER CHECKS, THIS WILL PROBABLY BREAK SHIT.")
+ return 1
+
+
+///Attempts to select players for special roles the mode might have.
+/datum/game_mode/proc/pre_setup()
+ return 1
+
+
+///Everyone should now be on the station and have their normal gear. This is the place to give the special roles extra things
+/datum/game_mode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report.
+ if(!report)
+ report = config.intercept
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME)
+
+ if(SSdbcore.Connect())
+ var/sql
+ if(SSticker.mode)
+ sql += "game_mode = '[SSticker.mode]'"
+ if(GLOB.revdata.originmastercommit)
+ if(sql)
+ sql += ", "
+ sql += "commit_hash = '[GLOB.revdata.originmastercommit]'"
+ if(sql)
+ var/datum/DBQuery/query_round_game_mode = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET [sql] WHERE id = [GLOB.round_id]")
+ query_round_game_mode.Execute()
+ if(report)
+ addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h))
+ generate_station_goals()
+ return 1
+
+
+///Handles late-join antag assignments
+/datum/game_mode/proc/make_antag_chance(mob/living/carbon/human/character)
+ if(replacementmode && round_converted == 2)
+ replacementmode.make_antag_chance(character)
+ return
+
+
+///Allows rounds to basically be "rerolled" should the initial premise fall through. Also known as mulligan antags.
+/datum/game_mode/proc/convert_roundtype()
+ set waitfor = FALSE
+ var/list/living_crew = list()
+
+ for(var/mob/Player in GLOB.mob_list)
+ if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client)
+ living_crew += Player
+ if(living_crew.len / GLOB.joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh
+ message_admins("Convert_roundtype failed due to too many dead people. Limit is [config.midround_antag_life_check * 100]% living crew")
+ return null
+
+ var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len)
+ var/list/datum/game_mode/usable_modes = list()
+ for(var/datum/game_mode/G in runnable_modes)
+ if(G.reroll_friendly && living_crew >= G.required_players)
+ usable_modes += G
+ else
+ qdel(G)
+
+ if(!usable_modes)
+ message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.")
+ return null
+
+ replacementmode = pickweight(usable_modes)
+
+ switch(SSshuttle.emergency.mode) //Rounds on the verge of ending don't get new antags, they just run out
+ if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE)
+ return 1
+ if(SHUTTLE_CALL)
+ if(SSshuttle.emergency.timeLeft(1) < initial(SSshuttle.emergencyCallTime)*0.5)
+ return 1
+
+ if(world.time >= (config.midround_antag_time_check * 600))
+ message_admins("Convert_roundtype failed due to round length. Limit is [config.midround_antag_time_check] minutes.")
+ return null
+
+ var/list/antag_candidates = list()
+
+ for(var/mob/living/carbon/human/H in living_crew)
+ if(H.client && H.client.prefs.allow_midround_antag)
+ antag_candidates += H
+
+ if(!antag_candidates)
+ message_admins("Convert_roundtype failed due to no antag candidates.")
+ return null
+
+ antag_candidates = shuffle(antag_candidates)
+
+ if(config.protect_roles_from_antagonist)
+ replacementmode.restricted_jobs += replacementmode.protected_jobs
+ if(config.protect_assistant_from_antagonist)
+ replacementmode.restricted_jobs += "Assistant"
+
+ message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.")
+
+ . = 1
+ sleep(rand(600,1800))
+ if(!SSticker.IsRoundInProgress())
+ message_admins("Roundtype conversion cancelled, the game appears to have finished!")
+ round_converted = 0
+ return
+ //somewhere between 1 and 3 minutes from now
+ if(!config.midround_antag[SSticker.mode.config_tag])
+ round_converted = 0
+ return 1
+ for(var/mob/living/carbon/human/H in antag_candidates)
+ replacementmode.make_antag_chance(H)
+ round_converted = 2
+ message_admins("-- IMPORTANT: The roundtype has been converted to [replacementmode.name], antagonists may have been created! --")
+
+
+///Called by the gameSSticker
+/datum/game_mode/process()
+ return 0
+
+
+/datum/game_mode/proc/check_finished(force_ending) //to be called by SSticker
+ if(replacementmode && round_converted == 2)
+ return replacementmode.check_finished()
+ if(SSshuttle.emergency && (SSshuttle.emergency.mode == SHUTTLE_ENDGAME))
+ return TRUE
+ if(station_was_nuked)
+ return TRUE
+ if(!round_converted && (!config.continuous[config_tag] || (config.continuous[config_tag] && config.midround_antag[config_tag]))) //Non-continuous or continous with replacement antags
+ if(!continuous_sanity_checked) //make sure we have antags to be checking in the first place
+ for(var/mob/Player in GLOB.mob_list)
+ if(Player.mind)
+ if(Player.mind.special_role)
+ continuous_sanity_checked = 1
+ return 0
+ if(!continuous_sanity_checked)
+ message_admins("The roundtype ([config_tag]) has no antagonists, continuous round has been defaulted to on and midround_antag has been defaulted to off.")
+ config.continuous[config_tag] = 1
+ config.midround_antag[config_tag] = 0
+ SSshuttle.clearHostileEnvironment(src)
+ return 0
+
+
+ if(living_antag_player && living_antag_player.mind && isliving(living_antag_player) && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player))
+ return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark.
+
+ for(var/mob/Player in GLOB.living_mob_list)
+ if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client)
+ if(Player.mind.special_role) //Someone's still antaging!
+ living_antag_player = Player
+ return 0
+
+ if(!config.continuous[config_tag] || force_ending)
+ return 1
+
+ else
+ round_converted = convert_roundtype()
+ if(!round_converted)
+ if(round_ends_with_antag_death)
+ return 1
+ else
+ config.midround_antag[config_tag] = 0
+ return 0
+
+ return 0
+
+
+/datum/game_mode/proc/declare_completion()
+ var/clients = 0
+ var/surviving_humans = 0
+ var/surviving_total = 0
+ var/ghosts = 0
+ var/escaped_humans = 0
+ var/escaped_total = 0
+
+ for(var/mob/M in GLOB.player_list)
+ if(M.client)
+ clients++
+ if(ishuman(M))
+ if(!M.stat)
+ surviving_humans++
+ if(M.z == ZLEVEL_CENTCOM)
+ escaped_humans++
+ if(!M.stat)
+ surviving_total++
+ if(M.z == ZLEVEL_CENTCOM)
+ escaped_total++
+
+
+ if(isobserver(M))
+ ghosts++
+
+ if(clients > 0)
+ SSblackbox.set_val("round_end_clients",clients)
+ if(ghosts > 0)
+ SSblackbox.set_val("round_end_ghosts",ghosts)
+ if(surviving_humans > 0)
+ SSblackbox.set_val("survived_human",surviving_humans)
+ if(surviving_total > 0)
+ SSblackbox.set_val("survived_total",surviving_total)
+ if(escaped_humans > 0)
+ SSblackbox.set_val("escaped_human",escaped_humans)
+ if(escaped_total > 0)
+ SSblackbox.set_val("escaped_total",escaped_total)
+ send2irc("Server", "Round just ended.")
+ if(cult.len && !istype(SSticker.mode, /datum/game_mode/cult))
+ datum_cult_completion()
+
+ return 0
+
+
+/datum/game_mode/proc/check_win() //universal trigger to be called at mob death, nuke explosion, etc. To be called from everywhere.
+ return 0
+
+
+/datum/game_mode/proc/send_intercept()
+ var/intercepttext = "Central Command Status Summary
"
+ intercepttext += "Central Command has intercepted and partially decoded a Syndicate transmission with vital information regarding their movements. The following report outlines the most \
+ likely threats to appear in your sector."
+ var/list/possible_modes = list()
+ possible_modes.Add("blob", "changeling", "clock_cult", "cult", "extended", "malf", "nuclear", "revolution", "traitor", "wizard")
+ possible_modes -= name //remove the current gamemode to prevent it from being randomly deleted, it will be readded later
+
+ for(var/i in 1 to 6) //Remove a few modes to leave four
+ possible_modes -= pick(possible_modes)
+
+ possible_modes |= name //Re-add the actual gamemode - the intercept will thus always have the correct mode in its list
+ possible_modes = shuffle(possible_modes) //Meta prevention
+
+ var/datum/intercept_text/i_text = new /datum/intercept_text
+ for(var/V in possible_modes)
+ intercepttext += i_text.build(V)
+
+ if(station_goals.len)
+ intercepttext += "
Special Orders for [station_name()]:"
+ for(var/datum/station_goal/G in station_goals)
+ G.on_report()
+ intercepttext += G.get_report()
+
+ print_command_report(intercepttext, "Central Command Status Summary", announce=FALSE)
+ priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/ai/intercept.ogg')
+ if(GLOB.security_level < SEC_LEVEL_BLUE)
+ set_security_level(SEC_LEVEL_BLUE)
+
+
+/datum/game_mode/proc/get_players_for_role(role)
+ var/list/players = list()
+ var/list/candidates = list()
+ var/list/drafted = list()
+ var/datum/mind/applicant = null
+
+ // Ultimate randomizing code right here
+ for(var/mob/dead/new_player/player in GLOB.player_list)
+ if(player.client && player.ready == PLAYER_READY_TO_PLAY)
+ players += player
+
+ // Shuffling, the players list is now ping-independent!!!
+ // Goodbye antag dante
+ players = shuffle(players)
+
+ for(var/mob/dead/new_player/player in players)
+ if(player.client && player.ready == PLAYER_READY_TO_PLAY)
+ if(role in player.client.prefs.be_special)
+ if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans
+ if(age_check(player.client)) //Must be older than the minimum age
+ candidates += player.mind // Get a list of all the people who want to be the antagonist for this round
+
+ if(restricted_jobs)
+ for(var/datum/mind/player in candidates)
+ for(var/job in restricted_jobs) // Remove people who want to be antagonist but have a job already that precludes it
+ if(player.assigned_role == job)
+ candidates -= player
+
+ if(candidates.len < recommended_enemies)
+ for(var/mob/dead/new_player/player in players)
+ if(player.client && player.ready == PLAYER_READY_TO_PLAY)
+ if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one
+ if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans
+ drafted += player.mind
+
+ if(restricted_jobs)
+ for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist
+ for(var/job in restricted_jobs)
+ if(player.assigned_role == job)
+ drafted -= player
+
+ drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie
+
+ while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates
+ if(drafted.len > 0)
+ applicant = pick(drafted)
+ if(applicant)
+ candidates += applicant
+ drafted.Remove(applicant)
+
+ else // Not enough scrubs, ABORT ABORT ABORT
+ break
+
+ if(restricted_jobs)
+ for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist
+ for(var/job in restricted_jobs)
+ if(player.assigned_role == job)
+ drafted -= player
+
+ drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie
+
+ while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates
+ if(drafted.len > 0)
+ applicant = pick(drafted)
+ if(applicant)
+ candidates += applicant
+ drafted.Remove(applicant)
+
+ else // Not enough scrubs, ABORT ABORT ABORT
+ break
+
+ return candidates // Returns: The number of people who had the antagonist role set to yes, regardless of recomended_enemies, if that number is greater than recommended_enemies
+ // recommended_enemies if the number of people with that role set to yes is less than recomended_enemies,
+ // Less if there are not enough valid players in the game entirely to make recommended_enemies.
+
+
+
+/datum/game_mode/proc/num_players()
+ . = 0
+ for(var/mob/dead/new_player/P in GLOB.player_list)
+ if(P.client && P.ready == PLAYER_READY_TO_PLAY)
+ . ++
+
+///////////////////////////////////
+//Keeps track of all living heads//
+///////////////////////////////////
+/datum/game_mode/proc/get_living_heads()
+ . = list()
+ for(var/mob/living/carbon/human/player in GLOB.mob_list)
+ if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.command_positions))
+ . |= player.mind
+
+
+////////////////////////////
+//Keeps track of all heads//
+////////////////////////////
+/datum/game_mode/proc/get_all_heads()
+ . = list()
+ for(var/mob/player in GLOB.mob_list)
+ if(player.mind && (player.mind.assigned_role in GLOB.command_positions))
+ . |= player.mind
+
+//////////////////////////////////////////////
+//Keeps track of all living security members//
+//////////////////////////////////////////////
+/datum/game_mode/proc/get_living_sec()
+ . = list()
+ for(var/mob/living/carbon/human/player in GLOB.mob_list)
+ if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions))
+ . |= player.mind
+
+////////////////////////////////////////
+//Keeps track of all security members//
+////////////////////////////////////////
+/datum/game_mode/proc/get_all_sec()
+ . = list()
+ for(var/mob/living/carbon/human/player in GLOB.mob_list)
+ if(player.mind && (player.mind.assigned_role in GLOB.security_positions))
+ . |= player.mind
+
+//////////////////////////
+//Reports player logouts//
+//////////////////////////
+/proc/display_roundstart_logout_report()
+ var/msg = "Roundstart logout report\n\n"
+ for(var/mob/living/L in GLOB.mob_list)
+
+ if(L.ckey)
+ var/found = 0
+ for(var/client/C in GLOB.clients)
+ if(C.ckey == L.ckey)
+ found = 1
+ break
+ if(!found)
+ msg += "[L.name] ([L.ckey]), the [L.job] (Disconnected)\n"
+
+
+ if(L.ckey && L.client)
+ if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2)) //Connected, but inactive (alt+tabbed or something)
+ msg += "[L.name] ([L.ckey]), the [L.job] (Connected, Inactive)\n"
+ continue //AFK client
+ if(L.stat)
+ if(L.suiciding) //Suicider
+ msg += "[L.name] ([L.ckey]), the [L.job] (Suicide)\n"
+ continue //Disconnected client
+ if(L.stat == UNCONSCIOUS)
+ msg += "[L.name] ([L.ckey]), the [L.job] (Dying)\n"
+ continue //Unconscious
+ if(L.stat == DEAD)
+ msg += "[L.name] ([L.ckey]), the [L.job] (Dead)\n"
+ continue //Dead
+
+ continue //Happy connected client
+ for(var/mob/dead/observer/D in GLOB.mob_list)
+ if(D.mind && D.mind.current == L)
+ if(L.stat == DEAD)
+ if(L.suiciding) //Suicider
+ msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Suicide)\n"
+ continue //Disconnected client
+ else
+ msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n"
+ continue //Dead mob, ghost abandoned
+ else
+ if(D.can_reenter_corpse)
+ continue //Adminghost, or cult/wizard ghost
+ else
+ msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n"
+ continue //Ghosted while alive
+
+
+
+ for(var/mob/M in GLOB.mob_list)
+ if(M.client && M.client.holder)
+ to_chat(M, msg)
+
+/datum/game_mode/proc/printplayer(datum/mind/ply, fleecheck)
+ var/text = "
[ply.key] was [ply.name] the [ply.assigned_role] and"
+ if(ply.current)
+ if(ply.current.stat == DEAD)
+ text += " died"
+ else
+ text += " survived"
+ if(fleecheck && (!(ply.current.z in GLOB.station_z_levels)))
+ text += " while fleeing the station"
+ if(ply.current.real_name != ply.name)
+ text += " as [ply.current.real_name]"
+ else
+ text += " had their body destroyed"
+ return text
+
+/datum/game_mode/proc/printobjectives(datum/mind/ply)
+ var/text = ""
+ var/count = 1
+ for(var/datum/objective/objective in ply.objectives)
+ if(objective.check_completion())
+ text += "
Objective #[count]: [objective.explanation_text] Success!"
+ else
+ text += "
Objective #[count]: [objective.explanation_text] Fail."
+ count++
+ return text
+
+//If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1
+/datum/game_mode/proc/age_check(client/C)
+ if(get_remaining_days(C) == 0)
+ return 1 //Available in 0 days = available right now = player is old enough to play.
+ return 0
+
+
+/datum/game_mode/proc/get_remaining_days(client/C)
+ if(!C)
+ return 0
+ if(!config.use_age_restriction_for_jobs)
+ return 0
+ if(!isnum(C.player_age))
+ return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced
+ if(!isnum(enemy_minimum_age))
+ return 0
+
+ return max(0, enemy_minimum_age - C.player_age)
+
+/datum/game_mode/proc/replace_jobbaned_player(mob/living/M, role_type, pref)
+ var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [role_type]?", "[role_type]", null, pref, 50, M)
+ var/mob/dead/observer/theghost = null
+ if(candidates.len)
+ theghost = pick(candidates)
+ to_chat(M, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")
+ message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbaned player.")
+ M.ghostize(0)
+ M.key = theghost.key
+
+/datum/game_mode/proc/remove_antag_for_borging(datum/mind/newborgie)
+ SSticker.mode.remove_cultist(newborgie, 0, 0)
+ SSticker.mode.remove_revolutionary(newborgie, 0)
+
+/datum/game_mode/proc/generate_station_goals()
+ var/list/possible = list()
+ for(var/T in subtypesof(/datum/station_goal))
+ var/datum/station_goal/G = T
+ if(config_tag in initial(G.gamemode_blacklist))
+ continue
+ possible += T
+ var/goal_weights = 0
+ while(possible.len && goal_weights < STATION_GOAL_BUDGET)
+ var/datum/station_goal/picked = pick_n_take(possible)
+ goal_weights += initial(picked.weight)
+ station_goals += new picked
+
+
+/datum/game_mode/proc/declare_station_goal_completion()
+ for(var/V in station_goals)
+ var/datum/station_goal/G = V
+ G.print_result()
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 339a445db6..a81bc80a5a 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/datum/action/innate/ai/nuke_station/Activate()
var/turf/T = get_turf(owner)
- if(!istype(T) || T.z != ZLEVEL_STATION)
+ if(!istype(T) || !(T.z in GLOB.station_z_levels))
to_chat(owner, "You cannot activate the doomsday device while off-station!")
return
if(alert(owner, "Send arming signal? (true = arm, false = cancel)", "purge_all_life()", "confirm = TRUE;", "confirm = FALSE;") != "confirm = TRUE;")
@@ -355,7 +355,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/obj/machinery/doomsday_device/process()
var/turf/T = get_turf(src)
- if(!T || T.z != ZLEVEL_STATION)
+ if(!T || !(T.z in GLOB.station_z_levels))
minor_announce("DOOMSDAY DEVICE OUT OF STATION RANGE, ABORTING", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE)
SSshuttle.clearHostileEnvironment(src)
qdel(src)
@@ -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)
sound_to_playing_players('sound/machines/alarm.ogg')
sleep(100)
for(var/mob/living/L in GLOB.mob_list)
@@ -425,7 +425,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/datum/action/innate/ai/lockdown/Activate()
for(var/obj/machinery/door/D in GLOB.airlocks)
- if(D.z != ZLEVEL_STATION)
+ if(!(D.z in GLOB.station_z_levels))
continue
INVOKE_ASYNC(D, /obj/machinery/door.proc/hostile_lockdown, src)
addtimer(CALLBACK(D, /obj/machinery/door.proc/disable_lockdown), 900)
@@ -503,7 +503,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/datum/action/innate/ai/break_fire_alarms/Activate()
for(var/obj/machinery/firealarm/F in GLOB.machines)
- if(F.z != ZLEVEL_STATION)
+ if(!(F.z in GLOB.station_z_levels))
continue
F.emagged = TRUE
to_chat(owner, "All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.")
@@ -530,7 +530,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/datum/action/innate/ai/break_air_alarms/Activate()
for(var/obj/machinery/airalarm/AA in GLOB.machines)
- if(AA.z != ZLEVEL_STATION)
+ if(!(AA.z in GLOB.station_z_levels))
continue
AA.emagged = TRUE
to_chat(owner, "All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.")
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 0265b37194..3bb3c8b43e 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -31,15 +31,15 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
var/max_i = 10//number of tries to spawn meteor.
while(!isspaceturf(pickedstart))
var/startSide = pick(GLOB.cardinals)
- pickedstart = spaceDebrisStartLoc(startSide, ZLEVEL_STATION)
- pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION)
+ pickedstart = spaceDebrisStartLoc(startSide, ZLEVEL_STATION_PRIMARY)
+ pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION_PRIMARY)
max_i--
if(max_i<=0)
return
var/Me = pickweight(meteortypes)
var/obj/effect/meteor/M = new Me(pickedstart)
M.dest = pickedgoal
- M.z_original = ZLEVEL_STATION
+ M.z_original = ZLEVEL_STATION_PRIMARY
spawn(0)
walk_towards(M, M.dest, 1)
@@ -96,7 +96,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
pass_flags = PASSTABLE
var/heavy = 0
var/meteorsound = 'sound/effects/meteorimpact.ogg'
- var/z_original = ZLEVEL_STATION
+ var/z_original = ZLEVEL_STATION_PRIMARY
var/threat = 0 // used for determining which meteors are most interesting
var/lifetime = DEFAULT_METEOR_LIFETIME
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm b/code/game/gamemodes/miniantags/abduction/machinery/camera.dm
index ffd1b88d25..97893d6d2e 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm
+++ b/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
icon = 'icons/obj/abductor.dmi'
icon_state = "camera"
diff --git a/code/game/gamemodes/miniantags/borer/borer_event.dm b/code/game/gamemodes/miniantags/borer/borer_event.dm
index 7d74a065aa..6875a97db5 100644
--- a/code/game/gamemodes/miniantags/borer/borer_event.dm
+++ b/code/game/gamemodes/miniantags/borer/borer_event.dm
@@ -26,7 +26,7 @@
for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in GLOB.machines)
if(QDELETED(temp_vent))
continue
- if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded)
+ if(temp_vent.loc.z == ZLEVEL_STATION_PRIMARY && !temp_vent.welded)
var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
if(temp_vent_parent.other_atmosmch.len > 20)
vents += temp_vent
diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
index 2a7760dfc5..8979fb8c78 100644
--- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
+++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
@@ -458,7 +458,7 @@
if(target == src)
return
- if(z != ZLEVEL_STATION && z != ZLEVEL_LAVALAND)
+ if(!(z in GLOB.station_z_levels) && z != ZLEVEL_LAVALAND)
to_chat(src, "Our bluespace transceiver cannot locate a viable bluespace link, our teleportation abilities are useless in this area.")
return
@@ -469,8 +469,8 @@
var/turf/open/floor/F
switch(z) //Only the station/lavaland
- 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)
if(ZLEVEL_LAVALAND)
F = find_safe_turf(zlevels = ZLEVEL_LAVALAND, extended_safety_checks = TRUE)
if(!F)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 95fc735ec6..5133fd26a4 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -435,7 +435,7 @@
var/off_station = 0
var/turf/bomb_location = get_turf(src)
var/area/A = get_area(bomb_location)
- if(bomb_location && (bomb_location.z == ZLEVEL_STATION))
+ if(bomb_location && (bomb_location.z in GLOB.station_z_levels))
if(istype(A, /area/space))
off_station = NUKE_MISS_STATION
if((bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE)))
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 4bc43a6acb..baf0f69ab9 100644
--- a/code/game/gamemodes/objective.dm
+++ b/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 in GLOB.station_z_levels)) || (target.current.client && target.current.client.is_afk())) //If they leave the station or go afk they count as dead for this
return 2
return 0
return 1
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index f393dc5338..55fc571459 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -335,7 +335,7 @@
/datum/game_mode/revolution/proc/check_heads_victory()
for(var/datum/mind/rev_mind in head_revolutionaries)
var/turf/T = get_turf(rev_mind.current)
- if((rev_mind) && (rev_mind.current) && (rev_mind.current.stat != DEAD) && T && (T.z == ZLEVEL_STATION))
+ if((rev_mind) && (rev_mind.current) && (rev_mind.current.stat != DEAD) && T && (T.z in GLOB.station_z_levels))
if(ishuman(rev_mind.current))
return 0
return 1
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index d56837b9ef..bc6833f84a 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -47,7 +47,7 @@
GLOB.cameranet.addCamera(src)
proximity_monitor = new(src, 1)
- if(mapload && z == ZLEVEL_STATION && prob(3) && !start_active)
+ if(mapload && (z in GLOB.station_z_levels) && prob(3) && !start_active)
toggle_cam()
/obj/machinery/camera/Destroy()
diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm
index 8b3e946501..c93c96429c 100644
--- a/code/game/machinery/computer/apc_control.dm
+++ b/code/game/machinery/computer/apc_control.dm
@@ -66,7 +66,7 @@
if(filters["Responsive"] && !APC.aidisabled)
continue
dat += "[A]
\
- Charge: [APC.cell.charge] / [APC.cell.maxcharge] W ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)
\
+ Charge: [DisplayPower(APC.cell.charge)] / [DisplayPower(APC.cell.maxcharge)] ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)
\
Area: [APC.area]
\
[APC.aidisabled || APC.panel_open ? "APC does not respond to interface query." : "APC responds to interface query."]
"
dat += "Check Logs
"
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index fa0008b51b..082f1aa895 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -414,8 +414,8 @@
if(gameStatus == ORION_STATUS_GAMEOVER)
dat = "Game Over
"
dat += "Like many before you, your crew never made it to Orion, lost to space...
Forever."
- if(settlers.len == 0)
- dat += "
Your entire crew died, your ship joins the fleet of ghost-ships littering the galaxy."
+ if(!settlers.len)
+ dat += "
Your entire crew died, and your ship joins the fleet of ghost-ships littering the galaxy."
else
if(food <= 0)
dat += "
You ran out of food and starved."
@@ -429,7 +429,6 @@
M.adjust_fire_stacks(5)
M.IgniteMob() //flew into a star, so you're on fire
to_chat(user, "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.")
- dat += "
OK...
"
if(emagged)
to_chat(user, "You're never going to make it to Orion...")
@@ -439,6 +438,7 @@
name = "The Orion Trail"
desc = "Learn how our ancestors got to Orion, and have fun in the process!"
+ dat += "May They Rest In Peace
"
else if(event)
dat = eventdat
else if(gameStatus == ORION_STATUS_NORMAL)
@@ -454,7 +454,7 @@
dat += "Go Around Continue
"
else
dat += "Continue
"
- dat += "Kill a crewmember
"
+ dat += "Kill a Crewmember
"
dat += "Close
"
else
dat = "The Orion Trail
"
@@ -609,17 +609,15 @@
if(prob(75))
event = ORION_TRAIL_BLACKHOLE
event()
- if(emagged) //has to be here because otherwise it doesn't work
+ if(emagged)
playsound(loc, 'sound/effects/supermatter.ogg', 100, 1)
say("A miniature black hole suddenly appears in front of [src], devouring [usr] alive!")
if(isliving(usr))
var/mob/living/L = usr
L.Stun(200, ignore_canstun = TRUE) //you can't run :^)
var/S = new /obj/singularity/academy(usr.loc)
- emagged = FALSE //immediately removes emagged status so people can't kill themselves by sprinting up and interacting
- sleep(50)
- say("[S] winks out, just as suddenly as it appeared.")
- qdel(S)
+ addtimer(CALLBACK(src, /atom/movable/proc/say, "[S] winks out, just as suddenly as it appeared."), 50)
+ QDEL_IN(src, 50)
else
event = null
turns += 1
@@ -691,19 +689,20 @@
if(prob(success))
FU = rand(5,15)
FO = rand(5,15)
- last_spaceport_action = "You successfully raided the spaceport! you gained [FU] Fuel and [FO] Food! (+[FU]FU,+[FO]FO)"
+ last_spaceport_action = "You successfully raided the spaceport! You gained [FU] Fuel and [FO] Food! (+[FU]FU,+[FO]FO)"
else
FU = rand(-5,-15)
FO = rand(-5,-15)
- last_spaceport_action = "You failed to raid the spaceport! you lost [FU*-1] Fuel and [FO*-1] Food in your scramble to escape! ([FU]FU,[FO]FO)"
+ last_spaceport_action = "You failed to raid the spaceport! You lost [FU*-1] Fuel and [FO*-1] Food in your scramble to escape! ([FU]FU,[FO]FO)"
//your chance of lose a crewmember is 1/2 your chance of success
//this makes higher % failures hurt more, don't get cocky space cowboy!
if(prob(success*5))
var/lost_crew = remove_crewmember()
- last_spaceport_action = "You failed to raid the spaceport! you lost [FU*-1] Fuel and [FO*-1] Food, AND [lost_crew] in your scramble to escape! ([FU]FI,[FO]FO,-Crew)"
+ last_spaceport_action = "You failed to raid the spaceport! You lost [FU*-1] Fuel and [FO*-1] Food, AND [lost_crew] in your scramble to escape! ([FU]FI,[FO]FO,-Crew)"
if(emagged)
- say("WEEWOO WEEWOO, Spaceport Security en route!")
+ say("WEEWOO! WEEWOO! Spaceport security en route!")
+ playsound(src, 'sound/items/weeoo1.ogg', 100, FALSE)
for(var/i, i<=3, i++)
var/mob/living/simple_animal/hostile/syndicate/ranged/orion/O = new/mob/living/simple_animal/hostile/syndicate/ranged/orion(get_turf(src))
O.target = usr
@@ -766,9 +765,9 @@
eventdat += "
They have stolen [sfood] Food and [sfuel] Fuel."
else if(prob(10))
var/deadname = remove_crewmember()
- eventdat += "
[deadname] tried to fight back but was killed."
+ eventdat += "
[deadname] tried to fight back, but was killed."
else
- eventdat += "
Fortunately you fended them off without any trouble."
+ eventdat += "
Fortunately, you fended them off without any trouble."
eventdat += "Continue
"
eventdat += "Close
"
canContinueEvent = 1
@@ -844,7 +843,7 @@
else if(prob(70))
lings_aboard = min(++lings_aboard,2)
- eventdat += "Kill a crewmember
"
+ eventdat += "Kill a Crewmember
"
eventdat += "Risk it
"
eventdat += "Close
"
canContinueEvent = 1
@@ -859,7 +858,7 @@
if(lings_aboard >= 2)
ling2 = remove_crewmember()
- eventdat += "Oh no, some of your crew are Changelings!"
+ eventdat += "Changelings among your crew suddenly burst from hiding and attack!"
if(ling2)
eventdat += "
[ling1] and [ling2]'s arms twist and contort into grotesque blades!"
else
@@ -870,18 +869,23 @@
var/chancetokill = 30*lings_aboard-(5*alive) //eg: 30*2-(10) = 50%, 2 lings, 2 crew is 50% chance
if(prob(chancetokill))
var/deadguy = remove_crewmember()
- eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] up to [deadguy] and capitulates them!"
+ var/murder_text = pick("The changeling[ling2 ? "s" : ""] bring[ling2 ? "" : "s"] down [deadguy] and disembowel[ling2 ? "" : "s"] them in a spray of gore!", \
+ "[ling2 ? pick(ling1, ling2) : ling1] corners [deadguy] and impales them through the stomach!", \
+ "[ling2 ? pick(ling1, ling2) : ling1] decapitates [deadguy] in a single cleaving arc!")
+ eventdat += "
[murder_text]"
else
- eventdat += "
You valiantly fight off the Changeling[ling2 ? "s":""]!"
- eventdat += "
You cut the Changeling[ling2 ? "s":""] up into meat... Eww"
+ eventdat += "
You valiantly fight off the changeling[ling2 ? "s":""]!"
if(ling2)
food += 30
lings_aboard = max(0,lings_aboard-2)
else
food += 15
lings_aboard = max(0,--lings_aboard)
+ eventdat += "
Well, it's perfectly good food...\
+
You cut the changeling[ling2 ? "s" : ""] into meat, gaining [ling2 ? "30" : "15"] Food!"
else
- eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] away, What wimps!"
+ eventdat += "
[pick("Sensing unfavorable odds", "After a failed attack", "Suddenly breaking nerve")], \
+ the changeling[ling2 ? "s":""] vanish[ling2 ? "" : "es"] into space through the airlocks! You're safe... for now."
if(ling2)
lings_aboard = max(0,lings_aboard-2)
else
@@ -895,17 +899,17 @@
if(ORION_TRAIL_SPACEPORT)
gameStatus = ORION_STATUS_MARKET
if(spaceport_raided)
- eventdat += "The Spaceport is on high alert! They won't let you dock since you tried to attack them!"
+ eventdat += "The spaceport is on high alert! You've been barred from docking by the local authorities after your failed raid."
if(last_spaceport_action)
- eventdat += "
Last Spaceport Action: [last_spaceport_action]"
+ eventdat += "
Last Spaceport Action: [last_spaceport_action]"
eventdat += "Depart Spaceport
"
eventdat += "Close
"
else
- eventdat += "You pull the ship up to dock at a nearby Spaceport, lucky find!"
- eventdat += "
This Spaceport is home to travellers who failed to reach Orion, but managed to find a different home..."
+ eventdat += "Your jump into the sector yields a spaceport - a lucky find!"
+ eventdat += "
This spaceport is home to travellers who failed to reach Orion, but managed to find a different home..."
eventdat += "
Trading terms: FU = Fuel, FO = Food"
if(last_spaceport_action)
- eventdat += "
Last Spaceport Action: [last_spaceport_action]"
+ eventdat += "
Last action: [last_spaceport_action]"
eventdat += "Crew:
"
eventdat += english_list(settlers)
eventdat += "
Food: [food] | Fuel: [fuel]"
@@ -926,7 +930,7 @@
add_crewmember()
freecrew++
- eventdat += "
The traders of the spaceport take pitty on you, and give you some food and fuel (+[FU]FU,+[FO]FO)"
+ eventdat += "
The traders of the spaceport take pity on you, and generously give you some free supplies! (+[FU]FU, +[FO]FO)"
if(freecrew)
eventdat += "
You also gain a new crewmember!"
@@ -938,15 +942,15 @@
//Buy crew
if(food >= 10 && fuel >= 10)
- eventdat += "Hire a new Crewmember (-10FU,-10FO)
"
+ eventdat += "Hire a New Crewmember (-10FU, -10FO)
"
else
- eventdat += "Cant afford a new Crewmember
"
+ eventdat += "You cannot afford a new crewmember.
"
//Sell crew
if(settlers.len > 1)
- eventdat += "Sell crew for Fuel and Food (+7FU,+7FO)
"
+ eventdat += "Sell Crew for Fuel and Food (+7FU, +7FO)
"
else
- eventdat += "Cant afford to sell a Crewmember
"
+ eventdat += "You have no other crew to sell.
"
//BUY/SELL STUFF
eventdat += "Spare Parts:
"
@@ -955,30 +959,30 @@
if(fuel > 5)
eventdat += "Buy Engine Parts (-5FU)
"
else
- eventdat += "Cant afford to buy Engine Parts"
+ eventdat += "
You cannot afford engine parts."
//Hull plates
if(fuel > 5)
eventdat += "
Buy Hull Plates (-5FU)
"
else
- eventdat += "Cant afford to buy Hull Plates"
+ eventdat += "
You cannot afford hull plates."
//Electronics
if(fuel > 5)
eventdat += "
Buy Spare Electronics (-5FU)
"
else
- eventdat += "Cant afford to buy Spare Electronics"
+ eventdat += "
You cannot afford spare electronics."
//Trade
if(fuel > 5)
eventdat += "
Trade Fuel for Food (-5FU,+5FO)
"
else
- eventdat += "Cant afford to Trade Fuel for Food 5)
eventdat += "
Trade Food for Fuel (+5FU,-5FO)
"
else
- eventdat += "Cant afford to Trade Food for FuelUnable to establish a connection
: \black You're too far away from the station!")
return
usr.set_machine(src)
diff --git a/code/game/machinery/computer/monastery_shuttle.dm b/code/game/machinery/computer/monastery_shuttle.dm
index 98e7909954..b04c202dca 100644
--- a/code/game/machinery/computer/monastery_shuttle.dm
+++ b/code/game/machinery/computer/monastery_shuttle.dm
@@ -1,7 +1,7 @@
/obj/machinery/computer/shuttle/monastery_shuttle
name = "monastery shuttle console"
desc = "Used to control the monastery shuttle."
- circuit = /obj/item/circuitboard/computer/shuttle/monastery_shuttle
+ circuit = /obj/item/circuitboard/computer/monastery_shuttle
shuttleId = "pod1"
possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station"
no_destination_swap = TRUE
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index 56a6320640..a7626258ae 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -56,7 +56,7 @@
var/loc_display = "Unknown"
var/mob/living/M = T.imp_in
- if(Tr.z == ZLEVEL_STATION && !isspaceturf(M.loc))
+ if((Tr.z in GLOB.station_z_levels) && !isspaceturf(M.loc))
var/turf/mob_loc = get_turf(M)
loc_display = mob_loc.loc
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 2b66b23db3..518cd8ab09 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -61,7 +61,7 @@
if(stat & NOPOWER)
return
- if(src.z == ZLEVEL_STATION)
+ if(src.z in GLOB.station_z_levels)
add_overlay("overlay_[GLOB.security_level]")
else
//var/green = SEC_LEVEL_GREEN
@@ -121,7 +121,7 @@
var/list/data = list()
data["emagged"] = emagged
- if(src.z == ZLEVEL_STATION)
+ if(src.z in GLOB.station_z_levels)
data["seclevel"] = get_security_level()
else
data["seclevel"] = "green"
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 4cfc6809cc..5d6370188b 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -107,7 +107,7 @@
var/line1
var/line2
if(SSshuttle.supply.mode == SHUTTLE_IDLE)
- if(SSshuttle.supply.z == ZLEVEL_STATION)
+ if(SSshuttle.supply.z in GLOB.station_z_levels)
line1 = "CARGO"
line2 = "Docked"
else
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 9077283a68..5638b92b99 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -106,7 +106,7 @@
// Off-Site Relays
//
-// You are able to send/receive signals from the station's z level (changeable in the ZLEVEL_STATION #define) if
+// You are able to send/receive signals from the station's z level (changeable in the ZLEVEL_STATION_PRIMARY #define) if
/obj/machinery/telecomms/relay/proc/toggle_level()
@@ -114,7 +114,7 @@
var/turf/position = get_turf(src)
// Toggle on/off getting signals from the station or the current Z level
- if(listening_level == ZLEVEL_STATION) // equals the station
+ if(listening_level in GLOB.station_z_levels) // equals the station
listening_level = position.z
return TRUE
return FALSE
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 30ad2627ca..07b21c1fe4 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1158,8 +1158,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/suit/syndicatefake = 5,
/obj/item/clothing/head/syndicatefake = 5) //OPS IN DORMS oh wait it's just a assistant
contraband = list(/obj/item/gun/ballistic/shotgun/toy/crossbow = 10, //Congrats, you unlocked the +18 setting!
- /obj/item/gun/ballistic/automatic/c20r/toy/riot/unrestricted = 10,
- /obj/item/gun/ballistic/automatic/l6_saw/toy/riot/unrestricted = 10,
+ /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot = 10,
+ /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot = 10,
/obj/item/ammo_box/foambox/riot = 20,
/obj/item/toy/katana = 10,
/obj/item/twohanded/dualsaber/toy = 5,
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index c25e188529..74adfbe535 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -257,22 +257,6 @@
build_path = /obj/machinery/computer/telecomms/server
origin_tech = "programming=3;magnets=3;bluespace=2"
-/obj/item/circuitboard/computer/shuttle
- name = "Shuttle (Computer Board)"
- build_path = /obj/machinery/computer/shuttle
- var/shuttleId
- var/possible_destinations = ""
-
-/obj/item/circuitboard/computer/shuttle/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/multitool))
- var/chosen_id = round(input(usr, "Choose an ID number (-1 for reset):", "Input an Integer", null) as num|null)
- if(chosen_id >= 0)
- shuttleId = chosen_id
- else
- shuttleId = initial(shuttleId)
- else
- return ..()
-
/obj/item/circuitboard/computer/labor_shuttle
name = "Labor Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/labor
@@ -339,7 +323,7 @@
build_path = /obj/machinery/computer/apc_control
origin_tech = "programming=3;engineering=3;powerstorage=2"
-/obj/item/circuitboard/computer/shuttle/monastery_shuttle
+/obj/item/circuitboard/computer/monastery_shuttle
name = "Monastery Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/monastery_shuttle
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 9a26f81375..fe2acd6948 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -302,7 +302,7 @@ Code:
var/obj/machinery/power/apc/A = term.master
L += A
- menu += "Total power: [powmonitor.attached.powernet.viewavail] W
Total load: [num2text(powmonitor.attached.powernet.viewload,10)] W
"
+ menu += "Total power: [DisplayPower(powmonitor.attached.powernet.viewavail)]
Total load: [DisplayPower(powmonitor.attached.powernet.viewload)]
"
menu += ""
@@ -314,7 +314,7 @@ Code:
for(var/obj/machinery/power/apc/A in L)
menu += copytext(add_tspace(A.area.name, 30), 1, 30)
- menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(A.lastused_total, 6)] [A.cell ? "[add_lspace(round(A.cell.percent()), 3)]% [chg[A.charging+1]]" : " N/C"]
"
+ menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(DisplayPower(A.lastused_total), 6)] [A.cell ? "[add_lspace(round(A.cell.percent()), 3)]% [chg[A.charging+1]]" : " N/C"]
"
menu += "
"
@@ -437,14 +437,14 @@ Code:
switch(SSshuttle.supply.mode)
if(SHUTTLE_CALL)
menu += "Moving to "
- if(SSshuttle.supply.z != ZLEVEL_STATION)
+ if(!(SSshuttle.supply.z in GLOB.station_z_levels))
menu += "station"
else
menu += "centcom"
menu += " ([SSshuttle.supply.timeLeft(600)] Mins)"
else
menu += "At "
- if(SSshuttle.supply.z != ZLEVEL_STATION)
+ if(!(SSshuttle.supply.z in GLOB.station_z_levels))
menu += "centcom"
else
menu += "station"
diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm
index bc97925c00..a0a493530b 100644
--- a/code/game/objects/items/inducer.dm
+++ b/code/game/objects/items/inducer.dm
@@ -157,7 +157,7 @@
/obj/item/inducer/examine(mob/living/M)
..()
if(cell)
- to_chat(M, "It's display shows: [cell.charge]W")
+ to_chat(M, "It's display shows: [DisplayPower(cell.charge)]")
else
to_chat(M,"It's display is dark.")
if(opened)
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index 9662f0c0e3..ffc62ac127 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -147,8 +147,11 @@
sleep(OPEN_DURATION + 2)
pod_moving = 0
if(!QDELETED(pod))
+ var/datum/gas_mixture/floor_mixture = loc.return_air()
+ floor_mixture.archive()
pod.air_contents.archive()
- pod.air_contents.share(loc.return_air(), 1) //mix the pod's gas mixture with the tile it's on
+ pod.air_contents.share(floor_mixture, 1) //mix the pod's gas mixture with the tile it's on
+ air_update_turf()
/obj/structure/transit_tube/station/init_tube_dirs()
switch(dir)
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index 43394f01c9..1cf8e330fe 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -9,9 +9,9 @@
var/datum/gas_mixture/air_contents = new()
-/obj/structure/transit_tube_pod/New(loc)
- ..()
- air_contents.assert_gases("o2", "n2")
+/obj/structure/transit_tube_pod/Initialize()
+ . = ..()
+ air_contents.add_gases("o2", "n2")
air_contents.gases["o2"][MOLES] = MOLES_O2STANDARD
air_contents.gases["n2"][MOLES] = MOLES_N2STANDARD
air_contents.temperature = T20C
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index a03caadd19..3617759e99 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -6,13 +6,11 @@
* Engine floor
* Foam plating
*/
-// note that plating and engine floor do not call their parent attackby, unlike other flooring
-// this is done in order to avoid inheriting the crowbar attackby
/turf/open/floor/plating
name = "plating"
icon_state = "plating"
- intact = 0
+ intact = FALSE
/turf/open/floor/plating/Initialize()
if (!broken_states)
diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index 57c64d2350..2649a3a14d 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -35,6 +35,8 @@
return
/turf/open/floor/plating/asteroid/attackby(obj/item/W, mob/user, params)
+ if(..())
+ return TRUE
if(istype(W, /obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/S = W
if(S.collection_mode == 1)
@@ -62,6 +64,10 @@
return ..()
ChangeTurf(/turf/open/space)
+/turf/open/floor/plating/asteroid/ex_act(severity, target)
+ . = SendSignal(COMSIG_ATOM_EX_ACT, severity, target)
+ contents_explosion(severity, target)
+
/turf/open/floor/plating/asteroid/basalt
name = "volcanic floor"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 392d361773..0a87627e8e 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -622,7 +622,7 @@
if(3)
var/count = 0
for(var/mob/living/carbon/monkey/Monkey in world)
- if(Monkey.z == ZLEVEL_STATION)
+ if(Monkey.z in GLOB.station_z_levels)
count++
return "Kill all [count] of the monkeys on the station"
if(4)
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index c277dd59e0..f564374ba9 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -456,7 +456,7 @@
return
SSblackbox.add_details("admin_secrets_fun_used","Egalitarian Station")
for(var/obj/machinery/door/airlock/W in GLOB.machines)
- if(W.z == ZLEVEL_STATION && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
+ if((W.z in GLOB.station_z_levels) && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
W.req_access = list()
message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg')
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index d9e9a9e1d4..f8131ec5c7 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -509,7 +509,7 @@ GLOBAL_PROTECT(AdminProcCallCount)
for(var/area/A in world)
if(on_station)
var/turf/picked = safepick(get_area_turfs(A.type))
- if(picked && (picked.z == ZLEVEL_STATION))
+ if(picked && (picked.z in GLOB.station_z_levels))
if(!(A.type in areas_all) && !is_type_in_typecache(A, station_areas_blacklist))
areas_all.Add(A.type)
else if(!(A.type in areas_all))
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 0f9d5e5654..e8ba7c8bab 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -79,7 +79,7 @@
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
if(ROLE_CHANGELING in applicant.client.prefs.be_special)
var/turf/T = get_turf(applicant)
- if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
+ if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && (T.z in GLOB.station_z_levels))
if(!jobban_isbanned(applicant, ROLE_CHANGELING) && !jobban_isbanned(applicant, "Syndicate"))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
@@ -112,7 +112,7 @@
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
if(ROLE_REV in applicant.client.prefs.be_special)
var/turf/T = get_turf(applicant)
- if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
+ if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && (T.z in GLOB.station_z_levels))
if(!jobban_isbanned(applicant, ROLE_REV) && !jobban_isbanned(applicant, "Syndicate"))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
@@ -154,7 +154,7 @@
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
if(ROLE_CULTIST in applicant.client.prefs.be_special)
var/turf/T = get_turf(applicant)
- if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
+ if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && (T.z in GLOB.station_z_levels))
if(!jobban_isbanned(applicant, ROLE_CULTIST) && !jobban_isbanned(applicant, "Syndicate"))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
@@ -187,7 +187,7 @@
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
if(ROLE_SERVANT_OF_RATVAR in applicant.client.prefs.be_special)
var/turf/T = get_turf(applicant)
- if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
+ if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && (T.z in GLOB.station_z_levels))
if(!jobban_isbanned(applicant, ROLE_SERVANT_OF_RATVAR) && !jobban_isbanned(applicant, "Syndicate"))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
@@ -356,7 +356,7 @@
return 0
return
-
+
/datum/admins/proc/makeOfficial()
var/mission = input("Assign a task for the official", "Assign Task", "Conduct a routine preformance review of [station_name()] and its Captain.")
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered to be a CentCom Official?", "deathsquad")
diff --git a/code/modules/awaymissions/signpost.dm b/code/modules/awaymissions/signpost.dm
index 00012f8a40..f6fd4d9071 100644
--- a/code/modules/awaymissions/signpost.dm
+++ b/code/modules/awaymissions/signpost.dm
@@ -5,11 +5,12 @@
anchored = TRUE
density = TRUE
var/question = "Travel back?"
- var/zlevels = list(ZLEVEL_STATION)
+ var/list/zlevels = list()
/obj/structure/signpost/New()
. = ..()
set_light(2)
+ zlevels = GLOB.station_z_levels
/obj/structure/signpost/attackby(obj/item/W, mob/user, params)
return attack_hand(user)
diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index 161fcd8c16..545b72a1bc 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -40,7 +40,7 @@
for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in GLOB.machines)
if(QDELETED(temp_vent))
continue
- if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded)
+ if((temp_vent.loc.z in GLOB.station_z_levels) && !temp_vent.welded)
var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
//Stops Aliens getting stuck in small networks.
//See: Security, Virology
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index d655337ba6..461ffecd3f 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -27,7 +27,7 @@
/datum/round_event/brand_intelligence/start()
for(var/obj/machinery/vending/V in GLOB.machines)
- if(V.z != ZLEVEL_STATION)
+ if(!(V.z in GLOB.station_z_levels))
continue
vendingMachines.Add(V)
if(!vendingMachines.len)
diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
index dbac242321..a3ce69e0bd 100644
--- a/code/modules/events/disease_outbreak.dm
+++ b/code/modules/events/disease_outbreak.dm
@@ -25,7 +25,7 @@
var/turf/T = get_turf(H)
if(!T)
continue
- if(T.z != ZLEVEL_STATION)
+ if(!(T.z in GLOB.station_z_levels))
continue
if(!H.client)
continue
diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm
index c6ba4d1bd0..f1af035a29 100644
--- a/code/modules/events/grid_check.dm
+++ b/code/modules/events/grid_check.dm
@@ -15,5 +15,5 @@
/datum/round_event/grid_check/start()
for(var/P in GLOB.apcs_list)
var/obj/machinery/power/apc/C = P
- if(C.cell && C.z == ZLEVEL_STATION)
+ if(C.cell && (C.z in GLOB.station_z_levels))
C.energy_fail(rand(30,120))
\ No newline at end of file
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index ae58ece0bb..c5a9c1a142 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -25,7 +25,7 @@
/datum/round_event/presents/start()
for(var/obj/structure/flora/tree/pine/xmas in world)
- if(xmas.z != ZLEVEL_STATION)
+ if(!(xmas.z in GLOB.station_z_levels))
continue
for(var/turf/open/floor/T in orange(1,xmas))
for(var/i=1,i<=rand(1,5),i++)
diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm
index f3a21445d3..4cd718070b 100644
--- a/code/modules/events/immovable_rod.dm
+++ b/code/modules/events/immovable_rod.dm
@@ -1,102 +1,102 @@
-/*
-Immovable rod random event.
-The rod will spawn at some location outside the station, and travel in a straight line to the opposite side of the station
-Everything solid in the way will be ex_act()'d
-In my current plan for it, 'solid' will be defined as anything with density == 1
-
---NEOFite
-*/
-
-/datum/round_event_control/immovable_rod
- name = "Immovable Rod"
- typepath = /datum/round_event/immovable_rod
- min_players = 15
- max_occurrences = 5
-
-/datum/round_event/immovable_rod
- announceWhen = 5
-
-/datum/round_event/immovable_rod/announce()
- priority_announce("What the fuck was that?!", "General Alert")
-
-/datum/round_event/immovable_rod/start()
+/*
+Immovable rod random event.
+The rod will spawn at some location outside the station, and travel in a straight line to the opposite side of the station
+Everything solid in the way will be ex_act()'d
+In my current plan for it, 'solid' will be defined as anything with density == 1
+
+--NEOFite
+*/
+
+/datum/round_event_control/immovable_rod
+ name = "Immovable Rod"
+ typepath = /datum/round_event/immovable_rod
+ min_players = 15
+ max_occurrences = 5
+
+/datum/round_event/immovable_rod
+ announceWhen = 5
+
+/datum/round_event/immovable_rod/announce()
+ priority_announce("What the fuck was that?!", "General Alert")
+
+/datum/round_event/immovable_rod/start()
var/startside = pick(GLOB.cardinals)
- var/turf/startT = spaceDebrisStartLoc(startside, ZLEVEL_STATION)
- var/turf/endT = spaceDebrisFinishLoc(startside, ZLEVEL_STATION)
- new /obj/effect/immovablerod(startT, endT)
-
-/obj/effect/immovablerod
- name = "immovable rod"
- desc = "What the fuck is that?"
- icon = 'icons/obj/objects.dmi'
- icon_state = "immrod"
- throwforce = 100
+ var/turf/startT = spaceDebrisStartLoc(startside, ZLEVEL_STATION_PRIMARY)
+ var/turf/endT = spaceDebrisFinishLoc(startside, ZLEVEL_STATION_PRIMARY)
+ new /obj/effect/immovablerod(startT, endT)
+
+/obj/effect/immovablerod
+ name = "immovable rod"
+ desc = "What the fuck is that?"
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "immrod"
+ throwforce = 100
density = TRUE
anchored = TRUE
- var/z_original = 0
- var/destination
- var/notify = TRUE
-
-/obj/effect/immovablerod/New(atom/start, atom/end)
- ..()
+ var/z_original = 0
+ var/destination
+ var/notify = TRUE
+
+/obj/effect/immovablerod/New(atom/start, atom/end)
+ ..()
SSaugury.register_doom(src, 2000)
- z_original = z
- destination = end
- if(notify)
- notify_ghosts("\A [src] is inbound!",
- enter_link="(Click to orbit)",
- source=src, action=NOTIFY_ORBIT)
- GLOB.poi_list += src
- if(end && end.z==z_original)
- walk_towards(src, destination, 1)
-
-/obj/effect/immovablerod/Topic(href, href_list)
- if(href_list["orbit"])
- var/mob/dead/observer/ghost = usr
- if(istype(ghost))
- ghost.ManualFollow(src)
-
-/obj/effect/immovablerod/Destroy()
- GLOB.poi_list -= src
- . = ..()
-
-/obj/effect/immovablerod/Move()
- if((z != z_original) || (loc == destination))
- qdel(src)
- return ..()
-
-/obj/effect/immovablerod/ex_act(severity, target)
- return 0
-
+ z_original = z
+ destination = end
+ if(notify)
+ notify_ghosts("\A [src] is inbound!",
+ enter_link="(Click to orbit)",
+ source=src, action=NOTIFY_ORBIT)
+ GLOB.poi_list += src
+ if(end && end.z==z_original)
+ walk_towards(src, destination, 1)
+
+/obj/effect/immovablerod/Topic(href, href_list)
+ if(href_list["orbit"])
+ var/mob/dead/observer/ghost = usr
+ if(istype(ghost))
+ ghost.ManualFollow(src)
+
+/obj/effect/immovablerod/Destroy()
+ GLOB.poi_list -= src
+ . = ..()
+
+/obj/effect/immovablerod/Move()
+ if((z != z_original) || (loc == destination))
+ qdel(src)
+ return ..()
+
+/obj/effect/immovablerod/ex_act(severity, target)
+ return 0
+
/obj/effect/immovablerod/Collide(atom/clong)
- if(prob(10))
- playsound(src, 'sound/effects/bang.ogg', 50, 1)
- audible_message("You hear a CLANG!")
-
- if(clong && prob(25))
- x = clong.x
- y = clong.y
-
- if(isturf(clong) || isobj(clong))
- if(clong.density)
+ if(prob(10))
+ playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ audible_message("You hear a CLANG!")
+
+ if(clong && prob(25))
+ x = clong.x
+ y = clong.y
+
+ if(isturf(clong) || isobj(clong))
+ if(clong.density)
clong.ex_act(EXPLODE_HEAVY)
-
- else if(isliving(clong))
- penetrate(clong)
- else if(istype(clong, type))
- var/obj/effect/immovablerod/other = clong
- visible_message("[src] collides with [other]!\
- ")
- var/datum/effect_system/smoke_spread/smoke = new
- smoke.set_up(2, get_turf(src))
- smoke.start()
- qdel(src)
- qdel(other)
-
-/obj/effect/immovablerod/proc/penetrate(mob/living/L)
- L.visible_message("[L] is penetrated by an immovable rod!" , "The rod penetrates you!" , "You hear a CLANG!")
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- H.adjustBruteLoss(160)
- if(L && (L.density || prob(10)))
+
+ else if(isliving(clong))
+ penetrate(clong)
+ else if(istype(clong, type))
+ var/obj/effect/immovablerod/other = clong
+ visible_message("[src] collides with [other]!\
+ ")
+ var/datum/effect_system/smoke_spread/smoke = new
+ smoke.set_up(2, get_turf(src))
+ smoke.start()
+ qdel(src)
+ qdel(other)
+
+/obj/effect/immovablerod/proc/penetrate(mob/living/L)
+ L.visible_message("[L] is penetrated by an immovable rod!" , "The rod penetrates you!" , "You hear a CLANG!")
+ if(ishuman(L))
+ var/mob/living/carbon/human/H = L
+ H.adjustBruteLoss(160)
+ if(L && (L.density || prob(10)))
L.ex_act(EXPLODE_HEAVY)
diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm
index 9658d8b144..552179343c 100644
--- a/code/modules/events/portal_storm.dm
+++ b/code/modules/events/portal_storm.dm
@@ -40,7 +40,7 @@
storm = storm = mutable_appearance('icons/obj/tesla_engine/energy_ball.dmi', "energy_ball_fast", FLY_LAYER)
storm.color = "#00FF00"
- station_areas = get_areas_in_z(ZLEVEL_STATION)
+ station_areas = get_areas_in_z(ZLEVEL_STATION_PRIMARY)
number_of_bosses = 0
for(var/boss in boss_types)
diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm
index e4f2b6b1a7..b1b6195f51 100644
--- a/code/modules/events/radiation_storm.dm
+++ b/code/modules/events/radiation_storm.dm
@@ -1,20 +1,19 @@
-/datum/round_event_control/radiation_storm
- name = "Radiation Storm"
- typepath = /datum/round_event/radiation_storm
- max_occurrences = 1
-
-/datum/round_event/radiation_storm
-
-
-/datum/round_event/radiation_storm/setup()
- startWhen = 3
- endWhen = startWhen + 1
- announceWhen = 1
-
-/datum/round_event/radiation_storm/announce()
- priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
- //sound not longer matches the text, but an audible warning is probably good
-
-/datum/round_event/radiation_storm/start()
- SSweather.run_weather("radiation storm",ZLEVEL_STATION)
- make_maint_all_access()
+/datum/round_event_control/radiation_storm
+ name = "Radiation Storm"
+ typepath = /datum/round_event/radiation_storm
+ max_occurrences = 1
+
+/datum/round_event/radiation_storm
+
+
+/datum/round_event/radiation_storm/setup()
+ startWhen = 3
+ endWhen = startWhen + 1
+ announceWhen = 1
+
+/datum/round_event/radiation_storm/announce()
+ priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
+ //sound not longer matches the text, but an audible warning is probably good
+
+/datum/round_event/radiation_storm/start()
+ SSweather.run_weather("radiation storm",ZLEVEL_STATION_PRIMARY)
diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm
index a425c540b3..253ef6a639 100644
--- a/code/modules/events/sentience.dm
+++ b/code/modules/events/sentience.dm
@@ -31,7 +31,7 @@
var/list/potential = list()
for(var/mob/living/simple_animal/L in GLOB.living_mob_list)
var/turf/T = get_turf(L)
- if(T.z != ZLEVEL_STATION)
+ if(!(T.z in GLOB.station_z_levels))
continue
if(!(L in GLOB.player_list) && !L.mind)
potential += L
diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm
index a3296ebab6..0a4b07a9cb 100644
--- a/code/modules/events/spider_infestation.dm
+++ b/code/modules/events/spider_infestation.dm
@@ -1,37 +1,37 @@
-/datum/round_event_control/spider_infestation
- name = "Spider Infestation"
- typepath = /datum/round_event/spider_infestation
- weight = 5
- max_occurrences = 1
- min_players = 15
-
-/datum/round_event/spider_infestation
- announceWhen = 400
-
- var/spawncount = 1
-
-
-/datum/round_event/spider_infestation/setup()
- announceWhen = rand(announceWhen, announceWhen + 50)
- spawncount = rand(5, 8)
-
-/datum/round_event/spider_infestation/announce()
- priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", 'sound/ai/aliens.ogg')
-
-
-/datum/round_event/spider_infestation/start()
- var/list/vents = list()
- for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in world)
- if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded)
- var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
- if(temp_vent_parent.other_atmosmch.len > 20)
- vents += temp_vent
-
- while((spawncount >= 1) && vents.len)
- var/obj/vent = pick(vents)
- var/spawn_type = /obj/structure/spider/spiderling
- if(prob(66))
- spawn_type = /obj/structure/spider/spiderling/nurse
- spawn_atom_to_turf(spawn_type, vent, 1, FALSE)
- vents -= vent
- spawncount--
+/datum/round_event_control/spider_infestation
+ name = "Spider Infestation"
+ typepath = /datum/round_event/spider_infestation
+ weight = 5
+ max_occurrences = 1
+ min_players = 15
+
+/datum/round_event/spider_infestation
+ announceWhen = 400
+
+ var/spawncount = 1
+
+
+/datum/round_event/spider_infestation/setup()
+ announceWhen = rand(announceWhen, announceWhen + 50)
+ spawncount = rand(5, 8)
+
+/datum/round_event/spider_infestation/announce()
+ priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", 'sound/ai/aliens.ogg')
+
+
+/datum/round_event/spider_infestation/start()
+ var/list/vents = list()
+ for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in world)
+ if((temp_vent.loc.z in GLOB.station_z_levels) && !temp_vent.welded)
+ var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
+ if(temp_vent_parent.other_atmosmch.len > 20)
+ vents += temp_vent
+
+ while((spawncount >= 1) && vents.len)
+ var/obj/vent = pick(vents)
+ var/spawn_type = /obj/structure/spider/spiderling
+ if(prob(66))
+ spawn_type = /obj/structure/spider/spiderling/nurse
+ spawn_atom_to_turf(spawn_type, vent, 1, FALSE)
+ vents -= vent
+ spawncount--
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 2039e58caa..f94d521e8d 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -1,49 +1,49 @@
-/datum/round_event_control/vent_clog
- name = "Clogged Vents"
- typepath = /datum/round_event/vent_clog
- weight = 35
-
-/datum/round_event/vent_clog
- announceWhen = 1
- startWhen = 5
- endWhen = 35
- var/interval = 2
- var/list/vents = list()
- var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","mushroomhallucinogen","lube",
- "plantbgone","banana","charcoal","space_drugs","morphine","holywater","ethanol","hot_coco","sacid")
-
-/datum/round_event/vent_clog/announce()
- priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert")
-
-
-/datum/round_event/vent_clog/setup()
- endWhen = rand(25, 100)
- for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines)
- if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded)
- var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
- if(temp_vent_parent.other_atmosmch.len > 20)
- vents += temp_vent
- if(!vents.len)
- return kill()
-
-/datum/round_event/vent_clog/tick()
- if(activeFor % interval == 0)
- var/obj/machinery/atmospherics/components/unary/vent = pick_n_take(vents)
- while(vent && vent.welded)
- vent = pick_n_take(vents)
-
- if(vent && vent.loc)
- var/datum/reagents/R = new/datum/reagents(50)
- R.my_atom = vent
- R.add_reagent(pick(gunk), 50)
-
- var/datum/effect_system/smoke_spread/chem/smoke = new
- smoke.set_up(R, 1, vent, silent = 1)
- playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
- smoke.start()
- qdel(R)
-
- var/cockroaches = prob(33) ? 3 : 0
- while(cockroaches)
- new /mob/living/simple_animal/cockroach(get_turf(vent))
- cockroaches--
+/datum/round_event_control/vent_clog
+ name = "Clogged Vents"
+ typepath = /datum/round_event/vent_clog
+ weight = 35
+
+/datum/round_event/vent_clog
+ announceWhen = 1
+ startWhen = 5
+ endWhen = 35
+ var/interval = 2
+ var/list/vents = list()
+ var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","mushroomhallucinogen","lube",
+ "plantbgone","banana","charcoal","space_drugs","morphine","holywater","ethanol","hot_coco","sacid")
+
+/datum/round_event/vent_clog/announce()
+ priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert")
+
+
+/datum/round_event/vent_clog/setup()
+ endWhen = rand(25, 100)
+ for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines)
+ if((temp_vent.loc.z in GLOB.station_z_levels) && !temp_vent.welded)
+ var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
+ if(temp_vent_parent.other_atmosmch.len > 20)
+ vents += temp_vent
+ if(!vents.len)
+ return kill()
+
+/datum/round_event/vent_clog/tick()
+ if(activeFor % interval == 0)
+ var/obj/machinery/atmospherics/components/unary/vent = pick_n_take(vents)
+ while(vent && vent.welded)
+ vent = pick_n_take(vents)
+
+ if(vent && vent.loc)
+ var/datum/reagents/R = new/datum/reagents(50)
+ R.my_atom = vent
+ R.add_reagent(pick(gunk), 50)
+
+ var/datum/effect_system/smoke_spread/chem/smoke = new
+ smoke.set_up(R, 1, vent, silent = 1)
+ playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
+ smoke.start()
+ qdel(R)
+
+ var/cockroaches = prob(33) ? 3 : 0
+ while(cockroaches)
+ new /mob/living/simple_animal/cockroach(get_turf(vent))
+ cockroaches--
diff --git a/code/modules/events/wizard/advanced_darkness.dm b/code/modules/events/wizard/advanced_darkness.dm
index e6d20ad70d..0f68bb936e 100644
--- a/code/modules/events/wizard/advanced_darkness.dm
+++ b/code/modules/events/wizard/advanced_darkness.dm
@@ -13,4 +13,4 @@
/datum/round_event/wizard/darkness/start()
if(!started)
started = TRUE
- SSweather.run_weather("advanced darkness", ZLEVEL_STATION)
+ SSweather.run_weather("advanced darkness", ZLEVEL_STATION_PRIMARY)
diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm
index 1dba06f239..f5b6ae1cc1 100644
--- a/code/modules/events/wizard/curseditems.dm
+++ b/code/modules/events/wizard/curseditems.dm
@@ -38,7 +38,7 @@
ruins_wizard_loadout = 1
for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
- if(ruins_spaceworthiness && (H.z != ZLEVEL_STATION || isspaceturf(H.loc) || isplasmaman(H)))
+ if(ruins_spaceworthiness && !(H.z in GLOB.station_z_levels) || isspaceturf(H.loc) || isplasmaman(H))
continue //#savetheminers
if(ruins_wizard_loadout && H.mind && ((H.mind in SSticker.mode.wizards) || (H.mind in SSticker.mode.apprentices)))
continue
diff --git a/code/modules/events/wizard/lava.dm b/code/modules/events/wizard/lava.dm
index 190752cc68..a4426ce928 100644
--- a/code/modules/events/wizard/lava.dm
+++ b/code/modules/events/wizard/lava.dm
@@ -12,4 +12,4 @@
/datum/round_event/wizard/lava/start()
if(!started)
started = TRUE
- SSweather.run_weather("the floor is lava", ZLEVEL_STATION)
+ SSweather.run_weather("the floor is lava", ZLEVEL_STATION_PRIMARY)
diff --git a/code/modules/events/wizard/petsplosion.dm b/code/modules/events/wizard/petsplosion.dm
index 05582043b9..5654cbfe04 100644
--- a/code/modules/events/wizard/petsplosion.dm
+++ b/code/modules/events/wizard/petsplosion.dm
@@ -8,7 +8,7 @@
/datum/round_event_control/wizard/petsplosion/preRunEvent()
for(var/mob/living/simple_animal/F in GLOB.living_mob_list)
- if(!ishostile(F) && F.z == ZLEVEL_STATION)
+ if(!ishostile(F) && (F.z in GLOB.station_z_levels))
mobs_to_dupe++
if(mobs_to_dupe > 100 || !mobs_to_dupe)
return EVENT_CANT_RUN
@@ -24,7 +24,7 @@
if(activeFor >= 30 * countdown) // 0 seconds : 2 animals | 30 seconds : 4 animals | 1 minute : 8 animals
countdown += 1
for(var/mob/living/simple_animal/F in GLOB.living_mob_list) //If you cull the heard before the next replication, things will be easier for you
- if(!ishostile(F) && F.z == ZLEVEL_STATION)
+ if(!ishostile(F) && (F.z in GLOB.station_z_levels))
new F.type(F.loc)
mobs_duped++
if(mobs_duped > 400)
diff --git a/code/modules/events/wizard/shuffle.dm b/code/modules/events/wizard/shuffle.dm
index e04cb2da2b..568a8fbc72 100644
--- a/code/modules/events/wizard/shuffle.dm
+++ b/code/modules/events/wizard/shuffle.dm
@@ -13,7 +13,7 @@
var/list/mobs = list()
for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
- if(H.z != ZLEVEL_STATION)
+ if(!(H.z in GLOB.station_z_levels))
continue //lets not try to strand people in space or stuck in the wizards den
moblocs += H.loc
mobs += H
diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm
index 167eb77cfc..6404307d34 100644
--- a/code/modules/events/wormholes.dm
+++ b/code/modules/events/wormholes.dm
@@ -21,7 +21,7 @@
/datum/round_event/wormholes/start()
for(var/turf/open/floor/T in world)
- if(T.z == ZLEVEL_STATION)
+ if(T.z in GLOB.station_z_levels)
pick_turfs += T
for(var/i = 1, i <= number_of_wormholes, i++)
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index 76401da535..2abbab0f29 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -53,7 +53,7 @@
/obj/item/reagent_containers/food/snacks/grown/citrus/orange
seed = /obj/item/seeds/orange
name = "orange"
- desc = "It's an tangy fruit."
+ desc = "It's a tangy fruit."
icon_state = "orange"
filling_color = "#FFA500"
diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index fbe5a1fb30..cd6104607f 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -37,7 +37,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
var/list/options = params2list(possible_destinations)
var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
- var/dat = "[z == ZLEVEL_STATION ? "Docking clamps engaged. Standing by." : "Mining Shuttle Uplink: [M ? M.getStatusText() : "*OFFLINE*"]"]
"
+ var/dat = "[(z in GLOB.station_z_levels) ? "Docking clamps engaged. Standing by." : "Mining Shuttle Uplink: [M ? M.getStatusText() : "*OFFLINE*"]"]
"
if(M)
var/destination_found
for(var/obj/docking_port/stationary/S in SSshuttle.stationary)
@@ -47,7 +47,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
continue
destination_found = 1
dat += "Send to [S.name]
"
- if(!destination_found && z == ZLEVEL_STATION) //Only available if miners are lazy and did not set an LZ using the remote.
+ if(!destination_found && (z in GLOB.station_z_levels)) //Only available if miners are lazy and did not set an LZ using the remote.
dat += "Prepare for blind drop? (Dangerous)
"
if(LAZYLEN(turrets))
dat += "
Perimeter Defense System: Enable All / Disable All
\
@@ -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 != ZLEVEL_STATION && shuttleId == "colony_drop")
+ if(!(z in GLOB.station_z_levels) && shuttleId == "colony_drop")
to_chat(usr, "You can't move the base again!")
return
var/shuttle_error = SSshuttle.moveShuttle(shuttleId, href_list["move"], 1)
@@ -200,7 +200,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
var/obj/machinery/computer/auxillary_base/AB
for (var/obj/machinery/computer/auxillary_base/A in GLOB.machines)
- if(A.z == ZLEVEL_STATION)
+ if(A.z in GLOB.station_z_levels)
AB = A
break
if(!AB)
@@ -345,4 +345,4 @@ obj/docking_port/stationary/public_mining_dock
#undef BAD_ZLEVEL
#undef BAD_AREA
#undef BAD_COORDS
-#undef ZONE_SET
\ No newline at end of file
+#undef ZONE_SET
diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm
index 56b7fe3175..1b245c209f 100644
--- a/code/modules/mining/aux_base_camera.dm
+++ b/code/modules/mining/aux_base_camera.dm
@@ -151,8 +151,7 @@
to_chat(owner, "You can only build within the mining base!")
return FALSE
-
- if(build_target.z != ZLEVEL_STATION)
+ if(!(build_target.z in GLOB.station_z_levels))
to_chat(owner, "The mining base has launched and can no longer be modified.")
return FALSE
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 00fdbfb561..e0197cc4e3 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -41,7 +41,7 @@
for(var/obj/item/device/radio/beacon/B in GLOB.teleportbeacons)
var/turf/T = get_turf(B)
- if(T.z == ZLEVEL_STATION)
+ if(T.z in GLOB.station_z_levels)
destinations += B
return destinations
@@ -93,7 +93,7 @@
/obj/effect/portal/wormhole/jaunt_tunnel/teleport(atom/movable/M)
if(!ismob(M) && !isobj(M)) //No don't teleport lighting and effects!
return
-
+
if(M.anchored && (!ismob(M) || (istype(M, /obj/mecha) && !mech_sized)))
return
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 9726022afc..abead3ab9a 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -102,7 +102,7 @@
smelt_ore(ore)
/obj/machinery/mineral/ore_redemption/proc/send_console_message()
- if(z != ZLEVEL_STATION)
+ if(!(z in GLOB.station_z_levels))
return
message_sent = TRUE
var/area/A = get_area(src)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 71010d252e..15d05d37fe 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -69,7 +69,7 @@
var/global/list/dumb_rev_heads = list()
/obj/machinery/computer/shuttle/mining/attack_hand(mob/user)
- if(user.z == ZLEVEL_STATION && user.mind && (user.mind in SSticker.mode.head_revolutionaries) && !(user.mind in dumb_rev_heads))
+ if((user.z in GLOB.station_z_levels) && user.mind && (user.mind in SSticker.mode.head_revolutionaries) && !(user.mind in dumb_rev_heads))
to_chat(user, "You get a feeling that leaving the station might be a REALLY dumb idea...")
dumb_rev_heads += user.mind
return
diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm
index ec5a034f19..1eb1379dce 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -500,6 +500,10 @@
name = "Sidecut"
icon_state = "hair_sidecut"
+/datum/sprite_accessory/hair/largebun
+ name = "Large Bun"
+ icon_state = "hair_largebun"
+
/////////////////////////////
// Facial Hair Definitions //
/////////////////////////////
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index a17e73c7bb..0cbcfc1443 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -106,7 +106,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
if(turfs.len)
T = pick(turfs)
else
- T = locate(round(world.maxx/2), round(world.maxy/2), ZLEVEL_STATION) //middle of the station
+ T = locate(round(world.maxx/2), round(world.maxy/2), ZLEVEL_STATION_PRIMARY) //middle of the station
loc = T
@@ -819,8 +819,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
GLOB.observer_default_invisibility = amount
/mob/dead/observer/proc/open_spawners_menu()
- set name = "Mob spawners menu"
- set desc = "See all currently available ghost spawners"
+ set name = "Spawners Menu"
+ set desc = "See all currently available spawners"
set category = "Ghost"
if(!spawners_menu)
spawners_menu = new(src)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 9d8d2b704b..e2a257e0ce 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -422,7 +422,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(drunkenness >= 91)
adjustBrainLoss(0.4)
if(prob(20) && !stat)
- if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && z == ZLEVEL_STATION) //QoL mainly
+ if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && (z in GLOB.station_z_levels)) //QoL mainly
to_chat(src, "You're so tired... but you can't miss that shuttle...")
else
to_chat(src, "Just a quick nap...")
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 91fe96ca86..d8a2985594 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -129,7 +129,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
update_health_hud() //we need to update all of our health displays to match our summoner and we can't practically give the summoner a hook to do it
med_hud_set_health()
med_hud_set_status()
- if(summoner)
+ if(!QDELETED(summoner))
if(summoner.stat == DEAD)
forceMove(summoner.loc)
to_chat(src, "Your summoner has died!")
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index a63e4cf89f..815b20c0c5 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -114,7 +114,7 @@ Difficulty: Medium
if(L.stat == DEAD)
visible_message("[src] butchers [L]!",
"You butcher [L], restoring your health!")
- if(z != ZLEVEL_STATION && !client) //NPC monsters won't heal while on station
+ if(!(z in GLOB.station_z_levels && !client)) //NPC monsters won't heal while on station
if(guidance)
adjustHealth(-L.maxHealth)
else
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 02ca4a4e26..c4618db620 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -101,7 +101,7 @@
visible_message(
"[src] devours [L]!",
"You feast on [L], restoring your health!")
- if(z != ZLEVEL_STATION && !client) //NPC monsters won't heal while on station
+ if(!(z in GLOB.station_z_levels && !client)) //NPC monsters won't heal while on station
adjustBruteLoss(-L.maxHealth/2)
L.gib()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index 12388807ba..de995f951a 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -146,8 +146,9 @@
/obj/effect/temp_visual/goliath_tentacle/Initialize(mapload, mob/living/new_spawner)
. = ..()
- if(locate(/obj/effect/temp_visual/goliath_tentacle) in loc)
- return INITIALIZE_HINT_QDEL
+ for(var/obj/effect/temp_visual/goliath_tentacle/T in loc)
+ if(T != src)
+ return INITIALIZE_HINT_QDEL
if(!QDELETED(new_spawner))
spawner = new_spawner
if(ismineralturf(loc))
diff --git a/code/modules/modular_computers/file_system/programs/alarm.dm b/code/modules/modular_computers/file_system/programs/alarm.dm
index fc050545a5..616fd15dd3 100644
--- a/code/modules/modular_computers/file_system/programs/alarm.dm
+++ b/code/modules/modular_computers/file_system/programs/alarm.dm
@@ -13,7 +13,7 @@
var/has_alert = 0
var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list())
- var/alarm_z = list(ZLEVEL_STATION,ZLEVEL_LAVALAND)
+ var/alarm_z = list(ZLEVEL_STATION_PRIMARY,ZLEVEL_LAVALAND)
/datum/computer_file/program/alarm_monitor/process_tick()
..()
diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm
index b334f523f7..37b2b0c151 100644
--- a/code/modules/modular_computers/file_system/programs/powermonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm
@@ -58,8 +58,8 @@
data["interval"] = record_interval / 10
data["attached"] = attached ? TRUE : FALSE
if(attached)
- data["supply"] = attached.powernet.viewavail
- data["demand"] = attached.powernet.viewload
+ data["supply"] = DisplayPower(attached.powernet.viewavail)
+ data["demand"] = DisplayPower(attached.powernet.viewload)
data["history"] = history
data["areas"] = list()
@@ -70,7 +70,7 @@
data["areas"] += list(list(
"name" = A.area.name,
"charge" = A.cell ? A.cell.percent() : 0,
- "load" = A.lastused_total,
+ "load" = DisplayPower(A.lastused_total),
"charging" = A.charging,
"eqp" = A.equipment,
"lgt" = A.lighting,
diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
index c12c83aaed..4a0532104a 100644
--- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
@@ -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 == 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/))
continue
supermatters.Add(S)
diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm
index 24c1580ea2..8ed67d761b 100644
--- a/code/modules/modular_computers/hardware/network_card.dm
+++ b/code/modules/modular_computers/hardware/network_card.dm
@@ -48,7 +48,7 @@
if(holder)
var/turf/T = get_turf(holder)
- if((T && istype(T)) && (T.z == ZLEVEL_STATION || T.z == ZLEVEL_MINING))
+ if((T && istype(T)) && ((T.z in GLOB.station_z_levels) || T.z == ZLEVEL_MINING))
// Computer is on station. Low/High signal depending on what type of network card you have
if(long_range)
return 2
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 85ae6edf14..7863f6a52f 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -306,7 +306,7 @@
dat += "Cores: [linked_cores.len]
"
dat += "-Current Efficiency: [reported_core_efficiency]
"
dat += "-Average Stability: [stored_core_stability] (update)
"
- dat += "Last Produced: [stored_power]
"
+ dat += "Last Produced: [DisplayPower(stored_power)]
"
dat += "Fuel: "
if(!fueljar)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index b0212e6155..1545bfd452 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -55,7 +55,7 @@
var/areastring = null
var/obj/item/stock_parts/cell/cell
var/start_charge = 90 // initial cell charge %
- var/cell_type = 2500 // 0=no cell, 1=regular, 2=high-cap (x5) <- old, now it's just 0=no cell, otherwise dictate cellcapacity by changing this value. 1 used to be 1000, 2 was 2500
+ var/cell_type = /obj/item/stock_parts/cell/upgraded //Base cell has 2500 capacity. Enter the path of a different cell you want to use. cell determines charge rates, max capacity, ect. These can also be changed with other APC vars, but isn't recommended to minimize the risk of accidental usage of dirty editted APCs
var/opened = 0 //0=closed, 1=opened, 2=cover removed
var/shorted = 0
var/lighting = 3
@@ -92,6 +92,15 @@
var/update_overlay = -1
var/icon_update_needed = FALSE
+/obj/machinery/power/apc/highcap/five_k
+ cell_type = /obj/item/stock_parts/cell/upgraded/plus
+
+/obj/machinery/power/apc/highcap/ten_k
+ cell_type = /obj/item/stock_parts/cell/high
+
+/obj/machinery/power/apc/highcap/fifteen_k
+ cell_type = /obj/item/stock_parts/cell/high/plus
+
/obj/machinery/power/apc/get_cell()
return cell
@@ -177,8 +186,7 @@
has_electronics = 2 //installed and secured
// is starting with a power cell installed, create it and set its charge level
if(cell_type)
- src.cell = new/obj/item/stock_parts/cell(src)
- cell.maxcharge = cell_type // cell_type is maximum charge (old default was 1000 or 2500 (values one and two respectively)
+ cell = new cell_type
cell.charge = start_charge * cell.maxcharge / 100 // (convert percentage to actual value)
var/area/A = src.loc.loc
@@ -665,7 +673,7 @@
"powerCellStatus" = cell ? cell.percent() : null,
"chargeMode" = chargemode,
"chargingStatus" = charging,
- "totalLoad" = lastused_total,
+ "totalLoad" = DisplayPower(lastused_total),
"coverLocked" = coverlocked,
"siliconUser" = user.has_unlimited_silicon_privilege || user.using_power_flow_console(),
"malfStatus" = get_malf_status(user),
@@ -673,7 +681,7 @@
"powerChannels" = list(
list(
"title" = "Equipment",
- "powerLoad" = lastused_equip,
+ "powerLoad" = DisplayPower(lastused_equip),
"status" = equipment,
"topicParams" = list(
"auto" = list("eqp" = 3),
@@ -683,7 +691,7 @@
),
list(
"title" = "Lighting",
- "powerLoad" = lastused_light,
+ "powerLoad" = DisplayPower(lastused_light),
"status" = lighting,
"topicParams" = list(
"auto" = list("lgt" = 3),
@@ -693,7 +701,7 @@
),
list(
"title" = "Environment",
- "powerLoad" = lastused_environ,
+ "powerLoad" = DisplayPower(lastused_environ),
"status" = environ,
"topicParams" = list(
"auto" = list("env" = 3),
@@ -840,7 +848,7 @@
if(!malf.can_shunt)
to_chat(malf, "You cannot shunt!")
return
- if(src.z != ZLEVEL_STATION)
+ if(!(src.z in GLOB.station_z_levels))
return
occupier = new /mob/living/silicon/ai(src, malf.laws, malf) //DEAR GOD WHY? //IKR????
occupier.adjustOxyLoss(malf.getOxyLoss())
diff --git a/code/modules/power/apc.dm.rej b/code/modules/power/apc.dm.rej
deleted file mode 100644
index 9e432f503c..0000000000
--- a/code/modules/power/apc.dm.rej
+++ /dev/null
@@ -1,13 +0,0 @@
-diff a/code/modules/power/apc.dm b/code/modules/power/apc.dm (rejected hunks)
-@@ -867,9 +867,9 @@
- occupier.loc = src.loc
- occupier.death()
- occupier.gib()
-- for(var/obj/item/weapon/pinpointer/P in GLOB.pinpointer_list)
-+ for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
- P.switch_mode_to(TRACK_NUKE_DISK) //Pinpointers go back to tracking the nuke disk
-- P.nuke_warning = FALSE
-+ P.alert = FALSE
-
- /obj/machinery/power/apc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
- if(card.AI)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index a24c0d7c57..37ec831462 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -143,7 +143,7 @@ By design, d1 is the smallest direction and d2 is the highest
else if(istype(W, /obj/item/device/multitool))
if(powernet && (powernet.avail > 0)) // is it powered?
- to_chat(user, "[powernet.avail]W in power network.")
+ to_chat(user, "[DisplayPower(powernet.avail)] in power network.")
else
to_chat(user, "The cable is not powered.")
shock(user, 5, 0.2)
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 34635084dd..16e2ae92f2 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -348,4 +348,4 @@
return
/obj/item/stock_parts/cell/beam_rifle/emp_act(severity)
- charge = Clamp((charge-(10000/severity)),0,maxcharge)
+ charge = Clamp((charge-(10000/severity)),0,maxcharge)
\ No newline at end of file
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index 1e43380f2f..b5eef4260e 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -55,7 +55,7 @@
stat |= BROKEN
update_icon()
-
+
/obj/machinery/power/generator/Destroy()
SSair.atmos_machinery -= src
return ..()
@@ -126,7 +126,7 @@
if(cold_air)
var/datum/gas_mixture/cold_circ_air1 = cold_circ.AIR1
cold_circ_air1.merge(cold_air)
-
+
update_icon()
var/circ = "[cold_circ && cold_circ.last_pressure_delta > 0 ? "1" : "0"][hot_circ && hot_circ.last_pressure_delta > 0 ? "1" : "0"]"
@@ -135,7 +135,7 @@
update_icon()
src.updateDialog()
-
+
/obj/machinery/power/generator/process()
//Setting this number higher just makes the change in power output slower, it doesnt actualy reduce power output cause **math**
var/power_output = round(lastgen / 10)
@@ -161,15 +161,9 @@
var/datum/gas_mixture/hot_circ_air2 = hot_circ.AIR2
t += ""
-
- var/displaygen = lastgenlev
- if(displaygen < 1000000) //less than a MW
- displaygen /= 1000
- t += "Output: [round(displaygen,0.01)] kW"
- else
- displaygen /= 1000000
- t += "Output: [round(displaygen,0.01)] MW"
-
+
+ t += "Output: [DisplayPower(lastgenlev)]"
+
t += "
"
t += "
Cold loop"
diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm
index 85a85113f6..a3edc99951 100644
--- a/code/modules/power/monitor.dm
+++ b/code/modules/power/monitor.dm
@@ -66,8 +66,8 @@
data["areas"] = list()
if(attached)
- data["supply"] = attached.powernet.viewavail
- data["demand"] = attached.powernet.viewload
+ data["supply"] = DisplayPower(attached.powernet.viewavail)
+ data["demand"] = DisplayPower(attached.powernet.viewload)
for(var/obj/machinery/power/terminal/term in attached.powernet.nodes)
var/obj/machinery/power/apc/A = term.master
if(istype(A))
@@ -79,7 +79,7 @@
data["areas"] += list(list(
"name" = A.area.name,
"charge" = cell_charge,
- "load" = A.lastused_total,
+ "load" = DisplayPower(A.lastused_total),
"charging" = A.charging,
"eqp" = A.equipment,
"lgt" = A.lighting,
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 630d248f25..0f4a58e5ef 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -230,7 +230,7 @@
var/stack_percent = round(sheet_left * 100, 1)
dat += text("Current stack: [stack_percent]%
")
dat += text("Power output:
- [power_gen * power_output]
+")
- dat += text("Power current: [(powernet == null ? "Unconnected" : "[avail()]")]
")
+ dat += text("Power current: [(powernet == null ? "Unconnected" : "[DisplayPower(avail())]")]
")
dat += text("Heat: [current_heat]
")
dat += "
Close"
user << browse(dat, "window=port_gen")
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index df969d869e..381dcbaa75 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -54,7 +54,7 @@
var/mob/living/L = cult_mind.current
L.narsie_act()
for(var/mob/living/player in GLOB.player_list)
- if(player.stat != DEAD && player.loc.z == ZLEVEL_STATION && !iscultist(player))
+ if(player.stat != DEAD && (player.loc.z in GLOB.station_z_levels) && !iscultist(player))
souls_needed[player] = TRUE
soul_goal = round(1 + LAZYLEN(souls_needed) * 0.6)
INVOKE_ASYNC(src, .proc/begin_the_end)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 90226d532d..6cbc8f095d 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -335,14 +335,16 @@
"inputAttempt" = input_attempt,
"inputting" = inputting,
"inputLevel" = input_level,
+ "inputLevel_text" = DisplayPower(input_level),
"inputLevelMax" = input_level_max,
- "inputAvailable" = input_available,
+ "inputAvailable" = DisplayPower(input_available),
"outputAttempt" = output_attempt,
"outputting" = outputting,
"outputLevel" = output_level,
+ "outputLevel_text" = DisplayPower(output_level),
"outputLevelMax" = output_level_max,
- "outputUsed" = output_used
+ "outputUsed" = DisplayPower(output_used)
)
return data
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index c8f8d8bfd0..ee531697aa 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -272,7 +272,7 @@
var/t = "
Gas Turbine Generator
"
- t += "Generated power : [round(lastgen)] W
"
+ t += "Generated power : [DisplayPower(lastgen)]
"
t += "Turbine: [round(compressor.rpm)] RPM
"
@@ -337,7 +337,7 @@
dat += {"Turbine status: [ src.compressor.starter ? "Off On" : "Off On"]
\n
\nTurbine speed: [src.compressor.rpm]rpm
- \nPower currently being generated: [src.compressor.turbine.lastgen]W
+ \nPower currently being generated: [DisplayPower(src.compressor.turbine.lastgen)]
\nInternal gas temperature: [src.compressor.gas_contained.temperature]K
\n
Close
\n
diff --git a/code/modules/procedural_mapping/mapGenerators/repair.dm b/code/modules/procedural_mapping/mapGenerators/repair.dm
index f9b94bba89..9796535df7 100644
--- a/code/modules/procedural_mapping/mapGenerators/repair.dm
+++ b/code/modules/procedural_mapping/mapGenerators/repair.dm
@@ -20,11 +20,11 @@
if(!istype(mother, /datum/mapGenerator/repair/reload_station_map))
return
var/datum/mapGenerator/repair/reload_station_map/mother1 = mother
- if(mother1.z != ZLEVEL_STATION)
+ if(!(mother1.z in GLOB.station_z_levels))
return //This is only for reloading station blocks!
GLOB.reloading_map = TRUE
var/static/dmm_suite/reloader = new
- var/list/bounds = reloader.load_map(file(SSmapping.config.GetFullMapPath()),measureOnly = FALSE, no_changeturf = FALSE,x_offset = 0, y_offset = 0, z_offset = ZLEVEL_STATION, cropMap=TRUE, lower_crop_x = mother1.x_low, lower_crop_y = mother1.y_low, upper_crop_x = mother1.x_high, upper_crop_y = mother1.y_high)
+ var/list/bounds = reloader.load_map(file(SSmapping.config.GetFullMapPath()),measureOnly = FALSE, no_changeturf = FALSE,x_offset = 0, y_offset = 0, z_offset = ZLEVEL_STATION_PRIMARY, cropMap=TRUE, lower_crop_x = mother1.x_low, lower_crop_y = mother1.y_low, upper_crop_x = mother1.x_high, upper_crop_y = mother1.y_high)
var/list/obj/machinery/atmospherics/atmos_machines = list()
var/list/obj/structure/cable/cables = list()
@@ -87,13 +87,13 @@
/datum/mapGenerator/repair/reload_station_map/defineRegion(turf/start, turf/end)
. = ..()
- if(start.z != ZLEVEL_STATION || end.z != ZLEVEL_STATION)
+ if(!(start.z in GLOB.station_z_levels) || !(end.z in GLOB.station_z_levels))
return
x_low = min(start.x, end.x)
y_low = min(start.y, end.y)
x_high = max(start.x, end.x)
y_high = max(start.y, end.y)
- z = ZLEVEL_STATION
+ z = ZLEVEL_STATION_PRIMARY
GLOBAL_VAR_INIT(reloading_map, FALSE)
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index fc1ad963e4..3ddd6375b2 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -77,38 +77,34 @@
slot_flags = SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
-/obj/item/gun/ballistic/automatic/c20r/toy
+/obj/item/gun/ballistic/automatic/c20r/toy //This is the syndicate variant with syndicate firing pin and riot darts.
name = "donksoft SMG"
desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
icon = 'icons/obj/guns/toy.dmi'
can_suppress = TRUE
needs_permit = 0
- mag_type = /obj/item/ammo_box/magazine/toy/smgm45
+ mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
casing_ejector = 0
-/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted
+/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted //Use this for actual toys
pin = /obj/item/device/firing_pin
+ mag_type = /obj/item/ammo_box/magazine/toy/smgm45
-/obj/item/gun/ballistic/automatic/smgm45/toy/riot
+/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot
mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
-/obj/item/gun/ballistic/automatic/c20r/toy/riot/unrestricted
- pin = /obj/item/device/firing_pin
-
-/obj/item/gun/ballistic/automatic/l6_saw/toy
+/obj/item/gun/ballistic/automatic/l6_saw/toy //This is the syndicate variant with syndicate firing pin and riot darts.
name = "donksoft LMG"
desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
icon = 'icons/obj/guns/toy.dmi'
can_suppress = FALSE
needs_permit = 0
- mag_type = /obj/item/ammo_box/magazine/toy/m762
+ mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
casing_ejector = 0
-/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted
+/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted //Use this for actual toys
pin = /obj/item/device/firing_pin
+ mag_type = /obj/item/ammo_box/magazine/toy/m762
-/obj/item/gun/ballistic/automatic/l6_saw/toy/riot
+/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot
mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
-
-/obj/item/gun/ballistic/automatic/l6_saw/toy/riot/unrestricted
- pin = /obj/item/device/firing_pin
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index f562da2df0..ce1f469f8d 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -45,14 +45,13 @@
if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
. = 1 //no afterattack
if(beaker)
- to_chat(user, "A beaker is already loaded into the machine!")
+ to_chat(user, "A container is already loaded into [src]!")
return
- if(!user.drop_item())
+ if(!user.transferItemToLoc(I, src))
return
beaker = I
- I.loc = src
- to_chat(user, "You add the beaker to the machine.")
+ to_chat(user, "You add [I] to [src].")
icon_state = "mixer1b"
return
return ..()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 14adaa5fd7..802e4c70ca 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -85,27 +85,25 @@
to_chat(user, "You can't use the [src.name] while its panel is opened!")
return
if(beaker)
- to_chat(user, "A container is already loaded in the machine!")
+ to_chat(user, "A container is already loaded into [src]!")
return
- if(!user.drop_item())
+ if(!user.transferItemToLoc(I, src))
return
beaker = I
- beaker.loc = src
- to_chat(user, "You add the beaker to the machine.")
+ to_chat(user, "You add [I] to [src].")
src.updateUsrDialog()
icon_state = "mixer1"
else if(!condi && istype(I, /obj/item/storage/pill_bottle))
if(bottle)
- to_chat(user, "A pill bottle is already loaded into the machine!")
+ to_chat(user, "A pill bottle is already loaded into [src]!")
return
- if(!user.drop_item())
+ if(!user.transferItemToLoc(I, src))
return
bottle = I
- bottle.loc = src
- to_chat(user, "You add the pill bottle into the dispenser slot.")
+ to_chat(user, "You add [I] into the dispenser slot.")
src.updateUsrDialog()
else
return ..()
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index c08e56dad6..311efd0140 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -118,21 +118,20 @@
if (istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1) )
if (!beaker)
- if(!user.drop_item())
+ if(!user.transferItemToLoc(I, src))
return 1
beaker = I
- beaker.loc = src
update_icon()
src.updateUsrDialog()
else
- to_chat(user, "There's already a container inside.")
+ to_chat(user, "There's already a container inside [src].")
return 1 //no afterattack
if(is_type_in_list(I, dried_items))
if(istype(I, /obj/item/reagent_containers/food/snacks/grown))
var/obj/item/reagent_containers/food/snacks/grown/G = I
if(!G.dry)
- to_chat(user, "You must dry that first!")
+ to_chat(user, "You must dry [G] first!")
return 1
if(holdingitems && holdingitems.len >= limit)
@@ -146,11 +145,11 @@
B.remove_from_storage(G, src)
holdingitems += G
if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill
- to_chat(user, "You fill the All-In-One grinder to the brim.")
+ to_chat(user, "You fill [src] to the brim.")
break
if(!I.contents.len)
- to_chat(user, "You empty the plant bag into the All-In-One grinder.")
+ to_chat(user, "You empty [I] into [src].")
src.updateUsrDialog()
return 1
@@ -162,8 +161,7 @@
to_chat(user, "Cannot refine into a reagent!")
return 1
- if(user.drop_item())
- I.loc = src
+ if(user.transferItemToLoc(I, src))
holdingitems += I
src.updateUsrDialog()
return 0
diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm
index a3e190814e..e83061b232 100644
--- a/code/modules/security_levels/security_levels.dm
+++ b/code/modules/security_levels/security_levels.dm
@@ -1,134 +1,128 @@
-GLOBAL_VAR_INIT(security_level, 0)
-//0 = code green
-//1 = code blue
-//2 = code red
-//3 = code delta
-
-//config.alert_desc_blue_downto
-
-/proc/set_security_level(level)
- switch(level)
- if("green")
- level = SEC_LEVEL_GREEN
- if("blue")
- level = SEC_LEVEL_BLUE
- if("red")
- level = SEC_LEVEL_RED
- if("delta")
- level = SEC_LEVEL_DELTA
-
- //Will not be announced if you try to set to the same level as it already is
- if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_DELTA && level != GLOB.security_level)
- switch(level)
- if(SEC_LEVEL_GREEN)
- minor_announce(config.alert_desc_green, "Attention! Security level lowered to green:")
- if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
- if(GLOB.security_level >= SEC_LEVEL_RED)
- SSshuttle.emergency.modTimer(4)
- else
- SSshuttle.emergency.modTimer(2)
- GLOB.security_level = SEC_LEVEL_GREEN
- for(var/obj/machinery/firealarm/FA in GLOB.machines)
- if(FA.z == ZLEVEL_STATION)
- FA.update_icon()
- if(SEC_LEVEL_BLUE)
- if(GLOB.security_level < SEC_LEVEL_BLUE)
- minor_announce(config.alert_desc_blue_upto, "Attention! Security level elevated to blue:",1)
- if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
- SSshuttle.emergency.modTimer(0.5)
- else
- minor_announce(config.alert_desc_blue_downto, "Attention! Security level lowered to blue:")
- if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
- SSshuttle.emergency.modTimer(2)
- GLOB.security_level = SEC_LEVEL_BLUE
- for(var/mob/M in GLOB.player_list)
- M << sound('sound/misc/voybluealert.ogg')
- for(var/obj/machinery/firealarm/FA in GLOB.machines)
- if(FA.z == ZLEVEL_STATION)
- FA.update_icon()
- if(SEC_LEVEL_RED)
- if(GLOB.security_level < SEC_LEVEL_RED)
- minor_announce(config.alert_desc_red_upto, "Attention! Code red!",1)
- if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
- if(GLOB.security_level == SEC_LEVEL_GREEN)
- SSshuttle.emergency.modTimer(0.25)
- else
- SSshuttle.emergency.modTimer(0.5)
- else
- minor_announce(config.alert_desc_red_downto, "Attention! Code red!")
- GLOB.security_level = SEC_LEVEL_RED
- for(var/mob/M in GLOB.player_list)
- M << sound('sound/misc/voyalert.ogg')
-
- /* - At the time of commit, setting status displays didn't work properly
- var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
- if(CC)
- CC.post_status("alert", "redalert")*/
-
- for(var/obj/machinery/firealarm/FA in GLOB.machines)
- if(FA.z == ZLEVEL_STATION)
- FA.update_icon()
- for(var/obj/machinery/computer/shuttle/pod/pod in GLOB.machines)
- pod.admin_controlled = 0
- if(SEC_LEVEL_DELTA)
- minor_announce(config.alert_desc_delta, "Attention! Delta security level reached!",1)
- if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
- if(GLOB.security_level == SEC_LEVEL_GREEN)
- SSshuttle.emergency.modTimer(0.25)
- else if(GLOB.security_level == SEC_LEVEL_BLUE)
- SSshuttle.emergency.modTimer(0.5)
- GLOB.security_level = SEC_LEVEL_DELTA
- for(var/mob/M in GLOB.player_list)
- M << sound('sound/misc/deltakalaxon.ogg')
- for(var/obj/machinery/firealarm/FA in GLOB.machines)
- if(FA.z == ZLEVEL_STATION)
- FA.update_icon()
- for(var/obj/machinery/computer/shuttle/pod/pod in GLOB.machines)
- pod.admin_controlled = 0
- else
- return
-
-/proc/get_security_level()
- switch(GLOB.security_level)
- if(SEC_LEVEL_GREEN)
- return "green"
- if(SEC_LEVEL_BLUE)
- return "blue"
- if(SEC_LEVEL_RED)
- return "red"
- if(SEC_LEVEL_DELTA)
- return "delta"
-
-/proc/num2seclevel(num)
- switch(num)
- if(SEC_LEVEL_GREEN)
- return "green"
- if(SEC_LEVEL_BLUE)
- return "blue"
- if(SEC_LEVEL_RED)
- return "red"
- if(SEC_LEVEL_DELTA)
- return "delta"
-
-/proc/seclevel2num(seclevel)
- switch( lowertext(seclevel) )
- if("green")
- return SEC_LEVEL_GREEN
- if("blue")
- return SEC_LEVEL_BLUE
- if("red")
- return SEC_LEVEL_RED
- if("delta")
- return SEC_LEVEL_DELTA
-
-
-/*DEBUG
-/mob/verb/set_thing0()
- set_security_level(0)
-/mob/verb/set_thing1()
- set_security_level(1)
-/mob/verb/set_thing2()
- set_security_level(2)
-/mob/verb/set_thing3()
- set_security_level(3)
-*/
+GLOBAL_VAR_INIT(security_level, 0)
+//0 = code green
+//1 = code blue
+//2 = code red
+//3 = code delta
+
+//config.alert_desc_blue_downto
+
+/proc/set_security_level(level)
+ switch(level)
+ if("green")
+ level = SEC_LEVEL_GREEN
+ if("blue")
+ level = SEC_LEVEL_BLUE
+ if("red")
+ level = SEC_LEVEL_RED
+ if("delta")
+ level = SEC_LEVEL_DELTA
+
+ //Will not be announced if you try to set to the same level as it already is
+ if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_DELTA && level != GLOB.security_level)
+ switch(level)
+ if(SEC_LEVEL_GREEN)
+ minor_announce(config.alert_desc_green, "Attention! Security level lowered to green:")
+ if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
+ if(GLOB.security_level >= SEC_LEVEL_RED)
+ SSshuttle.emergency.modTimer(4)
+ else
+ SSshuttle.emergency.modTimer(2)
+ GLOB.security_level = SEC_LEVEL_GREEN
+ for(var/obj/machinery/firealarm/FA in GLOB.machines)
+ if(FA.z in GLOB.station_z_levels)
+ FA.update_icon()
+ if(SEC_LEVEL_BLUE)
+ if(GLOB.security_level < SEC_LEVEL_BLUE)
+ minor_announce(config.alert_desc_blue_upto, "Attention! Security level elevated to blue:",1)
+ if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
+ SSshuttle.emergency.modTimer(0.5)
+ else
+ minor_announce(config.alert_desc_blue_downto, "Attention! Security level lowered to blue:")
+ if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
+ SSshuttle.emergency.modTimer(2)
+ GLOB.security_level = SEC_LEVEL_BLUE
+ for(var/obj/machinery/firealarm/FA in GLOB.machines)
+ if(FA.z in GLOB.station_z_levels)
+ FA.update_icon()
+ if(SEC_LEVEL_RED)
+ if(GLOB.security_level < SEC_LEVEL_RED)
+ minor_announce(config.alert_desc_red_upto, "Attention! Code red!",1)
+ if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
+ if(GLOB.security_level == SEC_LEVEL_GREEN)
+ SSshuttle.emergency.modTimer(0.25)
+ else
+ SSshuttle.emergency.modTimer(0.5)
+ else
+ minor_announce(config.alert_desc_red_downto, "Attention! Code red!")
+ GLOB.security_level = SEC_LEVEL_RED
+
+ /* - At the time of commit, setting status displays didn't work properly
+ var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
+ if(CC)
+ CC.post_status("alert", "redalert")*/
+
+ for(var/obj/machinery/firealarm/FA in GLOB.machines)
+ if(FA.z in GLOB.station_z_levels)
+ FA.update_icon()
+ for(var/obj/machinery/computer/shuttle/pod/pod in GLOB.machines)
+ pod.admin_controlled = 0
+ if(SEC_LEVEL_DELTA)
+ minor_announce(config.alert_desc_delta, "Attention! Delta security level reached!",1)
+ if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
+ if(GLOB.security_level == SEC_LEVEL_GREEN)
+ SSshuttle.emergency.modTimer(0.25)
+ else if(GLOB.security_level == SEC_LEVEL_BLUE)
+ SSshuttle.emergency.modTimer(0.5)
+ GLOB.security_level = SEC_LEVEL_DELTA
+ for(var/obj/machinery/firealarm/FA in GLOB.machines)
+ if(FA.z in GLOB.station_z_levels)
+ FA.update_icon()
+ for(var/obj/machinery/computer/shuttle/pod/pod in GLOB.machines)
+ pod.admin_controlled = 0
+ else
+ return
+
+/proc/get_security_level()
+ switch(GLOB.security_level)
+ if(SEC_LEVEL_GREEN)
+ return "green"
+ if(SEC_LEVEL_BLUE)
+ return "blue"
+ if(SEC_LEVEL_RED)
+ return "red"
+ if(SEC_LEVEL_DELTA)
+ return "delta"
+
+/proc/num2seclevel(num)
+ switch(num)
+ if(SEC_LEVEL_GREEN)
+ return "green"
+ if(SEC_LEVEL_BLUE)
+ return "blue"
+ if(SEC_LEVEL_RED)
+ return "red"
+ if(SEC_LEVEL_DELTA)
+ return "delta"
+
+/proc/seclevel2num(seclevel)
+ switch( lowertext(seclevel) )
+ if("green")
+ return SEC_LEVEL_GREEN
+ if("blue")
+ return SEC_LEVEL_BLUE
+ if("red")
+ return SEC_LEVEL_RED
+ if("delta")
+ return SEC_LEVEL_DELTA
+
+
+/*DEBUG
+/mob/verb/set_thing0()
+ set_security_level(0)
+/mob/verb/set_thing1()
+ set_security_level(1)
+/mob/verb/set_thing2()
+ set_security_level(2)
+/mob/verb/set_thing3()
+ set_security_level(3)
+*/
diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm
index d89e1420fc..16aa279901 100644
--- a/code/modules/shuttle/arrivals.dm
+++ b/code/modules/shuttle/arrivals.dm
@@ -6,7 +6,7 @@
width = 7
height = 15
dir = WEST
- port_angle = 180
+ port_direction = SOUTH
callTime = INFINITY
ignitionTime = 50
diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm
index a3ebba05a1..8384e978e5 100644
--- a/code/modules/shuttle/computer.dm
+++ b/code/modules/shuttle/computer.dm
@@ -4,22 +4,11 @@
icon_keyboard = "tech_key"
light_color = LIGHT_COLOR_CYAN
req_access = list( )
- circuit = /obj/item/circuitboard/computer/shuttle
var/shuttleId
var/possible_destinations = ""
var/admin_controlled
var/no_destination_swap = 0
-/obj/machinery/computer/shuttle/Initialize()
- ..()
- return INITIALIZE_HINT_LATELOAD
-
-/obj/machinery/computer/shuttle/LateInitialize()
- if(istype(circuit, /obj/item/circuitboard/computer/shuttle))
- var/obj/item/circuitboard/computer/shuttle/C = circuit
- possible_destinations = C.possible_destinations
- shuttleId = C.shuttleId
-
/obj/machinery/computer/shuttle/attack_hand(mob/user)
if(..(user))
return
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 6999de9555..8bc90cf787 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -183,7 +183,7 @@
width = 22
height = 11
dir = EAST
- port_angle = -90
+ port_direction = WEST
roundstart_move = "emergency_away"
var/sound_played = 0 //If the launch sound has been sent to all players on the shuttle itself
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 32324ea233..9199e5eb14 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -1,7 +1,7 @@
/obj/machinery/computer/camera_advanced/shuttle_docker
name = "navigation computer"
desc = "Used to designate a precise transit location for a spacecraft."
- z_lock = ZLEVEL_STATION
+ z_lock = ZLEVEL_STATION_PRIMARY
jump_action = null
var/datum/action/innate/shuttledocker_rotate/rotate_action = new
var/datum/action/innate/shuttledocker_place/place_action = new
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 4326e6298e..d2843b67f2 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -260,7 +260,7 @@
// The direction the shuttle prefers to travel in
var/preferred_direction = NORTH
// And the angle from the front of the shuttle to the port
- var/port_angle = 0 // used to be travelDir
+ var/port_direction = NORTH
var/obj/docking_port/stationary/destination
var/obj/docking_port/stationary/previous
@@ -410,7 +410,7 @@
mode = SHUTTLE_RECALL
/obj/docking_port/mobile/proc/enterTransit()
- if(SSshuttle.lockdown && z == ZLEVEL_STATION) //emp went off, no escape
+ if(SSshuttle.lockdown && (z in GLOB.station_z_levels)) //emp went off, no escape
return
previous = null
// if(!destination)
@@ -574,7 +574,7 @@
if(move_mode & MOVE_AREA)
areas_to_move[old_area] = TRUE
-
+
old_turfs[place] = move_mode
/*******************************************All onShuttleMove procs******************************************/
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 6ef04dcaba..56c7b85410 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
callTime = 600
dir = WEST
- port_angle = 90
+ port_direction = EAST
width = 12
dwidth = 5
height = 7
@@ -45,7 +45,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
SSshuttle.supply = src
/obj/docking_port/mobile/supply/canMove()
- if(z == ZLEVEL_STATION)
+ if(z in GLOB.station_z_levels)
return check_blacklist(shuttle_areas)
return ..()
diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm
index f9d90dd342..b21df4000c 100644
--- a/code/modules/shuttle/syndicate.dm
+++ b/code/modules/shuttle/syndicate.dm
@@ -47,7 +47,7 @@
desc = "Used to designate a precise transit location for the syndicate shuttle."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
- z_lock = ZLEVEL_STATION
+ z_lock = ZLEVEL_STATION_PRIMARY
shuttleId = "syndicate"
shuttlePortId = "syndicate_custom"
shuttlePortName = "custom location"
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 94cf2dfe9c..6639297e23 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -31,7 +31,7 @@
/datum/station_goal/proc/get_coverage()
var/list/coverage = list()
for(var/obj/machinery/satellite/meteor_shield/A in GLOB.machines)
- if(!A.active || A.z != ZLEVEL_STATION)
+ if(!A.active || !(A.z in GLOB.station_z_levels))
continue
coverage |= view(A.kill_range,A)
return coverage.len
diff --git a/html/changelogs/AutoChangeLog-pr-2484.yml b/html/changelogs/AutoChangeLog-pr-2484.yml
new file mode 100644
index 0000000000..f7d8732121
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2484.yml
@@ -0,0 +1,5 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - spellcheck: "fixed inconsistent grammar between machines that derive from /obj/machinery/chem_dispenser"
+ - spellcheck: "touched up some chat messages to include references to objects instead of \"that\" or \"the machine\" etc., also removed references to beakers being loaded in machines that can accept any container"
diff --git a/html/changelogs/AutoChangeLog-pr-2539.yml b/html/changelogs/AutoChangeLog-pr-2539.yml
new file mode 100644
index 0000000000..3401e4c4c9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2539.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - tweak: "All power systems will now report their wattage values in Watts, Kilowatts, Megawatts, and Gigawatts. Gone are the days of seeing 48760 W total load when working with an APC!"
diff --git a/html/changelogs/AutoChangeLog-pr-2599.yml b/html/changelogs/AutoChangeLog-pr-2599.yml
new file mode 100644
index 0000000000..1a184bb194
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2599.yml
@@ -0,0 +1,4 @@
+author: "Pubby"
+delete-after: True
+changes:
+ - bugfix: "Escape pods and PubbyStation's monastery shuttle are back in commission"
diff --git a/html/changelogs/AutoChangeLog-pr-2615.yml b/html/changelogs/AutoChangeLog-pr-2615.yml
new file mode 100644
index 0000000000..8ea320ce6c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2615.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Stands now check if their user got queue deleted somehow"
diff --git a/html/changelogs/AutoChangeLog-pr-2703.yml b/html/changelogs/AutoChangeLog-pr-2703.yml
new file mode 100644
index 0000000000..f507d35652
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2703.yml
@@ -0,0 +1,4 @@
+author: "Xhuis"
+delete-after: True
+changes:
+ - bugfix: "The Orion Trail machines are no longer on hardcore mode and you can now restart after losing."
diff --git a/html/changelogs/AutoChangeLog-pr-2740.yml b/html/changelogs/AutoChangeLog-pr-2740.yml
new file mode 100644
index 0000000000..bb5531fcf8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2740.yml
@@ -0,0 +1,4 @@
+author: "VexingRaven"
+delete-after: True
+changes:
+ - bugfix: "The syndicate have once again stocked the toy C20r and L6 Saw with riot darts."
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index c8ab9f0e0a..5c61706c70 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index ef7f594c70..6ed5b6c928 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/tgui/assets/tgui.js b/tgui/assets/tgui.js
index a41d648fe1..ca35db8917 100644
--- a/tgui/assets/tgui.js
+++ b/tgui/assets/tgui.js
@@ -1,16 +1,16 @@
require=function t(e,n,a){function r(o,s){if(!n[o]){if(!e[o]){var u="function"==typeof require&&require;if(!s&&u)return u(o,!0);if(i)return i(o,!0);var p=Error("Cannot find module '"+o+"'");throw p.code="MODULE_NOT_FOUND",p}var c=n[o]={exports:{}};e[o][0].call(c.exports,function(t){var n=e[o][1][t];return r(n?n:t)},c,c.exports,t,e,n,a)}return n[o].exports}for(var i="function"==typeof require&&require,o=0;o2?p[2]:void 0,l=Math.min((void 0===c?o:r(c,o))-u,o-s),f=1;for(s>u&&u+l>s&&(f=-1,u+=l-1,s+=l-1);l-- >0;)u in n?n[s]=n[u]:delete n[s],s+=f,u+=f;return n}},{76:76,79:79,80:80}],6:[function(t,e,n){"use strict";var a=t(80),r=t(76),i=t(79);e.exports=[].fill||function(t){for(var e=a(this),n=i(e.length),o=arguments,s=o.length,u=r(s>1?o[1]:void 0,n),p=s>2?o[2]:void 0,c=void 0===p?n:r(p,n);c>u;)e[u++]=t;return e}},{76:76,79:79,80:80}],7:[function(t,e,n){var a=t(78),r=t(79),i=t(76);e.exports=function(t){return function(e,n,o){var s,u=a(e),p=r(u.length),c=i(o,p);if(t&&n!=n){for(;p>c;)if(s=u[c++],s!=s)return!0}else for(;p>c;c++)if((t||c in u)&&u[c]===n)return t||c;return!t&&-1}}},{76:76,78:78,79:79}],8:[function(t,e,n){var a=t(17),r=t(34),i=t(80),o=t(79),s=t(9);e.exports=function(t){var e=1==t,n=2==t,u=3==t,p=4==t,c=6==t,l=5==t||c;return function(f,d,h){for(var m,v,g=i(f),b=r(g),y=a(d,h,3),x=o(b.length),_=0,w=e?s(f,x):n?s(f,0):void 0;x>_;_++)if((l||_ in b)&&(m=b[_],v=y(m,_,g),t))if(e)w[_]=v;else if(v)switch(t){case 3:return!0;case 5:return m;case 6:return _;case 2:w.push(m)}else if(p)return!1;return c?-1:u||p?p:w}}},{17:17,34:34,79:79,80:80,9:9}],9:[function(t,e,n){var a=t(38),r=t(36),i=t(83)("species");e.exports=function(t,e){var n;return r(t)&&(n=t.constructor,"function"!=typeof n||n!==Array&&!r(n.prototype)||(n=void 0),a(n)&&(n=n[i],null===n&&(n=void 0))),new(void 0===n?Array:n)(e)}},{36:36,38:38,83:83}],10:[function(t,e,n){var a=t(11),r=t(83)("toStringTag"),i="Arguments"==a(function(){return arguments}());e.exports=function(t){var e,n,o;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=(e=Object(t))[r])?n:i?a(e):"Object"==(o=a(e))&&"function"==typeof e.callee?"Arguments":o}},{11:11,83:83}],11:[function(t,e,n){var a={}.toString;e.exports=function(t){return a.call(t).slice(8,-1)}},{}],12:[function(t,e,n){"use strict";var a=t(46),r=t(31),i=t(60),o=t(17),s=t(69),u=t(18),p=t(27),c=t(42),l=t(44),f=t(82)("id"),d=t(30),h=t(38),m=t(65),v=t(19),g=Object.isExtensible||h,b=v?"_s":"size",y=0,x=function(t,e){if(!h(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!d(t,f)){if(!g(t))return"F";if(!e)return"E";r(t,f,++y)}return"O"+t[f]},_=function(t,e){var n,a=x(e);if("F"!==a)return t._i[a];for(n=t._f;n;n=n.n)if(n.k==e)return n};e.exports={getConstructor:function(t,e,n,r){var c=t(function(t,i){s(t,c,e),t._i=a.create(null),t._f=void 0,t._l=void 0,t[b]=0,void 0!=i&&p(i,n,t[r],t)});return i(c.prototype,{clear:function(){for(var t=this,e=t._i,n=t._f;n;n=n.n)n.r=!0,n.p&&(n.p=n.p.n=void 0),delete e[n.i];t._f=t._l=void 0,t[b]=0},"delete":function(t){var e=this,n=_(e,t);if(n){var a=n.n,r=n.p;delete e._i[n.i],n.r=!0,r&&(r.n=a),a&&(a.p=r),e._f==n&&(e._f=a),e._l==n&&(e._l=r),e[b]--}return!!n},forEach:function(t){for(var e,n=o(t,arguments.length>1?arguments[1]:void 0,3);e=e?e.n:this._f;)for(n(e.v,e.k,this);e&&e.r;)e=e.p},has:function(t){return!!_(this,t)}}),v&&a.setDesc(c.prototype,"size",{get:function(){return u(this[b])}}),c},def:function(t,e,n){var a,r,i=_(t,e);return i?i.v=n:(t._l=i={i:r=x(e,!0),k:e,v:n,p:a=t._l,n:void 0,r:!1},t._f||(t._f=i),a&&(a.n=i),t[b]++,"F"!==r&&(t._i[r]=i)),t},getEntry:_,setStrong:function(t,e,n){c(t,e,function(t,e){this._t=t,this._k=e,this._l=void 0},function(){for(var t=this,e=t._k,n=t._l;n&&n.r;)n=n.p;return t._t&&(t._l=n=n?n.n:t._t._f)?"keys"==e?l(0,n.k):"values"==e?l(0,n.v):l(0,[n.k,n.v]):(t._t=void 0,l(1))},n?"entries":"values",!n,!0),m(e)}}},{17:17,18:18,19:19,27:27,30:30,31:31,38:38,42:42,44:44,46:46,60:60,65:65,69:69,82:82}],13:[function(t,e,n){var a=t(27),r=t(10);e.exports=function(t){return function(){if(r(this)!=t)throw TypeError(t+"#toJSON isn't generic");var e=[];return a(this,!1,e.push,e),e}}},{10:10,27:27}],14:[function(t,e,n){"use strict";var a=t(31),r=t(60),i=t(4),o=t(38),s=t(69),u=t(27),p=t(8),c=t(30),l=t(82)("weak"),f=Object.isExtensible||o,d=p(5),h=p(6),m=0,v=function(t){return t._l||(t._l=new g)},g=function(){this.a=[]},b=function(t,e){return d(t.a,function(t){return t[0]===e})};g.prototype={get:function(t){var e=b(this,t);return e?e[1]:void 0},has:function(t){return!!b(this,t)},set:function(t,e){var n=b(this,t);n?n[1]=e:this.a.push([t,e])},"delete":function(t){var e=h(this.a,function(e){return e[0]===t});return~e&&this.a.splice(e,1),!!~e}},e.exports={getConstructor:function(t,e,n,a){var i=t(function(t,r){s(t,i,e),t._i=m++,t._l=void 0,void 0!=r&&u(r,n,t[a],t)});return r(i.prototype,{"delete":function(t){return o(t)?f(t)?c(t,l)&&c(t[l],this._i)&&delete t[l][this._i]:v(this)["delete"](t):!1},has:function(t){return o(t)?f(t)?c(t,l)&&c(t[l],this._i):v(this).has(t):!1}}),i},def:function(t,e,n){return f(i(e))?(c(e,l)||a(e,l,{}),e[l][t._i]=n):v(t).set(e,n),t},frozenStore:v,WEAK:l}},{27:27,30:30,31:31,38:38,4:4,60:60,69:69,8:8,82:82}],15:[function(t,e,n){"use strict";var a=t(29),r=t(22),i=t(61),o=t(60),s=t(27),u=t(69),p=t(38),c=t(24),l=t(43),f=t(66);e.exports=function(t,e,n,d,h,m){var v=a[t],g=v,b=h?"set":"add",y=g&&g.prototype,x={},_=function(t){var e=y[t];i(y,t,"delete"==t?function(t){return m&&!p(t)?!1:e.call(this,0===t?0:t)}:"has"==t?function(t){return m&&!p(t)?!1:e.call(this,0===t?0:t)}:"get"==t?function(t){return m&&!p(t)?void 0:e.call(this,0===t?0:t)}:"add"==t?function(t){return e.call(this,0===t?0:t),this}:function(t,n){return e.call(this,0===t?0:t,n),this})};if("function"==typeof g&&(m||y.forEach&&!c(function(){(new g).entries().next()}))){var w,k=new g,E=k[b](m?{}:-0,1)!=k,S=c(function(){k.has(1)}),C=l(function(t){new g(t)});C||(g=e(function(e,n){u(e,g,t);var a=new v;return void 0!=n&&s(n,h,a[b],a),a}),g.prototype=y,y.constructor=g),m||k.forEach(function(t,e){w=1/e===-(1/0)}),(S||w)&&(_("delete"),_("has"),h&&_("get")),(w||E)&&_(b),m&&y.clear&&delete y.clear}else g=d.getConstructor(e,t,h,b),o(g.prototype,n);return f(g,t),x[t]=g,r(r.G+r.W+r.F*(g!=v),x),m||d.setStrong(g,t,h),g}},{22:22,24:24,27:27,29:29,38:38,43:43,60:60,61:61,66:66,69:69}],16:[function(t,e,n){var a=e.exports={version:"1.2.6"};"number"==typeof __e&&(__e=a)},{}],17:[function(t,e,n){var a=t(2);e.exports=function(t,e,n){if(a(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,a){return t.call(e,n,a)};case 3:return function(n,a,r){return t.call(e,n,a,r)}}return function(){return t.apply(e,arguments)}}},{2:2}],18:[function(t,e,n){e.exports=function(t){if(void 0==t)throw TypeError("Can't call method on "+t);return t}},{}],19:[function(t,e,n){e.exports=!t(24)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},{24:24}],20:[function(t,e,n){var a=t(38),r=t(29).document,i=a(r)&&a(r.createElement);e.exports=function(t){return i?r.createElement(t):{}}},{29:29,38:38}],21:[function(t,e,n){var a=t(46);e.exports=function(t){var e=a.getKeys(t),n=a.getSymbols;if(n)for(var r,i=n(t),o=a.isEnum,s=0;i.length>s;)o.call(t,r=i[s++])&&e.push(r);return e}},{46:46}],22:[function(t,e,n){var a=t(29),r=t(16),i=t(31),o=t(61),s=t(17),u="prototype",p=function(t,e,n){var c,l,f,d,h=t&p.F,m=t&p.G,v=t&p.S,g=t&p.P,b=t&p.B,y=m?a:v?a[e]||(a[e]={}):(a[e]||{})[u],x=m?r:r[e]||(r[e]={}),_=x[u]||(x[u]={});m&&(n=e);for(c in n)l=!h&&y&&c in y,f=(l?y:n)[c],d=b&&l?s(f,a):g&&"function"==typeof f?s(Function.call,f):f,y&&!l&&o(y,c,f),x[c]!=f&&i(x,c,d),g&&_[c]!=f&&(_[c]=f)};a.core=r,p.F=1,p.G=2,p.S=4,p.P=8,p.B=16,p.W=32,e.exports=p},{16:16,17:17,29:29,31:31,61:61}],23:[function(t,e,n){var a=t(83)("match");e.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[a]=!1,!"/./"[t](e)}catch(r){}}return!0}},{83:83}],24:[function(t,e,n){e.exports=function(t){try{return!!t()}catch(e){return!0}}},{}],25:[function(t,e,n){"use strict";var a=t(31),r=t(61),i=t(24),o=t(18),s=t(83);e.exports=function(t,e,n){var u=s(t),p=""[t];i(function(){var e={};return e[u]=function(){return 7},7!=""[t](e)})&&(r(String.prototype,t,n(o,u,p)),a(RegExp.prototype,u,2==e?function(t,e){return p.call(t,this,e)}:function(t){return p.call(t,this)}))}},{18:18,24:24,31:31,61:61,83:83}],26:[function(t,e,n){"use strict";var a=t(4);e.exports=function(){var t=a(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},{4:4}],27:[function(t,e,n){var a=t(17),r=t(40),i=t(35),o=t(4),s=t(79),u=t(84);e.exports=function(t,e,n,p){var c,l,f,d=u(t),h=a(n,p,e?2:1),m=0;if("function"!=typeof d)throw TypeError(t+" is not iterable!");if(i(d))for(c=s(t.length);c>m;m++)e?h(o(l=t[m])[0],l[1]):h(t[m]);else for(f=d.call(t);!(l=f.next()).done;)r(f,h,l.value,e)}},{17:17,35:35,4:4,40:40,79:79,84:84}],28:[function(t,e,n){var a=t(78),r=t(46).getNames,i={}.toString,o="object"==typeof window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],s=function(t){try{return r(t)}catch(e){return o.slice()}};e.exports.get=function(t){return o&&"[object Window]"==i.call(t)?s(t):r(a(t))}},{46:46,78:78}],29:[function(t,e,n){var a=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=a)},{}],30:[function(t,e,n){var a={}.hasOwnProperty;e.exports=function(t,e){return a.call(t,e)}},{}],31:[function(t,e,n){var a=t(46),r=t(59);e.exports=t(19)?function(t,e,n){return a.setDesc(t,e,r(1,n))}:function(t,e,n){return t[e]=n,t}},{19:19,46:46,59:59}],32:[function(t,e,n){e.exports=t(29).document&&document.documentElement},{29:29}],33:[function(t,e,n){e.exports=function(t,e,n){var a=void 0===n;switch(e.length){case 0:return a?t():t.call(n);case 1:return a?t(e[0]):t.call(n,e[0]);case 2:return a?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return a?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return a?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},{}],34:[function(t,e,n){var a=t(11);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==a(t)?t.split(""):Object(t)}},{11:11}],35:[function(t,e,n){var a=t(45),r=t(83)("iterator"),i=Array.prototype;e.exports=function(t){return void 0!==t&&(a.Array===t||i[r]===t)}},{45:45,83:83}],36:[function(t,e,n){var a=t(11);e.exports=Array.isArray||function(t){return"Array"==a(t)}},{11:11}],37:[function(t,e,n){var a=t(38),r=Math.floor;e.exports=function(t){return!a(t)&&isFinite(t)&&r(t)===t}},{38:38}],38:[function(t,e,n){e.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},{}],39:[function(t,e,n){var a=t(38),r=t(11),i=t(83)("match");e.exports=function(t){var e;return a(t)&&(void 0!==(e=t[i])?!!e:"RegExp"==r(t))}},{11:11,38:38,83:83}],40:[function(t,e,n){var a=t(4);e.exports=function(t,e,n,r){try{return r?e(a(n)[0],n[1]):e(n)}catch(i){var o=t["return"];throw void 0!==o&&a(o.call(t)),i}}},{4:4}],41:[function(t,e,n){"use strict";var a=t(46),r=t(59),i=t(66),o={};t(31)(o,t(83)("iterator"),function(){return this}),e.exports=function(t,e,n){t.prototype=a.create(o,{next:r(1,n)}),i(t,e+" Iterator")}},{31:31,46:46,59:59,66:66,83:83}],42:[function(t,e,n){"use strict";var a=t(48),r=t(22),i=t(61),o=t(31),s=t(30),u=t(45),p=t(41),c=t(66),l=t(46).getProto,f=t(83)("iterator"),d=!([].keys&&"next"in[].keys()),h="@@iterator",m="keys",v="values",g=function(){return this};e.exports=function(t,e,n,b,y,x,_){p(n,e,b);var w,k,E=function(t){if(!d&&t in A)return A[t];switch(t){case m:return function(){return new n(this,t)};case v:return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",C=y==v,P=!1,A=t.prototype,O=A[f]||A[h]||y&&A[y],T=O||E(y);if(O){var R=l(T.call(new t));c(R,S,!0),!a&&s(A,h)&&o(R,f,g),C&&O.name!==v&&(P=!0,T=function(){return O.call(this)})}if(a&&!_||!d&&!P&&A[f]||o(A,f,T),u[e]=T,u[S]=g,y)if(w={values:C?T:E(v),keys:x?T:E(m),entries:C?E("entries"):T},_)for(k in w)k in A||i(A,k,w[k]);else r(r.P+r.F*(d||P),e,w);return w}},{22:22,30:30,31:31,41:41,45:45,46:46,48:48,61:61,66:66,83:83}],43:[function(t,e,n){var a=t(83)("iterator"),r=!1;try{var i=[7][a]();i["return"]=function(){r=!0},Array.from(i,function(){throw 2})}catch(o){}e.exports=function(t,e){if(!e&&!r)return!1;var n=!1;try{var i=[7],o=i[a]();o.next=function(){return{done:n=!0}},i[a]=function(){return o},t(i)}catch(s){}return n}},{83:83}],44:[function(t,e,n){e.exports=function(t,e){return{value:e,done:!!t}}},{}],45:[function(t,e,n){e.exports={}},{}],46:[function(t,e,n){var a=Object;e.exports={create:a.create,getProto:a.getPrototypeOf,isEnum:{}.propertyIsEnumerable,getDesc:a.getOwnPropertyDescriptor,setDesc:a.defineProperty,setDescs:a.defineProperties,getKeys:a.keys,getNames:a.getOwnPropertyNames,getSymbols:a.getOwnPropertySymbols,each:[].forEach}},{}],47:[function(t,e,n){var a=t(46),r=t(78);e.exports=function(t,e){for(var n,i=r(t),o=a.getKeys(i),s=o.length,u=0;s>u;)if(i[n=o[u++]]===e)return n}},{46:46,78:78}],48:[function(t,e,n){e.exports=!1},{}],49:[function(t,e,n){e.exports=Math.expm1||function(t){return 0==(t=+t)?t:t>-1e-6&&1e-6>t?t+t*t/2:Math.exp(t)-1}},{}],50:[function(t,e,n){e.exports=Math.log1p||function(t){return(t=+t)>-1e-8&&1e-8>t?t-t*t/2:Math.log(1+t)}},{}],51:[function(t,e,n){e.exports=Math.sign||function(t){return 0==(t=+t)||t!=t?t:0>t?-1:1}},{}],52:[function(t,e,n){var a,r,i,o=t(29),s=t(75).set,u=o.MutationObserver||o.WebKitMutationObserver,p=o.process,c=o.Promise,l="process"==t(11)(p),f=function(){var t,e,n;for(l&&(t=p.domain)&&(p.domain=null,t.exit());a;)e=a.domain,n=a.fn,e&&e.enter(),n(),e&&e.exit(),a=a.next;r=void 0,t&&t.enter()};if(l)i=function(){p.nextTick(f)};else if(u){var d=1,h=document.createTextNode("");new u(f).observe(h,{characterData:!0}),i=function(){h.data=d=-d}}else i=c&&c.resolve?function(){c.resolve().then(f)}:function(){s.call(o,f)};e.exports=function(t){var e={fn:t,next:void 0,domain:l&&p.domain};r&&(r.next=e),a||(a=e,i()),r=e}},{11:11,29:29,75:75}],53:[function(t,e,n){var a=t(46),r=t(80),i=t(34);e.exports=t(24)(function(){var t=Object.assign,e={},n={},a=Symbol(),r="abcdefghijklmnopqrst";return e[a]=7,r.split("").forEach(function(t){n[t]=t}),7!=t({},e)[a]||Object.keys(t({},n)).join("")!=r})?function(t,e){for(var n=r(t),o=arguments,s=o.length,u=1,p=a.getKeys,c=a.getSymbols,l=a.isEnum;s>u;)for(var f,d=i(o[u++]),h=c?p(d).concat(c(d)):p(d),m=h.length,v=0;m>v;)l.call(d,f=h[v++])&&(n[f]=d[f]);return n}:Object.assign},{24:24,34:34,46:46,80:80}],54:[function(t,e,n){var a=t(22),r=t(16),i=t(24);e.exports=function(t,e){var n=(r.Object||{})[t]||Object[t],o={};o[t]=e(n),a(a.S+a.F*i(function(){n(1)}),"Object",o)}},{16:16,22:22,24:24}],55:[function(t,e,n){var a=t(46),r=t(78),i=a.isEnum;e.exports=function(t){return function(e){for(var n,o=r(e),s=a.getKeys(o),u=s.length,p=0,c=[];u>p;)i.call(o,n=s[p++])&&c.push(t?[n,o[n]]:o[n]);return c}}},{46:46,78:78}],56:[function(t,e,n){var a=t(46),r=t(4),i=t(29).Reflect;e.exports=i&&i.ownKeys||function(t){var e=a.getNames(r(t)),n=a.getSymbols;return n?e.concat(n(t)):e}},{29:29,4:4,46:46}],57:[function(t,e,n){"use strict";var a=t(58),r=t(33),i=t(2);e.exports=function(){for(var t=i(this),e=arguments.length,n=Array(e),o=0,s=a._,u=!1;e>o;)(n[o]=arguments[o++])===s&&(u=!0);return function(){var a,i=this,o=arguments,p=o.length,c=0,l=0;if(!u&&!p)return r(t,n,i);if(a=n.slice(),u)for(;e>c;c++)a[c]===s&&(a[c]=o[l++]);for(;p>l;)a.push(o[l++]);return r(t,a,i)}}},{2:2,33:33,58:58}],58:[function(t,e,n){e.exports=t(29)},{29:29}],59:[function(t,e,n){e.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},{}],60:[function(t,e,n){var a=t(61);e.exports=function(t,e){for(var n in e)a(t,n,e[n]);return t}},{61:61}],61:[function(t,e,n){var a=t(29),r=t(31),i=t(82)("src"),o="toString",s=Function[o],u=(""+s).split(o);t(16).inspectSource=function(t){return s.call(t)},(e.exports=function(t,e,n,o){"function"==typeof n&&(n.hasOwnProperty(i)||r(n,i,t[e]?""+t[e]:u.join(e+"")),n.hasOwnProperty("name")||r(n,"name",e)),t===a?t[e]=n:(o||delete t[e],r(t,e,n))})(Function.prototype,o,function(){return"function"==typeof this&&this[i]||s.call(this)})},{16:16,29:29,31:31,82:82}],62:[function(t,e,n){e.exports=function(t,e){var n=e===Object(e)?function(t){return e[t]}:e;return function(e){return(e+"").replace(t,n)}}},{}],63:[function(t,e,n){e.exports=Object.is||function(t,e){return t===e?0!==t||1/t===1/e:t!=t&&e!=e}},{}],64:[function(t,e,n){var a=t(46).getDesc,r=t(38),i=t(4),o=function(t,e){if(i(t),!r(e)&&null!==e)throw TypeError(e+": can't set as prototype!")};e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,n,r){try{r=t(17)(Function.call,a(Object.prototype,"__proto__").set,2),r(e,[]),n=!(e instanceof Array)}catch(i){n=!0}return function(t,e){return o(t,e),n?t.__proto__=e:r(t,e),t}}({},!1):void 0),check:o}},{17:17,38:38,4:4,46:46}],65:[function(t,e,n){"use strict";var a=t(29),r=t(46),i=t(19),o=t(83)("species");e.exports=function(t){var e=a[t];i&&e&&!e[o]&&r.setDesc(e,o,{configurable:!0,get:function(){return this}})}},{19:19,29:29,46:46,83:83}],66:[function(t,e,n){var a=t(46).setDesc,r=t(30),i=t(83)("toStringTag");e.exports=function(t,e,n){t&&!r(t=n?t:t.prototype,i)&&a(t,i,{configurable:!0,value:e})}},{30:30,46:46,83:83}],67:[function(t,e,n){var a=t(29),r="__core-js_shared__",i=a[r]||(a[r]={});e.exports=function(t){return i[t]||(i[t]={})}},{29:29}],68:[function(t,e,n){var a=t(4),r=t(2),i=t(83)("species");e.exports=function(t,e){var n,o=a(t).constructor;return void 0===o||void 0==(n=a(o)[i])?e:r(n)}},{2:2,4:4,83:83}],69:[function(t,e,n){e.exports=function(t,e,n){if(!(t instanceof e))throw TypeError(n+": use the 'new' operator!");return t}},{}],70:[function(t,e,n){var a=t(77),r=t(18);e.exports=function(t){return function(e,n){var i,o,s=r(e)+"",u=a(n),p=s.length;return 0>u||u>=p?t?"":void 0:(i=s.charCodeAt(u),55296>i||i>56319||u+1===p||(o=s.charCodeAt(u+1))<56320||o>57343?t?s.charAt(u):i:t?s.slice(u,u+2):(i-55296<<10)+(o-56320)+65536)}}},{18:18,77:77}],71:[function(t,e,n){var a=t(39),r=t(18);e.exports=function(t,e,n){if(a(e))throw TypeError("String#"+n+" doesn't accept regex!");return r(t)+""}},{18:18,39:39}],72:[function(t,e,n){var a=t(79),r=t(73),i=t(18);e.exports=function(t,e,n,o){var s=i(t)+"",u=s.length,p=void 0===n?" ":n+"",c=a(e);if(u>=c)return s;""==p&&(p=" ");var l=c-u,f=r.call(p,Math.ceil(l/p.length));return f.length>l&&(f=f.slice(0,l)),o?f+s:s+f}},{18:18,73:73,79:79}],73:[function(t,e,n){"use strict";var a=t(77),r=t(18);e.exports=function(t){var e=r(this)+"",n="",i=a(t);if(0>i||i==1/0)throw RangeError("Count can't be negative");for(;i>0;(i>>>=1)&&(e+=e))1&i&&(n+=e);return n}},{18:18,77:77}],74:[function(t,e,n){var a=t(22),r=t(18),i=t(24),o=" \n\x0B\f\r \u2028\u2029\ufeff",s="["+o+"]",u="
",p=RegExp("^"+s+s+"*"),c=RegExp(s+s+"*$"),l=function(t,e){var n={};n[t]=e(f),a(a.P+a.F*i(function(){return!!o[t]()||u[t]()!=u}),"String",n)},f=l.trim=function(t,e){return t=r(t)+"",1&e&&(t=t.replace(p,"")),2&e&&(t=t.replace(c,"")),t};e.exports=l},{18:18,22:22,24:24}],75:[function(t,e,n){var a,r,i,o=t(17),s=t(33),u=t(32),p=t(20),c=t(29),l=c.process,f=c.setImmediate,d=c.clearImmediate,h=c.MessageChannel,m=0,v={},g="onreadystatechange",b=function(){var t=+this;if(v.hasOwnProperty(t)){var e=v[t];delete v[t],e()}},y=function(t){b.call(t.data)};f&&d||(f=function(t){for(var e=[],n=1;arguments.length>n;)e.push(arguments[n++]);return v[++m]=function(){s("function"==typeof t?t:Function(t),e)},a(m),m},d=function(t){delete v[t]},"process"==t(11)(l)?a=function(t){l.nextTick(o(b,t,1))}:h?(r=new h,i=r.port2,r.port1.onmessage=y,a=o(i.postMessage,i,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(a=function(t){c.postMessage(t+"","*")},c.addEventListener("message",y,!1)):a=g in p("script")?function(t){u.appendChild(p("script"))[g]=function(){u.removeChild(this),b.call(t)}}:function(t){setTimeout(o(b,t,1),0)}),e.exports={set:f,clear:d}},{11:11,17:17,20:20,29:29,32:32,33:33}],76:[function(t,e,n){var a=t(77),r=Math.max,i=Math.min;e.exports=function(t,e){return t=a(t),0>t?r(t+e,0):i(t,e)}},{77:77}],77:[function(t,e,n){var a=Math.ceil,r=Math.floor;e.exports=function(t){return isNaN(t=+t)?0:(t>0?r:a)(t)}},{}],78:[function(t,e,n){var a=t(34),r=t(18);e.exports=function(t){return a(r(t))}},{18:18,34:34}],79:[function(t,e,n){var a=t(77),r=Math.min;e.exports=function(t){return t>0?r(a(t),9007199254740991):0}},{77:77}],80:[function(t,e,n){var a=t(18);e.exports=function(t){return Object(a(t))}},{18:18}],81:[function(t,e,n){var a=t(38);e.exports=function(t,e){if(!a(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!a(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!a(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!a(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")}},{38:38}],82:[function(t,e,n){var a=0,r=Math.random();e.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++a+r).toString(36))}},{}],83:[function(t,e,n){var a=t(67)("wks"),r=t(82),i=t(29).Symbol;e.exports=function(t){return a[t]||(a[t]=i&&i[t]||(i||r)("Symbol."+t))}},{29:29,67:67,82:82}],84:[function(t,e,n){var a=t(10),r=t(83)("iterator"),i=t(45);e.exports=t(16).getIteratorMethod=function(t){return void 0!=t?t[r]||t["@@iterator"]||i[a(t)]:void 0}},{10:10,16:16,45:45,83:83}],85:[function(t,e,n){"use strict";var a,r=t(46),i=t(22),o=t(19),s=t(59),u=t(32),p=t(20),c=t(30),l=t(11),f=t(33),d=t(24),h=t(4),m=t(2),v=t(38),g=t(80),b=t(78),y=t(77),x=t(76),_=t(79),w=t(34),k=t(82)("__proto__"),E=t(8),S=t(7)(!1),C=Object.prototype,P=Array.prototype,A=P.slice,O=P.join,T=r.setDesc,R=r.getDesc,j=r.setDescs,M={};o||(a=!d(function(){return 7!=T(p("div"),"a",{get:function(){return 7}}).a}),r.setDesc=function(t,e,n){if(a)try{return T(t,e,n)}catch(r){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(h(t)[e]=n.value),t},r.getDesc=function(t,e){if(a)try{return R(t,e)}catch(n){}return c(t,e)?s(!C.propertyIsEnumerable.call(t,e),t[e]):void 0},r.setDescs=j=function(t,e){h(t);for(var n,a=r.getKeys(e),i=a.length,o=0;i>o;)r.setDesc(t,n=a[o++],e[n]);return t}),i(i.S+i.F*!o,"Object",{getOwnPropertyDescriptor:r.getDesc,defineProperty:r.setDesc,defineProperties:j});var L="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(","),D=L.concat("length","prototype"),N=L.length,F=function(){var t,e=p("iframe"),n=N,a=">";for(e.style.display="none",u.appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("