diff --git a/code/ZAS/ZAS_Zones.dm b/code/ZAS/ZAS_Zones.dm
index b942d79350..1d92062e25 100644
--- a/code/ZAS/ZAS_Zones.dm
+++ b/code/ZAS/ZAS_Zones.dm
@@ -28,6 +28,11 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
var/progress = "nothing"
+/datum/gas_mixture/zone
+ Del()
+ CRASH("Something tried to delete a zone's air!")
+ . = ..()
+
//CREATION AND DELETION
/zone/New(turf/start)
. = ..()
@@ -47,7 +52,8 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
//Generate the gas_mixture for use in txhis zone by using the average of the gases
//defined at startup.
- air = new
+ //Changed to try and find the source of the error.
+ air = new /datum/gas_mixture/zone()
air.group_multiplier = contents.len
for(var/turf/simulated/T in contents)
if(!T.air)
@@ -102,6 +108,10 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
C.A.zone = null
if(C.B.zone == src)
C.B.zone = null
+ if(C.zone_A == src)
+ C.zone_A = null
+ if(C.zone_B == src)
+ C.zone_B = null
direct_connections = null
//Ensuring the zone list doesn't get clogged with null values.
@@ -182,6 +192,10 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
if(!unsim_air_needs_update && air_unsim) //if air_unsim doesn't exist, we need to create it even if we don't need an update.
return
+ //Tempfix.
+ if(!air)
+ return
+
unsim_air_needs_update = 0
if(!air_unsim)
@@ -781,6 +795,9 @@ zone/proc/Rebuild()
final_arrangement[current_identifier] = list(current)
else
+ //Sanity check.
+ if(!islist(final_arrangement[current_identifier]))
+ final_arrangement[current_identifier] = list()
final_arrangement[current_identifier] += current
//lazy but fast
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index d48e2e10c6..4e7beba1dd 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -400,7 +400,9 @@
/obj/item/weapon/module/power_control
name = "power control module"
icon_state = "power_mod"
- desc = "Heavy-duty switching circuits for power control."
+ desc = "Heavy-duty switching circuits for power control."
+ m_amt = 50
+ g_amt = 50
/obj/item/weapon/module/id_auth
name = "\improper ID authentication module"
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index d3fb30d371..565edc8e17 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -16,7 +16,8 @@ var/global/list/autolathe_recipes = list( \
new /obj/item/weapon/stock_parts/console_screen(), \
new /obj/item/weapon/airlock_electronics(), \
new /obj/item/weapon/airalarm_electronics(), \
- new /obj/item/weapon/firealarm_electronics(), \
+ new /obj/item/weapon/firealarm_electronics(), \
+ new /obj/item/weapon/module/power_control(), \
new /obj/item/stack/sheet/metal(), \
new /obj/item/stack/sheet/glass(), \
new /obj/item/stack/sheet/rglass(), \
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 9814616034..ecfe8feae5 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -348,10 +348,11 @@ var/list/slot_equipment_priority = list( \
return
else
var/deathtime = world.time - src.timeofdeath
- var/mob/dead/observer/G = src
- if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
- usr << "\blue Upon using the antagHUD you forfeighted the ability to join the round."
- return
+ if(istype(src,/mob/dead/observer))
+ var/mob/dead/observer/G = src
+ if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ usr << "\blue Upon using the antagHUD you forfeighted the ability to join the round."
+ return
var/deathtimeminutes = round(deathtime / 600)
var/pluralcheck = "minute"
if(deathtimeminutes == 0)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 31751cdfff..bcd33b2a79 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -1451,7 +1451,7 @@ datum/design/chemsprayer
build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000)
reliability_base = 100
- build_path = "/obj/item/weapon/chemsprayer"
+ build_path = "/obj/item/weapon/reagent_containers/spray/chemsprayer"
datum/design/rapidsyringe
name = "Rapid Syringe Gun"