diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index e57edf2c17a0..af3ba10f2c0d 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2505,7 +2505,7 @@ pixel_y = 17 }, /obj/structure/fluff/tram_rail, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "hm" = ( /obj/structure/flora/ausbushes/lavendergrass, @@ -6054,7 +6054,7 @@ dir = 1 }, /obj/structure/railing, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "ri" = ( /obj/effect/turf_decal/stripes/full, @@ -7234,7 +7234,7 @@ /obj/structure/railing{ dir = 10 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "uX" = ( /obj/machinery/shower{ @@ -8979,7 +8979,7 @@ /obj/structure/railing{ dir = 9 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "zZ" = ( /obj/effect/turf_decal/tile/brown{ @@ -10571,7 +10571,7 @@ /obj/structure/railing{ dir = 1 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "Es" = ( /obj/effect/light_emitter{ @@ -10733,7 +10733,7 @@ /obj/structure/railing{ dir = 8 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "ES" = ( /obj/structure/sign/poster/contraband/lamarr{ @@ -10941,7 +10941,7 @@ /obj/structure/railing{ dir = 9 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "Fy" = ( /obj/structure/chair/stool/directional/south, @@ -12178,7 +12178,7 @@ /obj/structure/railing{ dir = 10 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "Jo" = ( /obj/machinery/door/airlock/centcom{ @@ -12443,7 +12443,7 @@ /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership) "Ki" = ( -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "Kk" = ( /obj/docking_port/stationary{ @@ -13400,7 +13400,7 @@ /obj/structure/railing{ dir = 6 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "Np" = ( /obj/structure/bookcase/random, @@ -13428,7 +13428,7 @@ /obj/structure/railing{ dir = 6 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "Nt" = ( /obj/structure/filingcabinet/medical, @@ -15268,7 +15268,7 @@ /obj/structure/railing{ dir = 9 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "SL" = ( /obj/structure/rack, @@ -15734,7 +15734,7 @@ /obj/structure/railing{ dir = 10 }, -/turf/open/lava/plasma, +/turf/open/lava/plasma/snow_air, /area/centcom/syndicate_mothership/control) "TO" = ( /obj/machinery/keycard_auth/directional/south, diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm index 21665efa555b..0c0ad39bd0fb 100644 --- a/code/controllers/subsystem/zas.dm +++ b/code/controllers/subsystem/zas.dm @@ -514,6 +514,11 @@ SUBSYSTEM_DEF(zas) active_edges -= E E.excited = FALSE + #ifdef ZASDBG + for(var/turf/T as anything in E.connecting_turfs) + T.vis_contents -= zasdbgovl_edge + #endif + ///Wakes an edge, adding it to the active process list. /datum/controller/subsystem/zas/proc/excite_edge(connection_edge/E) #ifdef ZASDBG @@ -524,6 +529,11 @@ SUBSYSTEM_DEF(zas) active_edges += E E.excited = TRUE + #ifdef ZASDBG + for(var/turf/T as anything in E.connecting_turfs) + T.vis_contents += zasdbgovl_edge + #endif + ///Returns the edge between zones A and B. If one doesn't exist, it creates one. See header for more information /datum/controller/subsystem/zas/proc/get_edge(zone/A, zone/B) //Note: B can also be a turf. var/connection_edge/edge diff --git a/code/modules/atmospherics/ZAS/ConnectionGroup.dm b/code/modules/atmospherics/ZAS/ConnectionGroup.dm index 2587240b1886..242785caf7b7 100644 --- a/code/modules/atmospherics/ZAS/ConnectionGroup.dm +++ b/code/modules/atmospherics/ZAS/ConnectionGroup.dm @@ -111,6 +111,9 @@ Class Procs: #ifdef ZASDBG if(verbose) zas_log("[type] Erased.") + + for(var/turf/T in connecting_turfs) + T.vis_contents -= zasdbgovl_edge #endif ///Called every air tick on edges in the processing list. Equalizes gas. @@ -184,9 +187,16 @@ Class Procs: /connection_edge/zone/add_connection(connection/c) . = ..() connecting_turfs += c.A + #ifdef ZASDBG + if(excited) + c.A.vis_contents += zasdbgovl_edge + #endif /connection_edge/zone/remove_connection(connection/c) connecting_turfs -= c.A + #ifdef ZASDBG + c.A.vis_contents -= zasdbgovl_edge + #endif return ..() /connection_edge/zone/contains_zone(zone/Z) @@ -239,6 +249,7 @@ Class Procs: flow(attracted, abs(differential), 0) flow(repelled, abs(differential), 1) + /connection_edge/unsimulated var/turf/B var/datum/gas_mixture/air @@ -261,10 +272,17 @@ Class Procs: . = ..() connecting_turfs += c.B air.group_multiplier = coefficient + #ifdef ZASDBG + if(excited) + c.B.vis_contents += zasdbgovl_edge + #endif /connection_edge/unsimulated/remove_connection(connection/c) connecting_turfs -= c.B air.group_multiplier = coefficient + #ifdef ZASDBG + c.B.vis_contents -= zasdbgovl_edge + #endif return ..() /connection_edge/unsimulated/erase() diff --git a/code/modules/atmospherics/ZAS/Debug.dm b/code/modules/atmospherics/ZAS/Debug.dm index ad6a52289fff..0ffb68853366 100644 --- a/code/modules/atmospherics/ZAS/Debug.dm +++ b/code/modules/atmospherics/ZAS/Debug.dm @@ -6,6 +6,7 @@ GLOBAL_REAL_VAR(obj/effect/zasdbg/merged/zasdbgovl_merged) = new GLOBAL_REAL_VAR(obj/effect/zasdbg/invalid_zone/zasdbgovl_invalid_zone) = new GLOBAL_REAL_VAR(obj/effect/zasdbg/blocked/zasdbgovl_blocked) = new GLOBAL_REAL_VAR(obj/effect/zasdbg/mark/zasdbgovl_mark) = new +GLOBAL_REAL_VAR(obj/effect/zasdbg/edge/zasdbgovl_edge) = new GLOBAL_REAL_VAR(list/zasdbgovl_dirblock) = list( "north" = new /obj/effect/zasdbg/air_blocked/north, @@ -31,6 +32,7 @@ GLOBAL_REAL_VAR(list/zasdbgovl_dirzoneblock) = list( mouse_opacity = MOUSE_OPACITY_TRANSPARENT layer = FLY_LAYER vis_flags = NONE + appearance_flags = RESET_COLOR | RESET_TRANSFORM | KEEP_APART /obj/effect/zasdbg/assigned icon_state = "assigned" @@ -44,6 +46,8 @@ GLOBAL_REAL_VAR(list/zasdbgovl_dirzoneblock) = list( icon_state = "fullblock" /obj/effect/zasdbg/mark icon_state = "mark" +/obj/effect/zasdbg/edge + icon_state = "edge" /obj/effect/zasdbg/zone_blocked icon_state = "zoneblock" diff --git a/code/modules/atmospherics/ZAS/Diagnostic.dm b/code/modules/atmospherics/ZAS/Diagnostic.dm index f05ce9e44d84..16ef35f7d68d 100644 --- a/code/modules/atmospherics/ZAS/Diagnostic.dm +++ b/code/modules/atmospherics/ZAS/Diagnostic.dm @@ -1,24 +1,25 @@ /client/proc/Zone_Info(turf/T as null|turf) set category = "Debug" - if(T) - if(T.simulated && T.zone) - T.zone.dbg_data(src) - if(length(T.zone.contents) < ZONE_MIN_SIZE) - to_chat(mob, span_notice("This turf's zone is below the minimum size, and will merge over zone blockers.")) + var/list/out = list() + if(!T) + return + + if(T.simulated && T.zone) + out += T.zone.dbg_data(src) - else - to_chat(mob, span_admin("ZASDBG: No zone here.")) - var/datum/gas_mixture/mix = T.unsafe_return_air() - to_chat(mob,span_admin( "ZASDBG_MAIN: [mix.returnPressure()] kPa [mix.temperature] k")) - for(var/g in mix.gas) - to_chat(mob, span_admin("ZASDBG_GAS: [g]: [mix.gas[g]]\n")) else - if(zone_debug_images) - for(var/zone in zone_debug_images) - images -= zone_debug_images[zone] - zone_debug_images = null + var/datum/gas_mixture/air = T.unsafe_return_air() + out += span_info("Unsimulated Turf ([T.type])") + out += span_info("
Moles: [air.total_moles]") + out += span_info("Pressure: [air.returnPressure()] kPa") + out += span_info("Temperature: [air.temperature]°K ([air.temperature - T0C]°C)") + out += span_info("Volume: [air.volume]L") + + out += span_info("Mixture:") + for(var/g in air.gas) + out += span_info("[FOURSPACES]- [xgm_gas_data.name[g]]: [air.gas[g]] ([round((air.gas[g] / air.total_moles) * 100, ATMOS_PRECISION)]%) ") -/client/var/list/zone_debug_images + to_chat(src, examine_block("ZAS Debug: [COORD(T)]
"+ jointext(out, "
"))) /client/proc/Test_ZAS_Connection(turf/T as turf) set category = "Debug" diff --git a/code/modules/atmospherics/ZAS/Zone.dm b/code/modules/atmospherics/ZAS/Zone.dm index 15420d82cbb4..b911c1831f30 100644 --- a/code/modules/atmospherics/ZAS/Zone.dm +++ b/code/modules/atmospherics/ZAS/Zone.dm @@ -233,25 +233,43 @@ Class Procs: ///Prints debug information to the given mob. Used by the "Zone Info" verb. Does not require ZASDBG compile define. /zone/proc/dbg_data(mob/M) - to_chat(M, name) + . = list() + . += span_info("[name][invalid ? " ([span_alert("Invalid")])" : ""]") + if(length(contents) < ZONE_MIN_SIZE) + . += span_alert("This turf's zone is below the minimum size, and will merge over zone blockers.") + . += span_info("
Moles: [air.total_moles]") + . += span_info("Pressure: [air.returnPressure()] kPa") + . += span_info("Temperature: [air.temperature]°K ([air.temperature - T0C]°C)") + . += span_info("Volume: [air.volume]L") + . += span_info("Mixture:") for(var/g in air.gas) - to_chat(M, "[xgm_gas_data.name[g]]: [air.gas[g]]") - to_chat(M, "P: [air.returnPressure()] kPa V: [air.volume]L T: [air.temperature]°K ([air.temperature - T0C]°C)") - to_chat(M, "O2 per N2: [(air.gas[GAS_NITROGEN] ? air.gas[GAS_OXYGEN]/air.gas[GAS_NITROGEN] : "N/A")] Moles: [air.total_moles]") - to_chat(M, "Simulated: [contents.len] ([air.group_multiplier])") - to_chat(M, "Edges: [edges.len]") - if(invalid) to_chat(M, "Invalid!") + . += span_info("[FOURSPACES]- [xgm_gas_data.name[g]]: [air.gas[g]] ([round((air.gas[g] / air.total_moles) * 100, ATMOS_PRECISION)]%)") + + . += span_info("
Turfs: [contents.len] (Mult: [air.group_multiplier])") + . += span_info("All Edges: [edges.len]") + var/zone_edges = 0 var/space_edges = 0 var/space_coefficient = 0 + var/list/unsim_pressures = list() + var/list/zone_pressures = list() + for(var/edge_source in edges) var/connection_edge/E = edges[edge_source] + var/turf/jump_target = E.connecting_turfs[1] + if(E.type == /connection_edge/zone) zone_edges++ + var/zone/enemy_zone = edge_source + zone_pressures += span_info("[FOURSPACES]- [enemy_zone.air.returnPressure()] kPa ([E.excited ? span_alert("Excited") : span_good("Sleeping")]) [ADMIN_JMP(jump_target)]") + else space_edges++ space_coefficient += E.coefficient - to_chat(M, " - [E:air:returnPressure()]kPa") + var/connection_edge/unsimulated/unsim_edge = E + unsim_pressures += span_info("[FOURSPACES]- [unsim_edge.air.returnPressure()] kPa ([unsim_edge.excited ? span_alert("Excited") : span_good("Sleeping")]) [ADMIN_JMP(jump_target)]") - to_chat(M, "Zone Edges: [zone_edges]") - to_chat(M, "Unsimulated Edges: [space_edges] ([space_coefficient] connections)\n") + . += span_info("Zone Edges: [zone_edges]") + . += zone_pressures + . += span_info("Unsimulated Edges: [space_edges] ([space_coefficient] connections)") + . += unsim_pressures diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 556bc2e6afef..b73415561031 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -220,6 +220,11 @@ baseturfs = /turf/open/lava/plasma/mafia slowdown = 0 +//matches /turf/open/misc/asteroid/snow +/turf/open/lava/plasma/snow_air + initial_gas = OPENTURF_LOW_PRESSURE + temperature = 180 + /////////// papers diff --git a/daedalus.dme b/daedalus.dme index f7d67e001f68..2582e2b79c6d 100644 --- a/daedalus.dme +++ b/daedalus.dme @@ -80,8 +80,6 @@ #include "code\__DEFINES\devices.dm" #include "code\__DEFINES\direction_junctions.dm" #include "code\__DEFINES\directional.dm" -#include "code\__DEFINES\examine_properties.dm" -#include "code\__DEFINES\pathogen_defines.dm" #include "code\__DEFINES\disk.dm" #include "code\__DEFINES\DNA.dm" #include "code\__DEFINES\do_afters.dm" @@ -92,6 +90,7 @@ #include "code\__DEFINES\economy.dm" #include "code\__DEFINES\electrified_buckle.dm" #include "code\__DEFINES\events.dm" +#include "code\__DEFINES\examine_properties.dm" #include "code\__DEFINES\exosuit_fab.dm" #include "code\__DEFINES\explosions.dm" #include "code\__DEFINES\exports.dm" @@ -170,6 +169,7 @@ #include "code\__DEFINES\paperwork_defines.dm" #include "code\__DEFINES\particles.dm" #include "code\__DEFINES\path.dm" +#include "code\__DEFINES\pathogen_defines.dm" #include "code\__DEFINES\perf_test.dm" #include "code\__DEFINES\pinpointers.dm" #include "code\__DEFINES\pipe_construction.dm" @@ -932,62 +932,6 @@ #include "code\datums\components\riding\riding.dm" #include "code\datums\components\riding\riding_mob.dm" #include "code\datums\components\riding\riding_vehicle.dm" -#include "code\datums\keybinding\rawkey.dm" -#include "code\datums\pathogens\_MobProcs.dm" -#include "code\datums\pathogens\_pathogen.dm" -#include "code\datums\pathogens\adrenal_crisis.dm" -#include "code\datums\pathogens\anxiety.dm" -#include "code\datums\pathogens\beesease.dm" -#include "code\datums\pathogens\brainrot.dm" -#include "code\datums\pathogens\cold.dm" -#include "code\datums\pathogens\cold9.dm" -#include "code\datums\pathogens\decloning.dm" -#include "code\datums\pathogens\fake_gbs.dm" -#include "code\datums\pathogens\flu.dm" -#include "code\datums\pathogens\fluspanish.dm" -#include "code\datums\pathogens\gbs.dm" -#include "code\datums\pathogens\heart_failure.dm" -#include "code\datums\pathogens\magnitis.dm" -#include "code\datums\pathogens\parasitic_infection.dm" -#include "code\datums\pathogens\parrotpossession.dm" -#include "code\datums\pathogens\pierrot_throat.dm" -#include "code\datums\pathogens\retrovirus.dm" -#include "code\datums\pathogens\rhumba_beat.dm" -#include "code\datums\pathogens\transformation.dm" -#include "code\datums\pathogens\tuberculosis.dm" -#include "code\datums\pathogens\wizarditis.dm" -#include "code\datums\pathogens\advance\advance.dm" -#include "code\datums\pathogens\advance\presets.dm" -#include "code\datums\pathogens\advance\symptoms\_symptoms.dm" -#include "code\datums\pathogens\advance\symptoms\beard.dm" -#include "code\datums\pathogens\advance\symptoms\chills.dm" -#include "code\datums\pathogens\advance\symptoms\choking.dm" -#include "code\datums\pathogens\advance\symptoms\confusion.dm" -#include "code\datums\pathogens\advance\symptoms\cough.dm" -#include "code\datums\pathogens\advance\symptoms\deafness.dm" -#include "code\datums\pathogens\advance\symptoms\disfiguration.dm" -#include "code\datums\pathogens\advance\symptoms\dizzy.dm" -#include "code\datums\pathogens\advance\symptoms\fever.dm" -#include "code\datums\pathogens\advance\symptoms\fire.dm" -#include "code\datums\pathogens\advance\symptoms\flesh_eating.dm" -#include "code\datums\pathogens\advance\symptoms\genetics.dm" -#include "code\datums\pathogens\advance\symptoms\hallucigen.dm" -#include "code\datums\pathogens\advance\symptoms\headache.dm" -#include "code\datums\pathogens\advance\symptoms\heal.dm" -#include "code\datums\pathogens\advance\symptoms\itching.dm" -#include "code\datums\pathogens\advance\symptoms\narcolepsy.dm" -#include "code\datums\pathogens\advance\symptoms\oxygen.dm" -#include "code\datums\pathogens\advance\symptoms\sensory.dm" -#include "code\datums\pathogens\advance\symptoms\shedding.dm" -#include "code\datums\pathogens\advance\symptoms\skin.dm" -#include "code\datums\pathogens\advance\symptoms\sneeze.dm" -#include "code\datums\pathogens\advance\symptoms\species.dm" -#include "code\datums\pathogens\advance\symptoms\viral.dm" -#include "code\datums\pathogens\advance\symptoms\vision.dm" -#include "code\datums\pathogens\advance\symptoms\voice_change.dm" -#include "code\datums\pathogens\advance\symptoms\vomit.dm" -#include "code\datums\pathogens\advance\symptoms\weight.dm" -#include "code\datums\pathogens\advance\symptoms\youth.dm" #include "code\datums\elements\_element.dm" #include "code\datums\elements\animal_variety.dm" #include "code\datums\elements\art.dm" @@ -1110,6 +1054,7 @@ #include "code\datums\keybinding\living.dm" #include "code\datums\keybinding\mob.dm" #include "code\datums\keybinding\movement.dm" +#include "code\datums\keybinding\rawkey.dm" #include "code\datums\keybinding\robot.dm" #include "code\datums\looping_sounds\_looping_sound.dm" #include "code\datums\looping_sounds\acid.dm" @@ -1162,6 +1107,61 @@ #include "code\datums\mutations\webbing.dm" #include "code\datums\mutations\holy_mutation\burdened.dm" #include "code\datums\mutations\holy_mutation\honorbound.dm" +#include "code\datums\pathogens\_MobProcs.dm" +#include "code\datums\pathogens\_pathogen.dm" +#include "code\datums\pathogens\adrenal_crisis.dm" +#include "code\datums\pathogens\anxiety.dm" +#include "code\datums\pathogens\beesease.dm" +#include "code\datums\pathogens\brainrot.dm" +#include "code\datums\pathogens\cold.dm" +#include "code\datums\pathogens\cold9.dm" +#include "code\datums\pathogens\decloning.dm" +#include "code\datums\pathogens\fake_gbs.dm" +#include "code\datums\pathogens\flu.dm" +#include "code\datums\pathogens\fluspanish.dm" +#include "code\datums\pathogens\gbs.dm" +#include "code\datums\pathogens\heart_failure.dm" +#include "code\datums\pathogens\magnitis.dm" +#include "code\datums\pathogens\parasitic_infection.dm" +#include "code\datums\pathogens\parrotpossession.dm" +#include "code\datums\pathogens\pierrot_throat.dm" +#include "code\datums\pathogens\retrovirus.dm" +#include "code\datums\pathogens\rhumba_beat.dm" +#include "code\datums\pathogens\transformation.dm" +#include "code\datums\pathogens\tuberculosis.dm" +#include "code\datums\pathogens\wizarditis.dm" +#include "code\datums\pathogens\advance\advance.dm" +#include "code\datums\pathogens\advance\presets.dm" +#include "code\datums\pathogens\advance\symptoms\_symptoms.dm" +#include "code\datums\pathogens\advance\symptoms\beard.dm" +#include "code\datums\pathogens\advance\symptoms\chills.dm" +#include "code\datums\pathogens\advance\symptoms\choking.dm" +#include "code\datums\pathogens\advance\symptoms\confusion.dm" +#include "code\datums\pathogens\advance\symptoms\cough.dm" +#include "code\datums\pathogens\advance\symptoms\deafness.dm" +#include "code\datums\pathogens\advance\symptoms\disfiguration.dm" +#include "code\datums\pathogens\advance\symptoms\dizzy.dm" +#include "code\datums\pathogens\advance\symptoms\fever.dm" +#include "code\datums\pathogens\advance\symptoms\fire.dm" +#include "code\datums\pathogens\advance\symptoms\flesh_eating.dm" +#include "code\datums\pathogens\advance\symptoms\genetics.dm" +#include "code\datums\pathogens\advance\symptoms\hallucigen.dm" +#include "code\datums\pathogens\advance\symptoms\headache.dm" +#include "code\datums\pathogens\advance\symptoms\heal.dm" +#include "code\datums\pathogens\advance\symptoms\itching.dm" +#include "code\datums\pathogens\advance\symptoms\narcolepsy.dm" +#include "code\datums\pathogens\advance\symptoms\oxygen.dm" +#include "code\datums\pathogens\advance\symptoms\sensory.dm" +#include "code\datums\pathogens\advance\symptoms\shedding.dm" +#include "code\datums\pathogens\advance\symptoms\skin.dm" +#include "code\datums\pathogens\advance\symptoms\sneeze.dm" +#include "code\datums\pathogens\advance\symptoms\species.dm" +#include "code\datums\pathogens\advance\symptoms\viral.dm" +#include "code\datums\pathogens\advance\symptoms\vision.dm" +#include "code\datums\pathogens\advance\symptoms\voice_change.dm" +#include "code\datums\pathogens\advance\symptoms\vomit.dm" +#include "code\datums\pathogens\advance\symptoms\weight.dm" +#include "code\datums\pathogens\advance\symptoms\youth.dm" #include "code\datums\proximity_monitor\field.dm" #include "code\datums\proximity_monitor\proximity_monitor.dm" #include "code\datums\proximity_monitor\fields\gravity.dm" @@ -4423,8 +4423,8 @@ #include "code\modules\surgery\organs\augments_arms.dm" #include "code\modules\surgery\organs\augments_chest.dm" #include "code\modules\surgery\organs\augments_eyes.dm" -#include "code\modules\surgery\organs\augments_internal.dm" #include "code\modules\surgery\organs\augments_fluff.dm" +#include "code\modules\surgery\organs\augments_internal.dm" #include "code\modules\surgery\organs\autosurgeon.dm" #include "code\modules\surgery\organs\cell.dm" #include "code\modules\surgery\organs\ears.dm" diff --git a/modular_pariah/master_files/icons/testing/Zone.dmi b/modular_pariah/master_files/icons/testing/Zone.dmi index 1d8ab8516693..0e290e40e479 100644 Binary files a/modular_pariah/master_files/icons/testing/Zone.dmi and b/modular_pariah/master_files/icons/testing/Zone.dmi differ