From 917dfdd403ceffec88ff04c77ba663a531465ea3 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 5 Sep 2020 10:38:32 -0400 Subject: [PATCH 01/37] Update alcohol_reagents.dm --- .../reagents/chemistry/reagents/alcohol_reagents.dm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 4034759c72..289b92f06d 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2280,6 +2280,7 @@ All effects don't start immediately, but rather get worse over time; the rate is quality = RACE_DRINK else C.adjust_disgust(disgust) + return ..() /datum/reagent/consumable/ethanol/species_drink/coldscales name = "Coldscales" @@ -2289,7 +2290,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "coldscales" glass_name = "glass of Coldscales" glass_desc = "A soft green drink that looks inviting!" - species_required = "lizard" /datum/reagent/consumable/ethanol/species_drink/oil_drum @@ -2301,7 +2301,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "oil_drum" glass_name = "Drum of oil" glass_desc = "A gray can of booze and oil..." - species_required = "robot" /datum/reagent/consumable/ethanol/species_drink/nord_king @@ -2312,7 +2311,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "nord_king" glass_name = "Keg of Nord King" glass_desc = "A dripping keg of red mead." - species_required = "basic" /datum/reagent/consumable/ethanol/species_drink/velvet_kiss @@ -2324,7 +2322,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "velvet_kiss" glass_name = "glass of Velvet Kiss" glass_desc = "Red and white drink for the upper classes or undead." - species_required = "undead" /datum/reagent/consumable/ethanol/species_drink/abduction_fruit @@ -2336,7 +2333,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "abduction_fruit" glass_name = "glass of Abduction Fruit" glass_desc = "Mixed fruits that were never meant to be mixed..." - species_required = "alien" /datum/reagent/consumable/ethanol/species_drink/bug_zapper @@ -2348,7 +2344,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "bug_zapper" glass_name = "glass of Bug Zapper" glass_desc = "An odd mix of copper, lemon juice and power meant for non-human consumption." - species_required = "bug" /datum/reagent/consumable/ethanol/species_drink/mush_crush @@ -2360,7 +2355,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "mush_crush" glass_name = "glass of Mush Crush" glass_desc = "Popular among people that want to grow their own food rather than drink the soil." - species_required = "plant" /datum/reagent/consumable/ethanol/species_drink/darkbrew @@ -2372,7 +2366,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "darkbrew" glass_name = "glass of Darkbrew" glass_desc = "A pitch black drink that's commonly confused with a type of coffee." - species_required = "shadow" /datum/reagent/consumable/ethanol/species_drink/hollow_bone @@ -2384,7 +2377,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "hollow_bone" glass_name = "skull of Hollow Bone" glass_desc = "Mixing of milk and bone hurting juice for the enjoyment of rather skinny people." - species_required = "skeleton" /datum/reagent/consumable/ethanol/species_drink/frisky_kitty @@ -2396,7 +2388,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "frisky_kitty" glass_name = "cup of Drisky Kitty" glass_desc = "Warm milk and some catnip." - species_required = "furry" /datum/reagent/consumable/ethanol/species_drink/jell_wyrm @@ -2408,7 +2399,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "jell_wyrm" glass_name = "glass of Jell Wyrm" glass_desc = "A bubbly drink that is rather inviting to those that don't know who it's meant for." - species_required = "jelly" /datum/reagent/consumable/ethanol/species_drink/laval_spit //Yes Laval @@ -2420,7 +2410,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "laval_spit" glass_name = "glass of Laval Spit" glass_desc = "Piping hot drink for those who can stomach the heat of lava." - species_required = "golem" /////////////// From cddd46fce3327ddb7fdfe03b5347cd15e94c4402 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 5 Sep 2020 18:52:20 -0400 Subject: [PATCH 02/37] Maybe this will work. Maybe it won't. --- code/datums/materials/basemats.dm | 11 +++++++++++ code/game/objects/items/stacks/sheets/sheet_types.dm | 2 +- code/modules/smithing/smithed_items.dm | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index 30a04d7382..51b82d22bc 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -285,6 +285,17 @@ Unless you know what you're doing, only use the first three numbers. They're in beauty_modifier = -0.15 texture_layer_icon_state = "runed" +/datum/material/brass + name = "brass" + desc = "Tybel gb-Ratvar" + color = "#9B7E24" + categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE) + strength_modifier = 1.2 + sheet_type = /obj/item/stack/tile/brass + value_per_unit = 0.75 + armor_modifiers = list("melee" = 1.4, "bullet" = 1.4, "laser" = 0, "energy" = 0, "bomb" = 1.4, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5) //Brass has.. a few problems that can't easily be compensated for. + beauty_modifier = 0.3 //It really beats the cold plain plating of the station, doesn't it? + /datum/material/bronze name = "bronze" desc = "Clock Cult? Never heard of it." diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 9ed930b8c7..c3028c2fd5 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -636,7 +636,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ null, \ new/datum/stack_recipe("brass flask", /obj/item/reagent_containers/food/drinks/bottle/holyoil/empty), \ new/datum/stack_recipe("brass smith's hammer", /obj/item/melee/smith/hammer/ratvar, 6), \ - new/datum/stack_recipe("brass ingot", /obj/item/ingot/bronze/ratvar, 6, time = 100), \ + new/datum/stack_recipe("brass ingot", /obj/item/ingot/ratvar, 6, time = 100), \ )) /obj/item/stack/tile/brass diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index df30a01f8c..da619bf935 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -79,10 +79,10 @@ /obj/item/ingot/bronze custom_materials = list(/datum/material/bronze=12000) -/obj/item/ingot/bronze/ratvar +/obj/item/ingot/ratvar material_flags = MATERIAL_COLOR name = "brass ingnot" - desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually more structurally stable bronze. Ratvar must have transformed the brass into bronze. Somehow." + desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually primarily replicant alloy. Nezbere must have switched it while you weren't looking." /obj/item/smithing/attackby(obj/item/I, mob/user) From de8ed28f2c6f07487232a69ee8b8f357d9d10cd8 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 5 Sep 2020 19:14:51 -0400 Subject: [PATCH 03/37] cat roomba.jpg --- code/modules/smithing/smithed_items.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index da619bf935..3416ea3bb2 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -80,8 +80,8 @@ custom_materials = list(/datum/material/bronze=12000) /obj/item/ingot/ratvar - material_flags = MATERIAL_COLOR - name = "brass ingnot" + custom_materials = list(/datum/material/brass=12000) + name = "brass ingot" desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually primarily replicant alloy. Nezbere must have switched it while you weren't looking." From 280e3e22a3b83af39c4bdcc7435d59e13da588fb Mon Sep 17 00:00:00 2001 From: lolman360 Date: Sun, 6 Sep 2020 10:23:58 +1000 Subject: [PATCH 04/37] Update smithed_items.dm --- code/modules/smithing/smithed_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index df30a01f8c..27e5ca8339 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -382,7 +382,7 @@ finalitem = /obj/item/melee/smith/twohand/glaive icon_state = "glaive" -/obj/item/smithing/glaive/startfinish() +/obj/item/smithing/glaivehead/startfinish() var/obj/item/melee/smith/twohand/glaive/finalforreal = new /obj/item/melee/smith/twohand/glaive(src) finalforreal.force += quality finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult From 4dacbbb0a954ae13b22a2f9c5adc40e2085519d6 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 5 Sep 2020 20:34:49 -0400 Subject: [PATCH 05/37] =?UTF-8?q?deeper=20brass=20color=E2=84=A2=20(and=20?= =?UTF-8?q?damage)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/datums/materials/basemats.dm | 6 +++--- code/modules/smithing/smithed_items.dm | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index 51b82d22bc..76e60bc6dc 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -288,12 +288,12 @@ Unless you know what you're doing, only use the first three numbers. They're in /datum/material/brass name = "brass" desc = "Tybel gb-Ratvar" - color = "#9B7E24" + color = "#917010" categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE) - strength_modifier = 1.2 + strength_modifier = 1.3 // Replicant Alloy is very good for skull beatings.. sheet_type = /obj/item/stack/tile/brass value_per_unit = 0.75 - armor_modifiers = list("melee" = 1.4, "bullet" = 1.4, "laser" = 0, "energy" = 0, "bomb" = 1.4, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5) //Brass has.. a few problems that can't easily be compensated for. + armor_modifiers = list("melee" = 1.4, "bullet" = 1.4, "laser" = 0, "energy" = 0, "bomb" = 1.4, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5) //But it has.. a few problems that can't easily be compensated for. beauty_modifier = 0.3 //It really beats the cold plain plating of the station, doesn't it? /datum/material/bronze diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index 3416ea3bb2..7396e1fb7e 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -81,7 +81,6 @@ /obj/item/ingot/ratvar custom_materials = list(/datum/material/brass=12000) - name = "brass ingot" desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually primarily replicant alloy. Nezbere must have switched it while you weren't looking." From e75d1a19628dc8987a8d1eb557ba820078de7f9c Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 7 Sep 2020 02:00:22 -0700 Subject: [PATCH 06/37] Signalizes ling/bloodsucker life code. --- code/__DEFINES/dcs/signals.dm | 4 ++++ .../bloodsucker/datum_bloodsucker.dm | 4 +++- .../antagonists/changeling/changeling.dm | 5 ++++ code/modules/mob/living/carbon/life.dm | 24 +------------------ code/modules/mob/living/life.dm | 2 ++ 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 8efb2617bd..4acfdb3218 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -288,6 +288,10 @@ #define COMPONENT_INTERRUPT_LIFE_BIOLOGICAL 1 // interrupt biological processes #define COMPONENT_INTERRUPT_LIFE_PHYSICAL 2 // interrupt physical handling +#define COMSIG_LIVING_BIOLOGICAL_LIFE "biological_life" //from base of mob/living/BiologicalLife() (seconds, times_fired) + +#define COMSIG_LIVING_PHYSICAL_LIFE "physical_life" //from base of mob/living/PhysicalLife() (seconds, times_fired) + // /mob/living/carbon physiology signals #define COMSIG_CARBON_GAIN_WOUND "carbon_gain_wound" //from /datum/wound/proc/apply_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) #define COMSIG_CARBON_LOSE_WOUND "carbon_lose_wound" //from /datum/wound/proc/remove_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm index 1fcffff810..5af2a49b1b 100644 --- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm +++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm @@ -138,7 +138,7 @@ if(owner.current.gender == MALE) if(prob(10)) // Gender override bloodsucker_reputation = pick("King of the Damned", "Blood King", "Emperor of Blades", "Sinlord", "God-King") - else + else if(owner.current.gender == FEMALE) if(prob(10)) // Gender override bloodsucker_reputation = pick("Queen of the Damned", "Blood Queen", "Empress of Blades", "Sinlady", "God-Queen") @@ -341,10 +341,12 @@ //This handles the application of antag huds/special abilities /datum/antagonist/bloodsucker/apply_innate_effects(mob/living/mob_override) + RegisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE,.proc/LifeTick) return //This handles the removal of antag huds/special abilities /datum/antagonist/bloodsucker/remove_innate_effects(mob/living/mob_override) + UnregisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE) return //Assign default team and creates one for one of a kind team antagonists diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index d06ebe9d9d..0f3f6d872a 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -94,6 +94,7 @@ B.decoy_override = FALSE remove_changeling_powers() owner.special_role = null + owner.current.hud_used?.lingchemdisplay?.invisibility = INVISIBILITY_ABSTRACT . = ..() /datum/antagonist/changeling/proc/remove_clownmut() @@ -225,6 +226,8 @@ else //not dead? no chem/geneticdamage caps. chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage) geneticdamage = max(0, geneticdamage-1) + owner.current.hud_used?.lingchemdisplay?.invisibility = 0 + owner.current.hud_used?.lingchemdisplay?.maptext = "
[round(changeling.chem_charges)]
" /datum/antagonist/changeling/proc/get_dna(dna_owner) @@ -357,10 +360,12 @@ B.organ_flags &= ~ORGAN_VITAL B.decoy_override = TRUE update_changeling_icons_added() + RegisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE,.proc/regenerate) return /datum/antagonist/changeling/remove_innate_effects() update_changeling_icons_removed() + UnregisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE) return diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index e29c6b9ffe..8f181d47fd 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -1,8 +1,4 @@ /mob/living/carbon/BiologicalLife(seconds, times_fired) - //Updates the number of stored chemicals for powers - handle_changeling() - //Handles the unique mentabolism of bloodsuckers, look at /datum/antagonist/bloodsucker/proc/LifeTick() - handle_bloodsucker() //Reagent processing needs to come before breathing, to prevent edge cases. handle_organs() . = ..() // if . is false, we are dead. @@ -410,25 +406,7 @@ for(var/thing in all_wounds) var/datum/wound/W = thing if(W.processes) // meh - W.handle_process() - -//todo generalize this and move hud out -/mob/living/carbon/proc/handle_changeling() - if(mind && hud_used && hud_used.lingchemdisplay) - var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling) - changeling.regenerate() - hud_used.lingchemdisplay.invisibility = 0 - hud_used.lingchemdisplay.maptext = "
[round(changeling.chem_charges)]
" - else - hud_used.lingchemdisplay.invisibility = INVISIBILITY_ABSTRACT - - -/mob/living/carbon/proc/handle_bloodsucker() - if(mind && AmBloodsucker(src)) - var/datum/antagonist/bloodsucker/B = mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) - B.LifeTick() - + W.handle_process() /mob/living/carbon/handle_mutations_and_radiation() if(dna && dna.temporary_mutations.len) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 89321082c9..9de75702db 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -43,6 +43,7 @@ * Returns TRUE or FALSE based on if we were interrupted. This is used by overridden variants to check if they should stop. */ /mob/living/proc/BiologicalLife(seconds, times_fired) + SEND_SIGNAL(src,COMSIG_LIVING_BIOLOGICAL_LIFE, seconds, times_fired) handle_diseases()// DEAD check is in the proc itself; we want it to spread even if the mob is dead, but to handle its disease-y properties only if you're not. handle_wounds() @@ -78,6 +79,7 @@ * Returns TRUE or FALSE based on if we were interrupted. This is used by overridden variants to check if they should stop. */ /mob/living/proc/PhysicalLife(seconds, times_fired) + SEND_SIGNAL(src,COMSIG_LIVING_PHYSICAL_LIFE, seconds, times_fired) if(digitalinvis) handle_diginvis() //AI becomes unable to see mob From c9a5a9dd8e549260af3aacc5ed142f907c6c9fd0 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 7 Sep 2020 02:20:54 -0700 Subject: [PATCH 07/37] thanks byond strings, very cool --- code/modules/antagonists/changeling/changeling.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 0f3f6d872a..242538a1e5 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -227,7 +227,7 @@ chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage) geneticdamage = max(0, geneticdamage-1) owner.current.hud_used?.lingchemdisplay?.invisibility = 0 - owner.current.hud_used?.lingchemdisplay?.maptext = "
[round(changeling.chem_charges)]
" + owner.current.hud_used?.lingchemdisplay?.maptext = "
[round(chem_charges)]
" /datum/antagonist/changeling/proc/get_dna(dna_owner) From 12b879c777a4e6347ece4bbfccd03276452de75c Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 7 Sep 2020 03:28:39 -0700 Subject: [PATCH 08/37] oh yeah xenos had handle_changeling (??) --- code/modules/mob/living/carbon/alien/life.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index d63686691d..0a2434055f 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -40,9 +40,6 @@ if(move_delay_add > 0) move_delay_add = max(0, move_delay_add - rand(1, 2)) -/mob/living/carbon/alien/handle_changeling() - return - /mob/living/carbon/alien/handle_fire()//Aliens on fire code if(..()) return From fe7a21ebc777413821f587b55cace27d7dd4cce1 Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Mon, 7 Sep 2020 22:33:54 -0500 Subject: [PATCH 09/37] Coggers Fixes + Mass Driver Things --- _maps/map_files/CogStation/CogStation.dmm | 2171 ++++++++++----------- code/game/machinery/mass_driver.dm | 11 + 2 files changed, 999 insertions(+), 1183 deletions(-) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 3c64b9f6ad..f88a891b39 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -64,8 +64,8 @@ /turf/closed/wall, /area/maintenance/port/fore) "aam" = ( -/obj/structure/table, -/obj/item/storage/box/lights/mixed, +/obj/structure/rack, +/obj/item/storage/toolbox/emergency, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -90,15 +90,13 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/solar/starboard/fore) "aap" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/closed/wall, +/area/crew_quarters/observatory) "aaq" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/emergency, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/closed/wall/r_wall, +/area/crew_quarters/observatory) "aar" = ( /obj/machinery/conveyor/auto{ dir = 8; @@ -664,14 +662,6 @@ }, /turf/open/floor/plating/airless, /area/router/aux) -"abF" = ( -/obj/machinery/mass_driver{ - dir = 8; - id = "sb_out"; - name = "Router Driver" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "abG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -709,13 +699,6 @@ /obj/item/paper/fluff/cogstation/cluwne, /turf/open/floor/plating, /area/crew_quarters/theatre/clown) -"abJ" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "sb_off" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "abK" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -819,17 +802,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"abZ" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "sb_off" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "aca" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 5; - id = "pb_off" + id = "pb" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -858,17 +834,9 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "ace" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 4; - id = "pb_off" - }, -/turf/open/floor/plating/airless, -/area/router/aux) -"acf" = ( -/obj/machinery/mass_driver{ - dir = 4; - id = "pb_out"; - name = "Router Driver" + id = "pb" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -898,9 +866,9 @@ name = "Medical Booth" }) "acj" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 4; - id = "solar_off" + id = "solar" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -973,8 +941,8 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/machinery/conveyor{ - id = "solar_off" +/obj/machinery/conveyor/auto{ + id = "solar" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -1052,25 +1020,10 @@ /obj/structure/rack, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) -"acz" = ( -/obj/machinery/mass_driver{ - dir = 4; - id = "sb_in"; - name = "Router Driver" - }, -/turf/open/floor/plating/airless, -/area/router/aux) -"acA" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "sb_off" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "acB" = ( /obj/machinery/conveyor{ dir = 6; - id = "sb_off" + id = "starboard" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -1109,9 +1062,9 @@ /turf/closed/wall, /area/crew_quarters/lounge) "acG" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "pb_off" + id = "pb" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -1142,8 +1095,8 @@ /area/crew_quarters/lounge) "acJ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/conveyor{ - id = "solar_off" +/obj/machinery/conveyor/auto{ + id = "solar" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -1297,18 +1250,11 @@ }, /turf/closed/wall/r_wall, /area/security/brig) -"adc" = ( -/obj/machinery/conveyor{ - id = "sb_off" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "add" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 6 }, -/turf/open/floor/plating, +/turf/closed/wall, /area/crew_quarters/observatory) "ade" = ( /obj/machinery/atmospherics/components/binary/valve/digital/on, @@ -1332,11 +1278,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/lounge) "adh" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 10 }, -/turf/open/floor/plating, +/turf/closed/wall, /area/crew_quarters/observatory) "adi" = ( /turf/open/floor/plasteel, @@ -1349,8 +1294,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/conveyor{ - id = "solar_off" +/obj/machinery/conveyor/auto{ + id = "solar" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -1494,9 +1439,8 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/observatory) "adG" = ( -/obj/machinery/mass_driver{ - id = "serv_in"; - name = "Router Driver" +/obj/machinery/mass_driver/pressure_plate{ + id = "hydro_in" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -1535,13 +1479,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/stairs/medium, /area/security/brig) -"adL" = ( -/obj/machinery/mass_driver{ - id = "starboard_in"; - name = "Router Driver" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "adM" = ( /turf/closed/wall, /area/crew_quarters/observatory) @@ -2671,8 +2608,9 @@ /turf/open/floor/plating, /area/construction) "agy" = ( -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/table, +/obj/item/storage/box/lights/mixed, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "agz" = ( @@ -4478,6 +4416,7 @@ /obj/structure/plasticflaps, /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ + id = "security_out"; name = "Security Router" }, /turf/open/floor/plating, @@ -4661,7 +4600,7 @@ "als" = ( /obj/machinery/mass_driver{ dir = 1; - id = "sec_out"; + id = "security_out"; name = "Router Driver" }, /turf/open/floor/plating, @@ -5525,16 +5464,15 @@ dir = 8 }, /obj/item/destTagger, -/obj/machinery/button/door{ - id = "secblock"; - name = "Router Access Control"; - pixel_x = 8; - pixel_y = 24; - req_access_txt = "1" - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/button/massdriver{ + id = "security_out"; + name = "Security Driver Control"; + pixel_x = 8; + pixel_y = 24 + }, /turf/open/floor/plasteel, /area/router/sec) "ant" = ( @@ -5817,9 +5755,9 @@ /turf/open/floor/plating, /area/maintenance/solars/port) "anW" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "sec_off" + id = "sec" }, /turf/open/floor/plating, /area/router/sec) @@ -6276,20 +6214,20 @@ "aoS" = ( /obj/structure/plasticflaps, /obj/structure/fans/tiny, -/obj/machinery/conveyor{ - id = "serv_off" - }, /obj/machinery/door/poddoor{ - id = "servblock"; + id = "hydro_in"; name = "Service Router" }, +/obj/machinery/conveyor/auto{ + id = "service" + }, /turf/open/floor/plating, /area/router/service) "aoT" = ( /obj/structure/plasticflaps, /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ - id = "servblock"; + id = "hydro_out"; name = "Service Router" }, /turf/open/floor/plating, @@ -6478,11 +6416,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/button/massdriver{ - id = "sec_out"; - pixel_x = 24; - pixel_y = 24 - }, /turf/open/floor/plasteel, /area/router/sec) "aps" = ( @@ -6792,8 +6725,8 @@ }, /area/chapel/main) "aqe" = ( -/obj/machinery/conveyor{ - id = "serv_off" +/obj/machinery/conveyor/auto{ + id = "service" }, /turf/open/floor/plating, /area/router/service) @@ -6933,7 +6866,7 @@ "aqy" = ( /obj/machinery/mass_driver{ dir = 1; - id = "serv_out"; + id = "hydro_out"; name = "Router Driver" }, /turf/open/floor/plating, @@ -7497,11 +7430,6 @@ light_color = "#ffc1c1" }, /obj/item/destTagger, -/obj/machinery/button/massdriver{ - id = "serv_out"; - pixel_x = 8; - pixel_y = -4 - }, /obj/machinery/requests_console{ department = "Service Router"; name = "Service Router RC"; @@ -7510,9 +7438,9 @@ /turf/open/floor/plasteel, /area/router/service) "arL" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "serv_off" + id = "service" }, /turf/open/floor/plating, /area/router/service) @@ -7962,12 +7890,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/button/door{ - id = "servblock"; - name = "Router Access Control"; +/obj/machinery/button/massdriver{ + id = "hydro_out"; + name = "Service Driver Control"; pixel_x = 8; - pixel_y = 24; - req_one_access_txt = "12;25;26;28;35;46" + pixel_y = 24 }, /turf/open/floor/plasteel, /area/router/service) @@ -8538,7 +8465,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/effect/landmark/xeno_spawn, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms/purple) "atZ" = ( @@ -9047,9 +8973,9 @@ dir = 8 }, /obj/machinery/turnstile{ - name = "Genpop Entrance Turnstile"; - icon_state = "turnstile_map"; dir = 8; + icon_state = "turnstile_map"; + name = "Genpop Entrance Turnstile"; req_access_txt = "69" }, /turf/open/floor/plasteel, @@ -9730,9 +9656,9 @@ name = "Brig Lockdown" }, /obj/machinery/turnstile{ - name = "Genpop Entrance Turnstile"; - icon_state = "turnstile_map"; dir = 8; + icon_state = "turnstile_map"; + name = "Genpop Entrance Turnstile"; req_access_txt = "69" }, /turf/open/floor/plasteel, @@ -10134,9 +10060,6 @@ /turf/open/floor/plasteel, /area/hydroponics) "axt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -10473,12 +10396,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, /turf/open/floor/engine, /area/engine/supermatter{ name = "Thermo-Electric Generator" @@ -11341,10 +11258,9 @@ /turf/open/floor/plasteel, /area/security/prison) "azO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/blobstart, -/turf/open/floor/plasteel, -/area/hydroponics/lobby) +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/maintenance/port/fore) "azP" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/cola/random, @@ -11515,6 +11431,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/solars/port) "aAj" = ( @@ -12941,9 +12858,6 @@ "aCZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/electricshock, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plating, /area/engine/supermatter{ name = "Thermo-Electric Generator" @@ -15408,7 +15322,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - areastring = "/area/maintenance/central"; + areastring = "/area/security/main"; dir = 1; name = "Security Office APC"; pixel_y = 24 @@ -18668,6 +18582,9 @@ }) "aOl" = ( /obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/supermatter{ name = "Thermo-Electric Generator" @@ -18988,6 +18905,9 @@ /turf/open/floor/plating, /area/crew_quarters/fitness/cogpool) "aOV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/stairs, /area/engine/supermatter{ name = "Thermo-Electric Generator" @@ -19401,7 +19321,7 @@ icon_state = "0-8" }, /turf/open/floor/plating, -/area/space/nearstation) +/area/crew_quarters/fitness/cogpool) "aPO" = ( /obj/machinery/atmospherics/pipe/manifold/supply/visible{ dir = 8 @@ -19667,16 +19587,10 @@ icon_state = "4-8" }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/crew_quarters/fitness/cogpool) "aQq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/closed/wall/r_wall, -/area/space/nearstation) +/turf/open/floor/plating/airless, +/area/crew_quarters/fitness/cogpool) "aQr" = ( /obj/structure/grille, /obj/structure/disposalpipe/segment{ @@ -19689,7 +19603,7 @@ icon_state = "0-4" }, /turf/open/floor/plating, -/area/space/nearstation) +/area/crew_quarters/lounge/jazz) "aQs" = ( /obj/machinery/firealarm{ dir = 1; @@ -20145,6 +20059,9 @@ /area/crew_quarters/heads/hop) "aRp" = ( /obj/structure/sign/warning/fire, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/closed/wall/r_wall, /area/engine/supermatter{ name = "Thermo-Electric Generator" @@ -20304,7 +20221,9 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/structure/cable, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/engine, /area/engine/supermatter{ name = "Thermo-Electric Generator" @@ -21439,6 +21358,9 @@ dir = 1; pixel_y = -26 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/engine/engineering{ name = "Engine Room" @@ -21744,10 +21666,6 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "aUR" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 8; - icon_state = "intact" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -21936,19 +21854,14 @@ dir = 8; pixel_y = -22 }, -/obj/machinery/button/massdriver{ - id = "public_out"; - pixel_x = 24; - pixel_y = -6 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/button/door{ - id = "pubblock"; - name = "Router Access Control"; +/obj/machinery/button/massdriver{ + id = "public_out"; + name = "Public Router Control"; pixel_x = 24; - pixel_y = 24 + pixel_y = -8 }, /turf/open/floor/plasteel, /area/router/public) @@ -25118,9 +25031,11 @@ /turf/open/space/basic, /area/space/nearstation) "bcc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, /turf/closed/wall/r_wall, -/area/space/nearstation) +/area/crew_quarters/lounge/jazz) "bcd" = ( /obj/item/kirbyplants{ icon_state = "plant-14" @@ -25134,8 +25049,8 @@ id = "public" }, /obj/structure/fans/tiny, -/obj/machinery/door/poddoor/preopen{ - id = "cargoblock"; +/obj/machinery/door/poddoor{ + id = "public_in"; name = "Public Router" }, /turf/open/floor/plating, @@ -25148,8 +25063,8 @@ "bcg" = ( /obj/structure/plasticflaps, /obj/structure/fans/tiny, -/obj/machinery/door/poddoor/preopen{ - id = "cargoblock"; +/obj/machinery/door/poddoor{ + id = "public_out"; name = "Public Router" }, /turf/open/floor/plating, @@ -25426,7 +25341,7 @@ dir = 5 }, /turf/closed/wall/r_wall, -/area/space/nearstation) +/area/crew_quarters/fitness/cogpool) "bcP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -25447,9 +25362,6 @@ /area/hallway/primary/central) "bcS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Courtroom" - }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/security/courtroom) @@ -25492,10 +25404,12 @@ /turf/closed/wall, /area/hallway/primary/central) "bcY" = ( -/obj/machinery/power/smes, /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/power/smes{ + charge = 5e+006 + }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload_foyer) "bcZ" = ( @@ -25775,15 +25689,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bdE" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 8; - icon_state = "intact" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/bridge) +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/grass, +/area/hydroponics/garden{ + name = "Nature Preserve" + }) "bdF" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -26013,6 +25923,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel, /area/science/mixing) "bel" = ( @@ -26079,7 +25990,7 @@ dir = 8 }, /turf/closed/wall/r_wall, -/area/space/nearstation) +/area/crew_quarters/fitness/cogpool) "bet" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -26128,7 +26039,7 @@ dir = 8 }, /turf/closed/wall/r_wall/rust, -/area/space/nearstation) +/area/crew_quarters/fitness/cogpool) "bez" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -26165,7 +26076,7 @@ dir = 10 }, /turf/closed/wall/r_wall, -/area/space/nearstation) +/area/crew_quarters/lounge/jazz) "beE" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -26173,6 +26084,10 @@ }, /obj/structure/fans/tiny, /obj/structure/plasticflaps, +/obj/machinery/door/poddoor{ + id = "starboardbelthell_in"; + name = "Belt Hell" + }, /turf/open/floor/plating, /area/maintenance/disposal) "beF" = ( @@ -26874,11 +26789,15 @@ /turf/open/space/basic, /area/space/nearstation) "bgi" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/space/basic, -/area/space) +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "bgj" = ( /obj/structure/table, /obj/item/weldingtool/mini, @@ -27474,6 +27393,7 @@ id = "sec" }, /obj/machinery/door/poddoor{ + id = "security_in"; name = "Security Router" }, /turf/open/floor/plating, @@ -27570,8 +27490,12 @@ /turf/open/floor/plasteel, /area/maintenance/department/chapel) "bhI" = ( -/turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "bhJ" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -27847,12 +27771,6 @@ /area/quartermaster/storage) "bim" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/button/massdriver{ - id = "router_in"; - name = "mass driver button (Router)"; - pixel_x = 24; - pixel_y = -8 - }, /turf/open/floor/plating, /area/maintenance/disposal) "bin" = ( @@ -27966,9 +27884,6 @@ /area/quartermaster/storage) "bix" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Courtroom" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 @@ -28112,9 +28027,10 @@ /turf/open/floor/plating, /area/maintenance/disposal) "biO" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/plating, -/area/maintenance/solars/starboard/fore) +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/brown/visible, +/turf/closed/wall/r_wall, +/area/engine/atmos) "biP" = ( /obj/machinery/light{ dir = 4; @@ -28721,6 +28637,11 @@ dir = 9; id = "mail" }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/structure/window/reinforced, /turf/open/floor/plating, /area/quartermaster/sorting) "bkc" = ( @@ -29042,6 +28963,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/engine/engineering{ name = "Engine Room" @@ -29936,10 +29860,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bmz" = ( -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/storage/primary) +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/brown/visible, +/turf/open/space/basic, +/area/space/nearstation) "bmA" = ( /obj/item/stack/tile/plasteel{ pixel_x = 10; @@ -30321,6 +30248,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/engine/break_room) "bng" = ( @@ -30448,6 +30378,9 @@ /area/crew_quarters/lounge/jazz) "bnp" = ( /obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/engine/break_room) "bnq" = ( @@ -30608,7 +30541,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/fore) "bnI" = ( @@ -31542,7 +31474,7 @@ }) "bpL" = ( /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-2" }, /turf/closed/wall/r_wall, /area/engine/engine_smes{ @@ -31555,10 +31487,7 @@ "bpN" = ( /obj/structure/grille, /obj/machinery/power/terminal, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /turf/open/floor/plating, @@ -32182,9 +32111,9 @@ }, /area/maintenance/central) "brf" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/plating, -/area/maintenance/starboard/central) +/obj/machinery/atmospherics/pipe/manifold/green/visible, +/turf/open/floor/plasteel, +/area/engine/atmos) "brg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -32770,7 +32699,6 @@ name = "Station Intercom (Common)"; pixel_x = 26 }, -/obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/maintenance/disposal) @@ -33277,8 +33205,8 @@ "bts" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/light_construct/small{ - icon_state = "bulb-construct-stage1"; - dir = 1 + dir = 1; + icon_state = "bulb-construct-stage1" }, /turf/open/floor/plasteel, /area/maintenance/aft) @@ -33519,17 +33447,21 @@ "btZ" = ( /obj/structure/plasticflaps, /obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "public_in"; + name = "Public Router" + }, /turf/open/floor/plating, /area/router) "bua" = ( /turf/closed/wall/r_wall, /area/science/robotics/mechbay) "bub" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, /obj/machinery/light, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel, /area/hallway/primary/aft) "buc" = ( @@ -33543,6 +33475,10 @@ /obj/machinery/conveyor{ id = "router_off" }, +/obj/machinery/door/poddoor{ + id = "public_out"; + name = "Public Router" + }, /turf/open/floor/plating, /area/router) "bue" = ( @@ -33644,10 +33580,9 @@ /area/maintenance/department/chapel) "bus" = ( /obj/structure/window/reinforced/spawner/east, -/obj/machinery/mass_driver{ +/obj/machinery/mass_driver/pressure_plate{ dir = 1; - id = "public_in"; - name = "Router Driver" + id = "public_in" }, /turf/open/floor/plating, /area/router) @@ -34430,17 +34365,6 @@ name = "Routing Depot RC"; pixel_y = 28 }, -/obj/machinery/button/massdriver{ - id = "eva_in"; - name = "mass driver button (EVA)"; - pixel_x = -24 - }, -/obj/machinery/button/massdriver{ - id = "public_in"; - name = "mass driver button (Public)"; - pixel_x = -24; - pixel_y = 8 - }, /turf/open/floor/plasteel, /area/router) "bwi" = ( @@ -34783,9 +34707,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "router_off" + id = "router" }, /turf/open/floor/plating, /area/router) @@ -35059,6 +34983,12 @@ pixel_x = 3; pixel_y = 1 }, +/obj/machinery/button/massdriver{ + id = "trash"; + name = "Trash Driver"; + pixel_x = -24; + pixel_y = -8 + }, /turf/open/floor/plating, /area/maintenance/disposal) "bxt" = ( @@ -35105,7 +35035,6 @@ /area/tcommsat/computer) "bxy" = ( /obj/item/trash/candle, -/obj/effect/landmark/xeno_spawn, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -35122,6 +35051,9 @@ dir = 1 }, /obj/item/paper/guides/cogstation/letter_eng, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/engine/break_room) "bxA" = ( @@ -35536,7 +35468,6 @@ /area/maintenance/starboard/central) "byu" = ( /obj/structure/disposalpipe/segment, -/obj/effect/landmark/blobstart, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plating, /area/maintenance/starboard/central) @@ -35616,11 +35547,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/button/massdriver{ - id = "eva_out"; - pixel_x = 24; - pixel_y = 24 - }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 9 }, @@ -35633,7 +35559,7 @@ }, /obj/machinery/conveyor/auto{ dir = 4; - id = "EVA" + id = "eva" }, /turf/open/floor/plating, /area/router/eva) @@ -35954,7 +35880,7 @@ dir = 4; id = "MiningConveyer" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/quartermaster/miningoffice) "bzv" = ( /obj/effect/turf_decal/stripes/line, @@ -35966,7 +35892,7 @@ id = "MiningConveyer" }, /obj/structure/plasticflaps, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/quartermaster/miningoffice) "bzw" = ( /obj/structure/disposalpipe/segment{ @@ -36032,8 +35958,8 @@ "bzD" = ( /obj/structure/plasticflaps, /obj/structure/fans/tiny, -/obj/machinery/door/poddoor/preopen{ - id = "evablock"; +/obj/machinery/door/poddoor{ + id = "eva_out"; name = "EVA Router" }, /turf/open/floor/plating, @@ -36041,17 +35967,21 @@ "bzE" = ( /obj/structure/plasticflaps, /obj/structure/fans/tiny, -/obj/machinery/conveyor{ +/obj/machinery/door/poddoor{ + id = "eva_out"; + name = "EVA Router" + }, +/obj/machinery/conveyor/auto{ dir = 4; - id = "router_off" + id = "router" }, /turf/open/floor/plating, /area/router) "bzF" = ( /obj/structure/window/reinforced/spawner, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 4; - id = "router_off" + id = "router" }, /turf/open/floor/plating, /area/router) @@ -36067,6 +35997,7 @@ "bzH" = ( /obj/structure/disposalpipe/segment, /obj/structure/grille/broken, +/obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/disposal) "bzI" = ( @@ -37032,9 +36963,12 @@ "bBE" = ( /obj/structure/grille, /obj/machinery/power/terminal, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/plating, /area/engine/engine_smes{ name = "Power Monitoring" @@ -37392,6 +37326,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/button/massdriver{ + id = "eva_out"; + name = "EVA Driver Control"; + pixel_x = 24; + pixel_y = -22 + }, /turf/open/floor/plasteel, /area/router/eva) "bCv" = ( @@ -37433,9 +37373,8 @@ dir = 4 }, /obj/effect/turf_decal/tile/yellow, -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/clothing/under/misc/overalls, /obj/structure/window/reinforced/spawner/east, +/obj/structure/closet/firecloset, /turf/open/floor/plasteel, /area/storage/primary) "bCA" = ( @@ -37471,8 +37410,8 @@ }, /obj/structure/plasticflaps, /obj/structure/fans/tiny, -/obj/machinery/door/poddoor/preopen{ - id = "evablock"; +/obj/machinery/door/poddoor{ + id = "eva_in"; name = "EVA Router" }, /turf/open/floor/plating, @@ -37561,10 +37500,9 @@ "bCR" = ( /obj/structure/window/reinforced/spawner/north, /obj/effect/turf_decal/stripes/line, -/obj/machinery/mass_driver{ +/obj/machinery/mass_driver/pressure_plate{ dir = 8; - id = "airbridge_in"; - name = "Router Driver" + id = "eva_in" }, /turf/open/floor/plating, /area/router) @@ -37580,9 +37518,9 @@ /obj/structure/window/reinforced/spawner/north, /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/sorting/mail/flip, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 8; - id = "router_off" + id = "router" }, /turf/open/floor/plating, /area/router) @@ -37636,13 +37574,13 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "bCZ" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "router_off" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/conveyor/auto{ + dir = 8; + id = "router" + }, /turf/open/floor/plating, /area/router) "bDa" = ( @@ -37909,14 +37847,14 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/conveyor{ - dir = 8; - id = "router_off" - }, /obj/structure/disposalpipe/junction/flip{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/conveyor/auto{ + dir = 8; + id = "router" + }, /turf/open/floor/plating, /area/router) "bDE" = ( @@ -38139,12 +38077,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/conveyor{ - dir = 8; - id = "router_off" - }, /obj/structure/disposalpipe/sorting/mail{ - dir = 4 + dir = 4; + sortType = 9 + }, +/obj/machinery/conveyor/auto{ + dir = 8; + id = "router" }, /turf/open/floor/plating, /area/router) @@ -38167,9 +38106,9 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 8; - id = "router_off" + id = "router" }, /turf/open/floor/plating, /area/router) @@ -38359,9 +38298,9 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 8; - id = "router_off" + id = "router" }, /turf/open/floor/plating, /area/router) @@ -38491,7 +38430,9 @@ /area/crew_quarters/bar) "bEK" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/machinery/space_heater, +/obj/machinery/space_heater{ + anchored = 1 + }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -39424,18 +39365,6 @@ pixel_x = 26 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/button/massdriver{ - id = "eng_in"; - name = "mass driver button (Engineering)"; - pixel_x = 24; - pixel_y = -8 - }, -/obj/machinery/button/massdriver{ - id = "router_out"; - name = "mass driver button (Other)"; - pixel_x = 24; - pixel_y = 12 - }, /turf/open/floor/plasteel, /area/router) "bGz" = ( @@ -39527,12 +39456,6 @@ /obj/item/clothing/gloves/color/grey, /turf/open/floor/plating, /area/maintenance/starboard/central) -"bGK" = ( -/obj/machinery/conveyor{ - id = "starboard_off" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "bGL" = ( /obj/structure/chair{ dir = 1 @@ -39574,14 +39497,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) -"bGP" = ( -/obj/machinery/mass_driver{ - dir = 1; - id = "secserv"; - name = "Router Driver" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "bGQ" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -39696,13 +39611,6 @@ name = "EVA Router APC"; pixel_x = 24 }, -/obj/machinery/button/door{ - id = "evablock"; - name = "Router Access Control"; - pixel_x = 24; - pixel_y = 10; - req_access_txt = "19" - }, /turf/open/floor/plasteel, /area/router/eva) "bHb" = ( @@ -40583,8 +40491,9 @@ /area/maintenance/department/chapel) "bIY" = ( /obj/machinery/atmospherics/pipe/simple/violet/hidden, +/obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bIZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -42717,20 +42626,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/mass_driver{ +/obj/machinery/mass_driver/pressure_plate{ dir = 4; - id = "router_out"; - name = "Router Driver" + id = "starboardbelthell_out" }, /turf/open/floor/plating, /area/router) -"bNo" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "starboard_off" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "bNp" = ( /obj/machinery/light{ dir = 1 @@ -42756,6 +42657,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/plasteel, /area/engine/atmos) "bNr" = ( @@ -43726,7 +43628,6 @@ /turf/open/space/basic, /area/space/nearstation) "bPB" = ( -/obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, @@ -43736,13 +43637,12 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bPC" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - name = "Waste In" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/atmos) "bPD" = ( @@ -43963,7 +43863,7 @@ dir = 8 }, /obj/structure/disposalpipe/sorting/mail{ - sortType = 1 + sortType = 2 }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, @@ -44382,7 +44282,6 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start/atmospheric_technician, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -45195,6 +45094,7 @@ /area/science/mixing) "bSm" = ( /obj/machinery/modular_computer/console/preset/engineering, +/obj/structure/cable/yellow, /turf/open/floor/plasteel, /area/engine/engine_smes{ name = "Power Monitoring" @@ -45207,12 +45107,12 @@ name = "Power Monitoring" }) "bSo" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/engine/engine_smes{ - name = "Power Monitoring" +/turf/open/floor/engine, +/area/engine/supermatter{ + name = "Thermo-Electric Generator" }) "bSp" = ( /obj/structure/cable{ @@ -45325,7 +45225,7 @@ }, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 1; - sortType = 11 + sortType = 9 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -45837,6 +45737,7 @@ "bTF" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/router) "bTG" = ( @@ -46008,15 +45909,15 @@ /turf/open/space/basic, /area/space/nearstation) "bUa" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Atmospherics - Entrance" }, /obj/machinery/firealarm{ pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 6 + }, /turf/open/floor/plasteel, /area/engine/atmos) "bUb" = ( @@ -47053,10 +46954,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible, /turf/open/floor/plasteel, /area/engine/atmos) "bVY" = ( @@ -47260,9 +47161,6 @@ /turf/open/floor/engine/n2o, /area/engine/atmos) "bWq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/airalarm{ dir = 8; @@ -47414,12 +47312,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/orange/visible, /turf/open/floor/plasteel, /area/engine/atmos) "bWH" = ( @@ -48037,9 +47933,9 @@ /area/maintenance/aft) "bXM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 8; - id = "router_off" + id = "router" }, /turf/open/floor/plating, /area/router) @@ -48060,11 +47956,11 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bXP" = ( -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/turf/open/floor/plasteel, +/area/engine/atmos) "bXQ" = ( /obj/structure/closet/l3closet/scientist, /obj/effect/turf_decal/tile/purple, @@ -48117,11 +48013,12 @@ name = "Research Sector" }) "bXV" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Pure to Mix" }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/turf/open/floor/plasteel, +/area/engine/atmos) "bXW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48197,11 +48094,9 @@ name = "Research Sector" }) "bYd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/closed/wall/r_wall, -/area/hallway/primary/central) +/obj/machinery/atmospherics/pipe/manifold4w/yellow/visible, +/turf/open/floor/plasteel, +/area/engine/atmos) "bYe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, @@ -48220,6 +48115,10 @@ id = "router" }, /obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "starboardbelthell_in"; + name = "Belt Hell" + }, /turf/open/floor/plating, /area/router) "bYg" = ( @@ -48576,14 +48475,15 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bYP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Distro to Waste" }, /turf/open/floor/plasteel, -/area/hallway/primary/central) +/area/engine/atmos) "bYQ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -49034,12 +48934,22 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "bZQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -30 + }, +/obj/structure/tank_dispenser{ + pixel_x = -1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engine/atmos) "bZR" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -49174,6 +49084,7 @@ /turf/open/floor/plasteel, /area/engine/break_room) "cai" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, @@ -49194,7 +49105,7 @@ "cak" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cal" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 @@ -49206,7 +49117,7 @@ "cam" = ( /obj/machinery/door/poddoor/incinerator_atmos_main, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "can" = ( /obj/machinery/power/turbine{ dir = 8 @@ -49215,7 +49126,7 @@ icon_state = "0-4" }, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cao" = ( /obj/machinery/power/compressor{ dir = 4 @@ -49227,7 +49138,7 @@ icon_state = "0-4" }, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cap" = ( /obj/structure/cable{ icon_state = "4-8" @@ -49238,7 +49149,7 @@ }, /obj/machinery/igniter/incinerator_atmos, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "caq" = ( /obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, /obj/effect/mapping_helpers/airlock/locked, @@ -49249,7 +49160,7 @@ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "car" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible, /turf/open/floor/plasteel, @@ -49263,7 +49174,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/engine/vacuum, /area/engine/atmos) "cat" = ( @@ -49273,7 +49183,7 @@ "cau" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cav" = ( /turf/closed/wall/r_wall, /area/science/explab) @@ -49545,6 +49455,7 @@ "cbe" = ( /obj/structure/table/reinforced, /obj/item/clothing/mask/gas, +/obj/effect/landmark/blobstart, /turf/open/floor/engine, /area/science/explab) "cbf" = ( @@ -49926,13 +49837,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/central) -"cbS" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "starboard_off" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "cbT" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/visible{ dir = 4 @@ -49940,28 +49844,28 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = -2; - pixel_y = -27 - }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, /turf/open/floor/plasteel, /area/engine/atmos) "cbU" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Air to Distro" - }, /obj/machinery/power/apc/highcap/ten_k{ areastring = "/area/engine/atmos"; name = "Atmospherics APC"; - pixel_y = -28 + pixel_y = -24 }, /obj/structure/cable, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/manifold/supplymain/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/vending/wardrobe/atmos_wardrobe, +/turf/open/floor/plasteel/dark, /area/engine/atmos) "cbV" = ( /obj/structure/disposalpipe/segment, @@ -50055,9 +49959,9 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "starboard_off" + id = "starboard" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -50084,9 +49988,8 @@ /area/router) "cci" = ( /obj/structure/window/reinforced/spawner/west, -/obj/machinery/mass_driver{ - id = "workshop_in"; - name = "Router Driver" +/obj/machinery/mass_driver/pressure_plate{ + id = "portbelthell_out" }, /turf/open/floor/plating, /area/router) @@ -50184,9 +50087,9 @@ /area/router/aux) "ccs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "starboard_off" + id = "starboard" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -50247,6 +50150,10 @@ id = "router" }, /obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "portbelthell_in"; + name = "Airbridge Router" + }, /turf/open/floor/plating, /area/router) "ccz" = ( @@ -50320,11 +50227,10 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "ccE" = ( -/obj/machinery/mass_driver{ - id = "eng_in"; - name = "Router Driver" - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/mass_driver/pressure_plate{ + id = "engi_in" + }, /turf/open/floor/plating, /area/router) "ccF" = ( @@ -50349,10 +50255,9 @@ /turf/open/floor/plasteel, /area/engine/atmos) "ccH" = ( -/obj/machinery/mass_driver{ +/obj/machinery/mass_driver/pressure_plate{ dir = 8; - id = "disposal_in"; - name = "Router Driver" + id = "recycle_in" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -50368,13 +50273,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"ccJ" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "starboard_off" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "ccK" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 9 @@ -50409,7 +50307,8 @@ "ccO" = ( /obj/structure/grille, /obj/structure/disposalpipe/sorting/mail{ - dir = 8 + dir = 8; + sortType = 21 }, /turf/open/floor/plating/airless, /area/router/aux) @@ -50673,10 +50572,7 @@ /turf/open/space/basic, /area/space/nearstation) "cdq" = ( -/obj/machinery/mass_driver{ - id = "sq_in"; - name = "Router Driver" - }, +/obj/machinery/mass_driver/pressure_plate, /turf/open/floor/plating/airless, /area/router/aux) "cdr" = ( @@ -50820,8 +50716,8 @@ "cdG" = ( /obj/structure/plasticflaps, /obj/structure/fans/tiny, -/obj/machinery/door/poddoor/preopen{ - id = "engblock"; +/obj/machinery/door/poddoor{ + id = "engi_out"; name = "Engineering Router" }, /turf/open/floor/plating, @@ -50961,8 +50857,8 @@ id = "eng" }, /obj/structure/fans/tiny, -/obj/machinery/door/poddoor/preopen{ - id = "engblock"; +/obj/machinery/door/poddoor{ + id = "engi_in"; name = "Engineering Router" }, /turf/open/floor/plating, @@ -51172,7 +51068,7 @@ /obj/structure/window/reinforced/spawner/east, /obj/machinery/mass_driver{ dir = 1; - id = "eng_out"; + id = "engi_out"; name = "Router Driver" }, /obj/structure/window/reinforced/spawner/west, @@ -51391,17 +51287,11 @@ dir = 1 }, /obj/machinery/button/massdriver{ - id = "eng_out"; + id = "engi_out"; + name = "Engineering Driver Control"; pixel_x = -24; pixel_y = 24 }, -/obj/machinery/button/door{ - id = "engblock"; - name = "Router Access Control"; - pixel_x = -24; - pixel_y = 32; - req_access_txt = "31" - }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, @@ -51483,12 +51373,12 @@ /turf/open/floor/plasteel, /area/router/eng) "ceU" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 9 - }, /obj/structure/fireaxecabinet{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 9 + }, /turf/open/floor/plasteel, /area/engine/atmos) "ceV" = ( @@ -51888,15 +51778,15 @@ name = "Canister Storage" }) "cfM" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-8" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/supplymain/visible{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "cfN" = ( @@ -51921,13 +51811,14 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "cfP" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Mix to Distro" + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plasteel, /area/engine/atmos) "cfQ" = ( @@ -51954,10 +51845,16 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "cfT" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible, /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Air to Mix" + }, +/obj/machinery/atmospherics/pipe/simple/brown/visible{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engine/atmos) "cfU" = ( @@ -52061,6 +51958,10 @@ id = "disposal" }, /obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "starboardbelthell_out"; + name = "Belt Hell" + }, /turf/open/floor/plating, /area/maintenance/disposal) "cge" = ( @@ -52097,20 +51998,14 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cgg" = ( -/obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 10 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible, /turf/open/floor/plasteel, /area/engine/atmos) "cgh" = ( /obj/machinery/pipedispenser, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/effect/turf_decal/stripes/end{ dir = 1 }, @@ -52260,10 +52155,12 @@ /turf/open/floor/plasteel/dark, /area/engine/teg_hot) "cgx" = ( -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engine/atmos) "cgy" = ( @@ -52271,10 +52168,10 @@ /turf/closed/wall/rust, /area/maintenance/solars/starboard/aft) "cgz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port to Filter" + }, /turf/open/floor/plasteel, /area/engine/atmos) "cgA" = ( @@ -52629,37 +52526,23 @@ name = "Nature Preserve" }) "chn" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 1 - }, /obj/machinery/light{ dir = 8 }, -/obj/machinery/power/apc{ - areastring = "/area/maintenance/disposal/incinerator"; - dir = 8; - name = "Incinerator APC"; - pixel_x = -24 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, +/obj/machinery/atmospherics/pipe/manifold4w/orange/visible, /turf/open/floor/plasteel, /area/engine/atmos) "cho" = ( /turf/closed/wall/r_wall/rust, /area/maintenance/department/eva) "chp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, /turf/open/floor/plasteel, /area/engine/atmos) "chq" = ( @@ -52712,10 +52595,10 @@ /turf/open/floor/plating, /area/maintenance/disposal) "chx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engine/atmos) "chy" = ( @@ -52826,21 +52709,21 @@ /turf/open/floor/plating, /area/engine/teg_cold) "chL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 6 + }, /turf/open/floor/plasteel, /area/engine/atmos) "chM" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/atmos) "chN" = ( @@ -52919,11 +52802,13 @@ /turf/open/floor/engine, /area/science/storage) "chS" = ( -/obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 6 + }, +/obj/machinery/portable_atmospherics/pump, /turf/open/floor/plasteel/dark, /area/engine/atmos) "chT" = ( @@ -53102,12 +52987,11 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/mass_driver{ - dir = 8; - id = "router_in"; - name = "Router Driver" - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/mass_driver/pressure_plate{ + dir = 8; + id = "starboardbelthell_in" + }, /turf/open/floor/plating, /area/maintenance/disposal) "cil" = ( @@ -53127,7 +53011,7 @@ "cim" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 1; - sortType = 11 + sortType = 9 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -53150,11 +53034,10 @@ /turf/closed/wall, /area/science/robotics/mechbay) "cip" = ( -/obj/machinery/mass_driver{ - id = "cargo_in"; - name = "Router Driver" - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/mass_driver/pressure_plate{ + id = "cargo_in" + }, /turf/open/floor/plating, /area/maintenance/disposal) "ciq" = ( @@ -53187,6 +53070,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/port/fore) "ciu" = ( @@ -53242,7 +53126,7 @@ "ciB" = ( /obj/structure/frame/computer, /obj/structure/disposalpipe/segment, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/port/fore) "ciC" = ( /obj/structure/table, @@ -53280,12 +53164,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "ciG" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "disposal_off" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/maintenance/disposal) +/turf/closed/wall/r_wall, +/area/engine/engineering{ + name = "Engine Room" + }) "ciH" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 6 @@ -53351,10 +53236,9 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/kitchen) "ciO" = ( -/obj/machinery/mass_driver{ +/obj/machinery/mass_driver/pressure_plate{ dir = 4; - id = "disposal_out"; - name = "Router Driver" + id = "recycle_out" }, /turf/open/floor/plating, /area/maintenance/disposal) @@ -53487,7 +53371,8 @@ /obj/structure/fans/tiny, /obj/structure/plasticflaps, /obj/machinery/door/poddoor{ - name = "Disposal Router" + id = "recycle_out"; + name = "Belt Hell" }, /turf/open/floor/plating, /area/maintenance/disposal) @@ -53539,6 +53424,10 @@ dir = 1; id = "disposal" }, +/obj/machinery/door/poddoor{ + id = "cargo_out"; + name = "Cargo Router" + }, /turf/open/floor/plating, /area/maintenance/disposal) "cjj" = ( @@ -53897,9 +53786,6 @@ /area/engine/teg_cold) "cjV" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Engineering Sector" - }, /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ dir = 4 @@ -53929,8 +53815,8 @@ /obj/machinery/button/door{ id = "hos"; name = "HoS Office Shutters"; - pixel_y = -32; - pixel_x = -5 + pixel_x = -5; + pixel_y = -32 }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hos) @@ -55207,8 +55093,8 @@ "cmH" = ( /obj/structure/plasticflaps, /obj/structure/fans/tiny, -/obj/machinery/door/poddoor/preopen{ - id = "cargoblock"; +/obj/machinery/door/poddoor{ + id = "cargo_out"; name = "Cargo Router" }, /turf/open/floor/plating, @@ -55275,14 +55161,18 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "cmL" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/maintenance/aft) +/obj/machinery/light, +/obj/machinery/suit_storage_unit/atmos, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engine/atmos) "cmM" = ( /obj/structure/sign/poster/official/safety_internals{ pixel_x = -32 }, -/obj/effect/landmark/blobstart, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cmN" = ( @@ -55421,6 +55311,9 @@ /area/quartermaster/qm) "cmX" = ( /obj/machinery/light/small, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/supermatter{ name = "Thermo-Electric Generator" @@ -55535,9 +55428,11 @@ /turf/open/floor/plasteel, /area/engine/teg_cold) "cni" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port to Fuel Pipe" + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "cnj" = ( /obj/machinery/camera{ c_tag = "Research - Observatory"; @@ -55570,7 +55465,6 @@ dir = 1; pixel_x = 5 }, -/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "cnm" = ( @@ -55646,7 +55540,8 @@ id = "disposal" }, /obj/machinery/door/poddoor{ - name = "Disposal Router" + id = "recycle_in"; + name = "Belt Hell" }, /turf/open/floor/plating, /area/maintenance/disposal) @@ -55815,14 +55710,6 @@ /obj/item/target/clown, /turf/open/floor/plasteel, /area/science/mixing) -"cnM" = ( -/obj/machinery/mass_driver{ - dir = 8; - id = "pb_in"; - name = "Router Driver" - }, -/turf/open/floor/plating/airless, -/area/router/aux) "cnN" = ( /obj/structure/bookcase/random/fiction, /obj/effect/turf_decal/tile/neutral, @@ -56008,13 +55895,15 @@ name = "Electrical Substation" }) "coh" = ( -/obj/machinery/power/smes, /obj/structure/cable{ icon_state = "0-4" }, /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/power/smes{ + charge = 5e+006 + }, /turf/open/floor/plating, /area/engine/storage_shared{ name = "Electrical Substation" @@ -56203,8 +56092,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) @@ -56248,7 +56137,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden, +/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden, /turf/open/floor/plasteel, /area/hallway/primary/aft) "coE" = ( @@ -56679,8 +56568,8 @@ id = "cargo" }, /obj/structure/fans/tiny, -/obj/machinery/door/poddoor/preopen{ - id = "cargoblock"; +/obj/machinery/door/poddoor{ + id = "cargo_in"; name = "Cargo Router" }, /turf/open/floor/plating, @@ -56792,6 +56681,10 @@ "cpE" = ( /obj/structure/fans/tiny, /obj/structure/plasticflaps, +/obj/machinery/door/poddoor{ + id = "cargo_in"; + name = "Cargo Router" + }, /turf/open/floor/plating, /area/maintenance/disposal) "cpF" = ( @@ -56901,12 +56794,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 6 + }, /turf/open/floor/plasteel/dark, /area/engine/atmos) "cpO" = ( /obj/structure/closet/secure_closet/atmospherics, /obj/item/cartridge/atmos, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engine/atmos) "cpP" = ( @@ -56917,14 +56816,12 @@ /turf/open/floor/plasteel/white, /area/gateway) "cpQ" = ( -/obj/machinery/vending/wardrobe/atmos_wardrobe, /obj/effect/turf_decal/stripes/line{ dir = 6; layer = 2.03 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/orange/visible, +/obj/machinery/portable_atmospherics/pump, /turf/open/floor/plasteel/dark, /area/engine/atmos) "cpR" = ( @@ -57238,6 +57135,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/engine/break_room) "cqt" = ( @@ -57260,6 +57160,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/engine/break_room) "cqv" = ( @@ -57273,6 +57176,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/engine/break_room) "cqw" = ( @@ -57617,11 +57523,6 @@ name = "\improper KEEP CLEAR: HIGH SPEED DELIVERIES"; pixel_y = 32 }, -/obj/machinery/button/massdriver{ - id = "cargo_out"; - pixel_x = -8; - pixel_y = -4 - }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "cre" = ( @@ -58608,9 +58509,9 @@ /obj/machinery/button/door{ id = "robotics"; name = "Shutters Control Button"; + pixel_x = -24; pixel_y = 8; - req_access_txt = "29"; - pixel_x = -24 + req_access_txt = "29" }, /turf/open/floor/plasteel/dark/side{ dir = 8 @@ -58648,8 +58549,6 @@ dir = 8; light_color = "#e8eaff" }, -/obj/effect/landmark/blobstart, -/obj/effect/landmark/xeno_spawn, /turf/open/floor/engine, /area/science/explab) "ctc" = ( @@ -58998,6 +58897,10 @@ /area/science/explab) "ctJ" = ( /obj/structure/plasticflaps, +/obj/machinery/door/poddoor{ + id = "portbelthell_in"; + name = "Airbridge Router" + }, /turf/open/floor/plating, /area/engine/workshop) "ctK" = ( @@ -59005,6 +58908,10 @@ /obj/machinery/conveyor{ id = "workshop_off" }, +/obj/machinery/door/poddoor{ + id = "portbelthell_out"; + name = "Airbridge Router" + }, /turf/open/floor/plating, /area/engine/workshop) "ctL" = ( @@ -59474,7 +59381,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/crew_quarters/fitness/cogpool) "cuy" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -59685,17 +59592,16 @@ /area/router/air) "cuS" = ( /obj/structure/window/reinforced/spawner/east, -/obj/machinery/mass_driver{ +/obj/machinery/mass_driver/pressure_plate{ dir = 1; - id = "workshop_out"; - name = "Router Driver" + id = "portbelthell_in" }, /turf/open/floor/plating, /area/engine/workshop) "cuT" = ( /obj/structure/window/reinforced/spawner/west, -/obj/machinery/conveyor{ - id = "workshop_off" +/obj/machinery/conveyor/auto{ + id = "airbridge" }, /turf/open/floor/plating, /area/engine/workshop) @@ -59908,9 +59814,9 @@ /area/router/air) "cvq" = ( /obj/structure/window/reinforced/spawner/east, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "workshop_off" + id = "airbridge" }, /turf/open/floor/plating, /area/engine/workshop) @@ -60422,12 +60328,11 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/button/door{ - id = "cargoblock"; - name = "Router Access Control"; +/obj/machinery/button/massdriver{ + id = "cargo_out"; + name = "Cargo Driver Control"; pixel_x = -24; - pixel_y = 24; - req_access_txt = "31" + pixel_y = 24 }, /turf/open/floor/plasteel, /area/quartermaster/sorting) @@ -60587,6 +60492,9 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/engine/engine_smes{ name = "Power Monitoring" @@ -60894,6 +60802,7 @@ /obj/machinery/airalarm{ pixel_y = 24 }, +/obj/structure/cable/yellow, /turf/open/floor/plasteel, /area/engine/engine_smes{ name = "Power Monitoring" @@ -66167,15 +66076,16 @@ }, /obj/machinery/button/massdriver{ id = "airbridge_out"; + name = "Airbridge Driver Control"; pixel_x = -8; pixel_y = 24 }, /turf/open/floor/plasteel, /area/router/air) "cGa" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 4; - id = "airbridge_off" + id = "router" }, /turf/open/floor/plating, /area/router/air) @@ -66261,9 +66171,9 @@ /area/medical/medbay/central) "cGf" = ( /obj/structure/window/reinforced/spawner, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 4; - id = "airbridge_off" + id = "router" }, /turf/open/floor/plating, /area/router/air) @@ -66273,9 +66183,9 @@ dir = 1 }, /obj/structure/window/reinforced/spawner, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 4; - id = "airbridge_off" + id = "router" }, /turf/open/floor/plating, /area/router/air) @@ -66287,7 +66197,7 @@ /obj/structure/window/reinforced/spawner, /obj/machinery/mass_driver{ dir = 4; - id = "airbridge_in"; + id = "airbridge_out"; name = "Router Driver" }, /turf/open/floor/plating, @@ -66730,7 +66640,6 @@ /turf/open/floor/engine, /area/science/storage) "cGW" = ( -/obj/effect/landmark/blobstart, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -67029,7 +66938,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/landmark/blobstart, /obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 4 }, @@ -67284,6 +67192,7 @@ /obj/structure/plasticflaps, /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ + id = "airbridge_out"; name = "Airbridge Router" }, /turf/open/floor/plating, @@ -67326,7 +67235,6 @@ /turf/open/floor/plating, /area/maintenance/aft) "cId" = ( -/obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 5 }, @@ -67363,17 +67271,21 @@ /area/medical/genetics) "cIh" = ( /obj/structure/plasticflaps, -/obj/machinery/conveyor{ +/obj/machinery/door/poddoor{ + id = "airbridge_out"; + name = "Airbridge Router" + }, +/obj/machinery/conveyor/auto{ dir = 4; - id = "workshop_off" + id = "router" }, /turf/open/floor/plating, /area/engine/workshop) "cIi" = ( /obj/structure/window/reinforced/spawner, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 4; - id = "workshop_off" + id = "router" }, /turf/open/floor/plating, /area/engine/workshop) @@ -67473,9 +67385,9 @@ "cIq" = ( /obj/structure/window/reinforced/spawner, /obj/structure/window/reinforced/spawner/east, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "workshop_off" + id = "airbridge" }, /turf/open/floor/plating, /area/engine/workshop) @@ -67502,13 +67414,13 @@ name = "Atmospherics"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/atmos) "cIt" = ( @@ -67737,9 +67649,6 @@ /area/hallway/primary/aft) "cIN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Engineering Sector" - }, /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ dir = 4 @@ -68040,17 +67949,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"cJo" = ( -/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white/corner, -/area/engine/atmos) "cJp" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 @@ -68103,14 +68001,10 @@ /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "cJu" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Mix to Engine" }, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmos) "cJv" = ( @@ -68256,14 +68150,9 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "cJH" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 + dir = 9 }, -/obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmos) "cJI" = ( @@ -68982,11 +68871,12 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Unfiltered & Air to Mix" }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/brown/visible{ + dir = 8 }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -69016,10 +68906,10 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/violet/visible, /obj/structure/extinguisher_cabinet{ pixel_y = 29 }, +/obj/machinery/atmospherics/pipe/simple/violet/visible, /turf/open/floor/plasteel, /area/engine/atmos) "cLh" = ( @@ -69075,7 +68965,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "cLn" = ( @@ -69262,8 +69151,8 @@ /area/router/air) "cLK" = ( /obj/structure/window/reinforced/spawner/north, -/obj/machinery/conveyor{ - id = "airbridge_off" +/obj/machinery/conveyor/auto{ + id = "airbridge" }, /turf/open/floor/plating, /area/router/air) @@ -69289,9 +69178,9 @@ /area/medical/virology) "cLO" = ( /obj/structure/window/reinforced/spawner/north, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 8; - id = "airbridge_off" + id = "airbridge" }, /turf/open/floor/plating, /area/router/air) @@ -69328,6 +69217,7 @@ id = "airbridge_off" }, /obj/machinery/door/poddoor{ + id = "airbridge_in"; name = "Airbridge Router" }, /turf/open/floor/plating, @@ -69338,10 +69228,9 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/mass_driver{ +/obj/machinery/mass_driver/pressure_plate{ dir = 8; - id = "workshop_in"; - name = "Router Driver" + id = "airbridge_in" }, /turf/open/floor/plating, /area/engine/workshop) @@ -69363,8 +69252,8 @@ /turf/open/floor/plating/airless, /area/medical/virology) "cLV" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Waste to Filter" }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -69381,19 +69270,13 @@ dir = 6 }, /turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cLY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output{ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) -"cLZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cMa" = ( /obj/machinery/light/small{ dir = 1; @@ -69404,21 +69287,17 @@ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cMb" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "cMc" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 9 - }, /turf/open/floor/plasteel, /area/engine/atmos) "cMd" = ( @@ -69451,9 +69330,10 @@ /turf/open/floor/plasteel, /area/engine/atmos) "cMi" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/structure/closet/firecloset, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ + dir = 1 + }, +/turf/open/floor/plating/airless, /area/engine/atmos) "cMj" = ( /obj/structure/cable{ @@ -69463,7 +69343,7 @@ dir = 1 }, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cMk" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -69527,7 +69407,7 @@ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cMu" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -69535,7 +69415,7 @@ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/maintenance/disposal/incinerator) +/area/engine/atmos) "cMv" = ( /obj/machinery/button/door/incinerator_vent_atmos_main{ pixel_x = -24; @@ -69545,29 +69425,27 @@ pixel_x = -40; pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engine/atmos) "cMw" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - name = "Waste Release" - }, +/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, /turf/open/floor/plasteel, /area/engine/atmos) "cMx" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 5 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -30 }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 5 + }, /turf/open/floor/plasteel, /area/engine/atmos) "cMy" = ( @@ -69659,14 +69537,20 @@ /turf/open/floor/plasteel/white/corner, /area/engine/atmos) "cMG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) +/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "cMH" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, -/turf/closed/wall/r_wall, +/obj/machinery/suit_storage_unit/atmos, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/engine/atmos) "cMI" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -69717,13 +69601,12 @@ /turf/open/floor/plating, /area/engine/atmos) "cMP" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supplymain/visible{ dir = 4 }, -/turf/open/floor/plating/airless, +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, /area/engine/atmos) "cMQ" = ( /obj/structure/lattice, @@ -69755,16 +69638,16 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 8; - id = "workshop_off" + id = "airbridge" }, /turf/open/floor/plating, /area/engine/workshop) "cMV" = ( -/obj/machinery/conveyor{ - dir = 10; - id = "workshop_off" +/obj/machinery/conveyor/auto{ + dir = 8; + id = "airbridge" }, /turf/open/floor/plating, /area/engine/workshop) @@ -69943,17 +69826,10 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/router/air) -"cNm" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "airbridge_off" - }, -/turf/open/floor/plating, -/area/router/air) "cNn" = ( -/obj/machinery/conveyor{ - dir = 10; - id = "airbridge_off" +/obj/machinery/conveyor/auto{ + dir = 8; + id = "airbridge" }, /turf/open/floor/plating, /area/router/air) @@ -70359,6 +70235,7 @@ icon_state = "2-4" }, /obj/effect/landmark/event_spawn, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cOr" = ( @@ -70499,6 +70376,12 @@ dir = 4; pixel_x = -22 }, +/obj/machinery/button/massdriver{ + id = "research_out"; + name = "Medsci Driver Control"; + pixel_x = -24; + pixel_y = -24 + }, /turf/open/floor/plasteel, /area/router/medsci) "cOF" = ( @@ -70527,8 +70410,8 @@ /turf/closed/wall/r_wall, /area/router/medsci) "cOJ" = ( -/obj/machinery/conveyor{ - id = "medsci_off" +/obj/machinery/conveyor/auto{ + id = "medsci" }, /turf/open/floor/plating, /area/router/medsci) @@ -70538,11 +70421,6 @@ /obj/item/hand_labeler, /obj/item/destTagger, /obj/machinery/light, -/obj/machinery/button/massdriver{ - id = "medsci_out"; - pixel_x = -8; - pixel_y = 8 - }, /obj/machinery/requests_console{ department = "MedSci Router"; name = "MedSci Router RC"; @@ -70551,9 +70429,9 @@ /turf/open/floor/plating, /area/router/medsci) "cOL" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "medsci_off" + id = "medsci" }, /turf/open/floor/plating, /area/router/medsci) @@ -70579,7 +70457,7 @@ /area/janitor/aux) "cOP" = ( /obj/machinery/mass_driver{ - id = "medsci_out"; + id = "research_out"; name = "Router Driver" }, /turf/open/floor/plating, @@ -70649,6 +70527,7 @@ /obj/structure/plasticflaps, /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ + id = "research_out"; name = "MedSci Router" }, /turf/open/floor/plating, @@ -70657,11 +70536,12 @@ /obj/structure/plasticflaps, /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ + id = "research_in"; name = "MedSci Router" }, -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "medsci_off" + id = "medsci" }, /turf/open/floor/plating, /area/router/medsci) @@ -70691,6 +70571,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel, /area/janitor/aux) "cOX" = ( @@ -70768,100 +70649,88 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "cPd" = ( -/obj/machinery/conveyor{ - id = "sq_off" +/obj/machinery/conveyor/auto{ + id = "starboard" }, /turf/open/floor/plating/airless, /area/router/aux) "cPe" = ( -/obj/machinery/mass_driver{ - dir = 1; - id = "sq_out"; - name = "Router Driver" +/obj/machinery/mass_driver/pressure_plate{ + dir = 1 }, /turf/open/floor/plating/airless, /area/router/aux) -"cPf" = ( -/obj/machinery/conveyor/auto, -/turf/open/floor/plating/airless, -/area/router/aux) "cPg" = ( -/obj/machinery/mass_driver{ +/obj/machinery/mass_driver/pressure_plate{ dir = 1; - id = "medsci_in"; - name = "Router Driver" + id = "research_in" }, /turf/open/floor/plating/airless, /area/router/aux) "cPh" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "sq_off" + id = "starboard" }, /turf/open/floor/plating/airless, /area/router/aux) "cPi" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 1; - id = "viro_off" + id = "pq" }, /turf/open/floor/plating/airless, /area/router/aux) "cPj" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 9; - id = "viro_off" + id = "medsci" }, /turf/open/floor/plating/airless, /area/router/aux) "cPk" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 8; - id = "viro_off" + id = "medsci" }, /turf/open/floor/plating/airless, /area/router/aux) "cPl" = ( -/obj/machinery/mass_driver{ - dir = 8; - id = "viro_in"; - name = "Router Driver" +/obj/machinery/mass_driver/pressure_plate{ + dir = 8 }, /turf/open/floor/plating/airless, /area/router/aux) "cPm" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 8; - id = "sq_off" + id = "starboard" }, /turf/open/floor/plating/airless, /area/router/aux) "cPn" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 10; - id = "sq_off" + id = "starboard" }, /turf/open/floor/plating/airless, /area/router/aux) "cPo" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "viro_off" +/obj/machinery/conveyor/auto{ + id = "pq" }, /turf/open/floor/plating/airless, /area/router/aux) "cPp" = ( -/obj/machinery/mass_driver{ - dir = 4; - id = "viro_out"; - name = "Router Driver" +/obj/machinery/mass_driver/pressure_plate{ + dir = 4 }, /turf/open/floor/plating/airless, /area/router/aux) "cPq" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/auto{ dir = 4; - id = "sq_off" + id = "starboard" }, /turf/open/floor/plating/airless, /area/router/aux) @@ -71867,7 +71736,7 @@ id = "MiningConveyorBlastDoor"; name = "Asteroid Mining Load Door" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/quartermaster/miningoffice) "cRb" = ( /obj/machinery/computer/cloning, @@ -71932,13 +71801,7 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/visible{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light, -/turf/open/floor/plasteel/white/corner, +/turf/open/floor/plasteel, /area/engine/atmos) "cRh" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ @@ -71972,8 +71835,8 @@ /obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000; - pixel_y = 3; - pixel_x = 4 + pixel_x = 4; + pixel_y = 3 }, /obj/item/stock_parts/cell/high{ charge = 100; @@ -72137,29 +72000,41 @@ name = "Medbay Treatment Center" }) "cVq" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, /turf/open/floor/plasteel, -/area/engine/atmos) +/area/hallway/primary/aft) "cVO" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/plasteel, /area/engine/atmos) "dpO" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ dir = 4 }, /turf/open/floor/plasteel, /area/engine/atmos) +"dwH" = ( +/obj/structure/plasticflaps, +/obj/machinery/conveyor/auto{ + dir = 1; + id = "router" + }, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "engi_out"; + name = "Engineering Router" + }, +/turf/open/floor/plating, +/area/router) "dVR" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, -/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/violet/visible, /turf/open/floor/plasteel, /area/engine/atmos) "dYm" = ( @@ -72170,12 +72045,12 @@ /turf/open/floor/engine, /area/science/storage) "eCy" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 9 + }, /turf/open/floor/plasteel, /area/engine/atmos) "eIh" = ( @@ -72194,13 +72069,15 @@ }, /area/engine/atmos) "eKM" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -30 - }, /obj/machinery/atmospherics/pipe/manifold/supplymain/visible, /turf/open/floor/plasteel, /area/engine/atmos) +"eSd" = ( +/obj/machinery/mass_driver/pressure_plate{ + id = "security_in" + }, +/turf/open/floor/plating/airless, +/area/router/aux) "eTZ" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -72208,10 +72085,9 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/manifold/brown/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/plasteel, /area/engine/atmos) "eUF" = ( @@ -72238,24 +72114,25 @@ /turf/open/floor/plasteel, /area/engine/atmos) "fkx" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 }, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel, -/area/engine/atmos) +/area/hallway/primary/aft) "fti" = ( -/obj/machinery/atmospherics/components/binary/pump, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 8 }, /turf/open/floor/plasteel, /area/engine/atmos) "fui" = ( -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 4 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 }, -/turf/open/space/basic, -/area/space) +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "fuE" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -72271,32 +72148,22 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"fIw" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/plasteel, -/area/engine/atmos) "guK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/space/basic, /area/space) "gDY" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Fuel Pipe to Incinerator" - }, /obj/machinery/light, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 }, /turf/open/floor/plasteel, /area/engine/atmos) "gGG" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 5 }, /turf/open/space/basic, /area/space/nearstation) @@ -72330,24 +72197,15 @@ /turf/open/floor/plasteel, /area/tcommsat/computer) "hlo" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/obj/machinery/meter, +/obj/effect/landmark/blobstart, /turf/open/floor/plasteel, -/area/engine/atmos) +/area/quartermaster/miningdock/airless) "hlV" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/storage/tech) "hDz" = ( -/obj/machinery/space_heater, -/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, /area/engine/atmos) "hFa" = ( @@ -72358,19 +72216,10 @@ /turf/open/floor/engine, /area/science/storage) "hKC" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) -"hMZ" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Pure to Port" +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/plasteel, /area/engine/atmos) "hXk" = ( @@ -72384,17 +72233,10 @@ /obj/machinery/atmospherics/pipe/manifold/orange/visible, /turf/open/space/basic, /area/space/nearstation) -"iAW" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) "iQY" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 4 }, -/obj/structure/closet/firecloset, /turf/open/floor/plasteel, /area/engine/atmos) "jiZ" = ( @@ -72403,19 +72245,8 @@ }, /turf/closed/wall/r_wall, /area/engine/atmos) -"jml" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - layer = 2.4 - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/plasteel, -/area/engine/atmos) "jon" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ +/obj/machinery/atmospherics/pipe/simple/violet/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -72435,16 +72266,6 @@ /area/engine/secure_construction{ name = "Engineering Construction Area" }) -"jXo" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 10 - }, -/turf/closed/wall/r_wall, -/area/engine/atmos) -"kxw" = ( -/obj/machinery/atmospherics/pipe/simple/violet/visible, -/turf/open/space/basic, -/area/space) "kzb" = ( /obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 4 @@ -72455,16 +72276,12 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix to Engine" - }, +/obj/machinery/atmospherics/pipe/simple/violet/visible, /turf/open/floor/plasteel, /area/engine/atmos) "lcD" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Air to Port" +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1 }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -72472,8 +72289,9 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Mix to Filter" }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -72487,7 +72305,10 @@ name = "Engine Room" }) "mqB" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Air to Ports" + }, /turf/open/floor/plasteel, /area/engine/atmos) "mxW" = ( @@ -72497,13 +72318,12 @@ }, /turf/open/space/basic, /area/space/nearstation) -"mBP" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/plasteel, -/area/science/mixing) "mEa" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, -/obj/machinery/meter, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Air to Distro" + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plasteel, /area/engine/atmos) "mIm" = ( @@ -72530,36 +72350,14 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/tcommsat/computer) -"mNN" = ( -/obj/machinery/space_heater, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) -"ntC" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Fuel Pipe" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) "nvn" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, /turf/open/floor/plasteel, /area/engine/atmos) "nAF" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Mix to Port" - }, +/obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, /area/engine/atmos) "nBM" = ( @@ -72570,26 +72368,9 @@ }, /turf/open/floor/plating, /area/engine/atmos) -"nEX" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) -"nLV" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/atmos) "ony" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/manifold/brown/visible{ dir = 4 }, /turf/open/floor/plating, @@ -72618,6 +72399,13 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/plasteel, /area/engine/atmos) +"pZq" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8; + sortType = 12 + }, +/turf/open/floor/plating/airless, +/area/router/aux) "qeq" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -72625,41 +72413,72 @@ }, /turf/open/space/basic, /area/space/nearstation) -"qgO" = ( -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plasteel, -/area/engine/atmos) "qlJ" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supplymain/visible, /turf/open/space/basic, /area/space/nearstation) -"qvB" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater{ - dir = 8 +"qGi" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/engine/atmos) +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/closed/wall/r_wall, +/area/engine/engine_smes{ + name = "Power Monitoring" + }) "qHL" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/brown/visible{ + dir = 6 }, /turf/open/floor/plating, /area/engine/atmos) -"qWY" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Waste In" +"qMN" = ( +/obj/structure/plasticflaps, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "starboardbelthell_out"; + name = "Belt Hell" }, +/turf/open/floor/plating, +/area/router) +"qWY" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plasteel, /area/engine/atmos) "rdF" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel, /area/engine/atmos) +"rke" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/closed/wall/r_wall, +/area/engine/engine_smes{ + name = "Power Monitoring" + }) +"rqk" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/closed/wall/r_wall, +/area/engine/engine_smes{ + name = "Power Monitoring" + }) +"rOE" = ( +/obj/structure/plasticflaps, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "eva_in"; + name = "EVA Router" + }, +/turf/open/floor/plating, +/area/router) "rTW" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/violet/visible{ @@ -72673,22 +72492,28 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"sdp" = ( -/obj/structure/reagent_dispensers/foamtank, -/turf/open/floor/engine, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) -"sHB" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 4 +"sky" = ( +/obj/machinery/conveyor/auto{ + dir = 4; + id = "pq" }, +/turf/open/floor/plating/airless, +/area/router/aux) +"sAm" = ( +/obj/structure/plasticflaps, +/obj/machinery/door/poddoor{ + id = "airbridge_out"; + name = "Airbridge Router" + }, +/turf/open/floor/plating, +/area/engine/workshop) +"sHB" = ( +/obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/plasteel, /area/engine/atmos) "sRD" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 5 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plasteel, /area/engine/atmos) "sVC" = ( @@ -72699,6 +72524,15 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/visible, /turf/open/space/basic, /area/space/nearstation) +"tff" = ( +/obj/structure/plasticflaps, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "portbelthell_out"; + name = "Airbridge Router" + }, +/turf/open/floor/plating, +/area/router) "tjb" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -72714,12 +72548,15 @@ /obj/machinery/atmospherics/pipe/simple/violet/visible, /turf/open/space/basic, /area/space/nearstation) -"tuF" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 6 +"tsU" = ( +/obj/structure/plasticflaps, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "engi_in"; + name = "Engineering Router" }, -/turf/closed/wall/r_wall, -/area/engine/atmos) +/turf/open/floor/plating, +/area/router) "tyI" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/visible{ dir = 4 @@ -72728,36 +72565,28 @@ /area/engine/atmos) "tXV" = ( /obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - layer = 2.4 + name = "Pure to Ports" }, /turf/open/floor/plasteel, /area/engine/atmos) "tZj" = ( -/obj/structure/tank_dispenser{ - pixel_x = -1 - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/manifold/general/visible, /turf/open/floor/plasteel, /area/engine/atmos) "tZC" = ( -/obj/machinery/atmospherics/pipe/manifold4w/orange/visible, -/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/orange/visible{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "urj" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 8; - icon_state = "intact" - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 4 }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/dark, /area/bridge) "uwK" = ( @@ -72778,27 +72607,18 @@ /turf/open/floor/plasteel, /area/engine/atmos) "uVD" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/brown/visible{ + dir = 9 }, /turf/open/floor/plasteel, /area/engine/atmos) "vcb" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/brown/visible, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 }, /turf/open/floor/plasteel, /area/engine/atmos) -"vsO" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/closed/wall/r_wall, -/area/engine/atmos) "vxU" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/structure/extinguisher_cabinet{ @@ -72818,7 +72638,9 @@ /turf/open/space/basic, /area/space/nearstation) "wWH" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/components/unary/thermomachine/heater{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "xcO" = ( @@ -72828,24 +72650,8 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/pump{ - dir = 0; - name = "Mix Outlet Pump" - }, -/turf/open/floor/plasteel, -/area/engine/atmos) -"xjk" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) -"xkC" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 + name = "Mix to Ports" }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -72862,9 +72668,8 @@ /turf/closed/wall, /area/quartermaster/storage) "xCy" = ( -/obj/machinery/atmospherics/components/binary/pump, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/violet/visible{ + dir = 9 }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -92048,7 +91853,7 @@ aaa aaa bcy bdf -mBP +bdf crJ blT bqJ @@ -92763,7 +92568,7 @@ auL aAc aGq aJX -bdE +cQQ cen aGq cvK @@ -95885,7 +95690,7 @@ bhS beJ beJ bGI -bXP +aaU aaa aaa aaa @@ -96142,7 +95947,7 @@ bdg beJ beJ bGI -bXV +aaU aaa aaa aaa @@ -96399,7 +96204,7 @@ bdg beJ ceI bGI -bXV +aaU aaa aaa aaa @@ -96656,7 +96461,7 @@ bdg cmd beT bGI -bXV +aaU aaa aaa aaa @@ -96913,7 +96718,7 @@ bdg beJ bfd bdg -bXV +aaU aaa aaa ceD @@ -97170,7 +96975,7 @@ bdg beJ bfd bdg -bXV +aaU aaa bdg buB @@ -97427,7 +97232,7 @@ bdg caW bJy bdg -bXV +aaU aaU bdg bjg @@ -97684,7 +97489,7 @@ bdg beJ bfd bGI -bYd +bGI bGI bGI bzb @@ -97941,7 +97746,7 @@ beJ beJ bfd blc -bYP +beJ coS aXc aXc @@ -98116,7 +97921,7 @@ aak aak aak aak -aak +eSd aaa aaa aaa @@ -98198,7 +98003,7 @@ bzB bgA bWf bXm -bZQ +bgA bWq ccN cei @@ -98263,10 +98068,10 @@ aaa aaa aaa aaa -cPf -cPf -cPf -cPf +cPo +cPo +cPo +cPo cPo abp aaa @@ -98524,7 +98329,7 @@ abM abR abM abM -cPo +sky aaU aaa aaa @@ -98781,7 +98586,7 @@ cPg cPi cPj abR -cPo +sky aaU aaa aaa @@ -99038,7 +98843,7 @@ aaa aaa cPk abR -cPo +sky aaU aaa aaa @@ -99399,7 +99204,7 @@ aaa aaU aar abM -acf +cPp aaU aaa aaa @@ -99661,12 +99466,12 @@ aaU aaa aaa aaa +adM adj adj adj adj -adj -adj +adM aaU aaU aaa @@ -99918,12 +99723,12 @@ aaU aaa aaa aaa -adj +adM aeC afv adF agM -adj +adM aaa aaU aaU @@ -100175,12 +99980,12 @@ aaU aaa aaa aaa -adj +adM aeR afx aga afI -adj +adM aaa aaa aaU @@ -100432,20 +100237,20 @@ aaU add adC adC -adC +aap aeS adj adj agN +aiX ahL ahL -ahL -ahL +aaq afD afQ age age -agy +age age age afC @@ -100697,8 +100502,8 @@ aad aad aad aad -adM -aaj +aiM +agy aaI ami akX @@ -100955,7 +100760,7 @@ aad aad aad aiM -aaj +azO aaI aco akX @@ -101020,7 +100825,7 @@ bRf cCG cCH cCG -bUw +bgi bVJ cCG bWF @@ -101277,7 +101082,7 @@ bcf bcf bCs bcf -bwU +bhI bCD bcf bcf @@ -101469,7 +101274,7 @@ aad aad aad aiM -aap +aco abd abT akX @@ -101725,8 +101530,8 @@ aad aad aad aad -adM -aaq +aiM +aco aaI acF akX @@ -101982,7 +101787,7 @@ agO adj adj adj -adM +aiM aat abf acF @@ -103105,7 +102910,7 @@ aaa cuR cGa cuR -cNm +cNn cuR cIH cgv @@ -103927,7 +103732,7 @@ aaa aaa aaa aaa -aaa +cpB ckl ckl ckl @@ -105619,7 +105424,7 @@ aYi baU bdh aOJ -aog +bdE aog axV aHV @@ -106149,7 +105954,7 @@ aaU aaa btT bzE -btZ +rOE btT aaa aaa @@ -106188,7 +105993,7 @@ aaa aaa ctG cIh -ctJ +sAm ctG cIy bjm @@ -106925,7 +106730,7 @@ bKl bQW bUp cci -btZ +tff aSq bgh bIY @@ -107163,7 +106968,7 @@ bdP bfF bha bdP -abp +aOJ aPN bes aaU @@ -107208,8 +107013,8 @@ aPg aPg cet bpL -bBO -bBO +bpL +rqk bBO bBO ctG @@ -107228,7 +107033,7 @@ bZq bZh cEE bpD -cmL +bpD cyS byQ byQ @@ -107420,7 +107225,7 @@ bdW bfJ bhc bdP -abp +aOJ aPN bes aaU @@ -107466,7 +107271,7 @@ cdV cdV bpN bCa -bSo +bSp bSv cfl ctX @@ -107677,7 +107482,7 @@ bdY bfM bhg bdP -abp +aOJ aPN bey aaU @@ -107934,7 +107739,7 @@ bdP bdP bhl bdP -abp +aOJ aPN bes aaU @@ -107978,7 +107783,7 @@ cmf cnK cnK cdV -bBO +rke bUB bSq bVf @@ -108191,7 +107996,7 @@ aaU aaU cuA cuy -bcc +blD bcO bes aaU @@ -108448,7 +108253,7 @@ aaa aaa aaa aaU -brs +aQq aPR cux aaU @@ -108492,7 +108297,7 @@ cmE cok cok cdV -bBO +rke bPv cBd cfi @@ -108705,7 +108510,7 @@ aaa aaa aaa aaU -brs +aQq aQp cux aaU @@ -108749,7 +108554,7 @@ cmG coT cpL cpZ -bBO +qGi cxd cBd cfj @@ -108962,9 +108767,9 @@ aaU aaU aaU aaU -abp -aQq -bes +aUq +bmO +bcc aaU aaa aaa @@ -109006,7 +108811,7 @@ cmY cdV cdV cdV -bBO +qGi bSm cBk cfk @@ -109066,7 +108871,7 @@ aaa aaa aaa aaa -aaa +cpB aaa ckl ckl @@ -109219,9 +109024,9 @@ aaa aaa aaa aaU -abp +aUq aQr -bes +bcc aaU aaa aaa @@ -109239,7 +109044,7 @@ bBv bXM ccn ccA -ccy +dwH aTl bsz cdG @@ -109263,7 +109068,7 @@ cks crv crx aeI -bBO +rke bSn cBl bSn @@ -109476,7 +109281,7 @@ aaa aaa aaa aaU -abp +aUq aQr beD cuy @@ -109496,7 +109301,7 @@ bUc bXM cco ccE -btZ +tsU aTl bsz cdU @@ -109534,7 +109339,7 @@ cNt beZ cIS coz -bty +fkx bBl aaU aaU @@ -110046,9 +109851,9 @@ cJy cNg cNs cIB -cIM -bXX -bty +cMG +cVq +fui bBl aaU bIm @@ -110262,7 +110067,7 @@ aaa btT bBX btT -btZ +qMN btT aaa aaU @@ -110303,9 +110108,9 @@ cvi cuN cNv bhT -cIM -bXX -bty +cMG +cVq +fui bzr byT cfc @@ -110799,12 +110604,12 @@ aCZ aRG aOl aOV -avQ +bSo cmX aRp bkJ aUf -aeI +ciG bnp cmO cfU @@ -112870,7 +112675,7 @@ biV cKg cLn cLz -bmz +cLz biV cdP bXX @@ -113177,7 +112982,7 @@ aaa aaa aaa aaa -aaa +cpB aaa aaa ckl @@ -113336,7 +113141,7 @@ cAM bCP boA aYC -brf +att att att att @@ -114066,7 +113871,7 @@ aaa aaU aio akZ -biO +aKe bEt bEA aik @@ -114643,7 +114448,7 @@ aaa bsz anr bcI -sdp +bgw bUX bgw uwK @@ -116226,7 +116031,7 @@ btz bPm bxH bSf -bzd +hlV bQD bxH bxH @@ -116873,7 +116678,7 @@ aaa aaa aaa aaU -cnM +cPl abM acj aaU @@ -117470,8 +117275,8 @@ aaa aaa aaa aaa -bgi -fui +bMp +bJv aaa cwK aaa @@ -117727,8 +117532,8 @@ aZG aaa aaa aaa -bgi -fui +bMp +bJv aaa cwI aaa @@ -117984,8 +117789,8 @@ aaa aaa aaa aaa -bgi -fui +bMp +bJv aaa cwK aaa @@ -118026,7 +117831,7 @@ bYh bYn bYn bYE -cni +bYn cyf cgy bIz @@ -118488,16 +118293,16 @@ bzO caD bzn bjz -ciG +ciq bAK ciV aMI aaa bJj bLS -kxw -kxw -kxw +bHg +bHg +bHg bPA wPS aaa @@ -118931,7 +118736,7 @@ aaa aaU aav abM -acz +cPp aaU aaa aaa @@ -118961,7 +118766,7 @@ avz awx axU ayL -azO +azU aAu awp aCP @@ -119533,10 +119338,10 @@ cPD bVE cbT cww -bhI -bhI +cww +cww can -bhI +cww aaa anr aaa @@ -119786,15 +119591,15 @@ bNb bPL cwB cwB -cwB +hDz bVX eKM +bZQ +cww cww -bhI -bhI cao -bhI -bhI +cww +cww anr aaa aaU @@ -120041,13 +119846,13 @@ cww bjE bNq bQK -qgO +cwB chO cpN bWG cRg -jiZ -bhI +cmL +cww cLY cap cMt @@ -120301,14 +120106,14 @@ bNd bNE cww cpO -bWG -cJo +bYP +cRg cMH -bhI -cLZ +cww +cMb caq -cLZ -bhI +cMb +cww anr aaa aaU @@ -120557,15 +120362,15 @@ cww cww cww cww -cww +cLm cIs tyI -cMJ +cww cLX cMa cMj cMu -cMG +jiZ anr aaU aaU @@ -120812,17 +120617,17 @@ pgu pgu pgu gGG -vsO +cww chS cpQ cfM cbU -jXo +cww cLm cMb cas cMb -cMH +cMJ anr aaa aaa @@ -121069,9 +120874,9 @@ aXx aXx aXx bfW -tuF +cww lRy -fti +cMl cfP mEa cLV @@ -121326,7 +121131,7 @@ bca cat cKX bQN -nLV +cLb cLd fti cfT @@ -121337,7 +121142,7 @@ chx chM gDY jiZ -hlV +anr aaa aaa aaU @@ -121595,7 +121400,7 @@ rUl cMw cfs cMP -aaa +cMi aaa aaU aaa @@ -121838,14 +121643,14 @@ aXx bca bca cKQ -cKY -bQO +biO +bmz ony xcO hKC cVO -sRD -cMe +nAF +cni cai rdF cMk @@ -122099,12 +121904,12 @@ aXx bfW cww bUa -cMr +brf sRD -cMo +nAF cgz -cai -fkx +cJH +cwB cMl cMx cMJ @@ -122356,13 +122161,13 @@ cKX bQN cLb cLe -cMo -hMZ +bXP +sRD nAF lcD -cai -fkx -mNN +cwB +cwB +cwB cLo nBM cfD @@ -122613,12 +122418,12 @@ bZR bfW cwA cLf -cMo -iAW -fIw +bXV +sRD +nAF wWH -ntC -nEX +cwB +cwB hDz cLp oMB @@ -122870,11 +122675,11 @@ cKY bQO cLc eIh -car +bYd tXV tZj -jml -cVq +cwB +cwB cMc cMm cMy @@ -123128,10 +122933,10 @@ bfW cww bhJ cMo -iAW +cwB cJu -iAW -cJH +cwB +cwB cMd cMn cMz @@ -123385,10 +123190,10 @@ bQN cLb cLh cMo -iAW -cJu -hlo -cJH +cwB +jon +cwB +cwB cMe cMo cLq @@ -123643,9 +123448,9 @@ bWK cLi xKr nvn -cJu -iAW -cJH +jon +cwB +cwB cMe cMo cMA @@ -123899,10 +123704,10 @@ cLa cLc fgS car -iAW +cwB jon -xjk -cai +cwB +cwB cMg cMq cMB @@ -124159,7 +123964,7 @@ kOG dVR xCy sHB -xkC +cwB cMe cMr cMC @@ -124413,7 +124218,7 @@ bQS cLb cLj cMo -qvB +cwB cgh cgA chq @@ -124931,7 +124736,7 @@ prx vxU cLW ccG -cMi +prx iQY cMF cMO @@ -125728,7 +125533,7 @@ cNB cNB cNB cNG -cNN +hlo cNT cNy cNX @@ -125941,7 +125746,7 @@ aaa aaa aaa aaU -cbS +cPq abM ccH aaU @@ -126125,9 +125930,9 @@ aaa aaa aaa aaU -abF +cPl abM -acA +cPq aaU aaa aaa @@ -126198,9 +126003,9 @@ aaa aaa aaa aaU -cbS +cPq abR -ccJ +cPm aaU aaa aaa @@ -126382,9 +126187,9 @@ aaa aaa aaa aaU -abJ +cPm abR -acA +cPq aaU aaU aaU @@ -126639,12 +126444,12 @@ aaa aaa aaa aaU -abJ +cPm abR acB -adc -adc -adL +cPd +cPd +cdq aaa aaa aaa @@ -126709,14 +126514,14 @@ aaU aaa aaa aaa -bGK -bGK +cPd +cPd bUe ccc abR -aaY +pZq cdb -bGK +cPd cdq aaa aaa @@ -126896,7 +126701,7 @@ aaa aaa aaa aaU -abJ +cPm abM abR abM @@ -127153,12 +126958,12 @@ aaa aaa aaa abp -abJ -abZ -abZ -abZ -abZ -abZ +cPm +cPh +cPh +cPh +cPh +cPh aaa aaa aaa @@ -127223,15 +127028,15 @@ aaU aaa aaa aaa -bGP -bNo -bNo +cPe +cPh +cPh ccf ccs ccP cdi -bNo -bNo +cPh +cPh aaa aaa aaa diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index a8fa31d5fb..0b89b117c4 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -38,3 +38,14 @@ if(stat & (BROKEN|NOPOWER)) return drive() + +/obj/machinery/mass_driver/pressure_plate + name = "pressure plated mass driver" + var/drive_delay = 10 + +/obj/machinery/mass_driver/pressure_plate/Crossed(atom/movable/O) + . = ..() + if(isliving(O)) + var/mob/living/L = O + to_chat(L, "You feel something click beneath you!") + addtimer(CALLBACK(src, .proc/drive), drive_delay) \ No newline at end of file From 6977d7a73b69cc439bf6b8ecad39fd3fd5ff1199 Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Tue, 8 Sep 2020 03:42:58 -0400 Subject: [PATCH 10/37] i hate making this --- code/modules/uplink/uplink_items/uplink_dangerous.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm index 58cb43996d..63c0d942d9 100644 --- a/code/modules/uplink/uplink_items/uplink_dangerous.dm +++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm @@ -20,6 +20,7 @@ desc = "A sleek box containing a brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers, and an extra speedloader." item = /obj/item/storage/box/syndie_kit/revolver cost = 13 + player_minimum = 20 surplus = 50 exclude_modes = list(/datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs) From 9acc4360637511473f8a2517a1e46f004bc3762e Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Tue, 8 Sep 2020 03:55:44 -0400 Subject: [PATCH 11/37] a a --- code/modules/uplink/uplink_items/uplink_dangerous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm index 63c0d942d9..898b716775 100644 --- a/code/modules/uplink/uplink_items/uplink_dangerous.dm +++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm @@ -20,7 +20,7 @@ desc = "A sleek box containing a brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers, and an extra speedloader." item = /obj/item/storage/box/syndie_kit/revolver cost = 13 - player_minimum = 20 + player_minimum = 15 surplus = 50 exclude_modes = list(/datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs) From c056c8ac915e06c77f455c45d8a1d1545699b834 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Tue, 8 Sep 2020 20:49:24 +0200 Subject: [PATCH 12/37] boom boom --- code/modules/antagonists/traitor/equipment/Malf_Modules.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 8e9a54a69a..149b869649 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -13,7 +13,9 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/machinery/syndicatebomb/badmin/clown, /obj/machinery/syndicatebomb/empty, /obj/machinery/syndicatebomb/self_destruct, - /obj/machinery/syndicatebomb/training + /obj/machinery/syndicatebomb/training, + /obj/machinery/gravity_generator, + /obj/machinery/gravity_generator/main ))) //The malf AI action subtype. All malf actions are subtypes of this. From f634a31bfb1884579c4b583e3c4b3c883f59b53b Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Wed, 9 Sep 2020 15:28:45 -0700 Subject: [PATCH 13/37] Update polychromic.dm --- code/datums/elements/polychromic.dm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/code/datums/elements/polychromic.dm b/code/datums/elements/polychromic.dm index 1c438c86c5..f0938ca022 100644 --- a/code/datums/elements/polychromic.dm +++ b/code/datums/elements/polychromic.dm @@ -62,6 +62,7 @@ RegisterSignal(A, COMSIG_ITEM_WORN_OVERLAYS, .proc/apply_worn_overlays) if(suits_with_helmet_typecache[A.type]) RegisterSignal(A, COMSIG_SUIT_MADE_HELMET, .proc/register_helmet) + register_helmet(A) //just call it directly it only needs to be called once, right? else if(_flags & POLYCHROMIC_ACTION && ismob(A)) //in the event mob update icon procs are ever standarized. var/datum/action/polychromic/P = new(A) RegisterSignal(P, COMSIG_ACTION_TRIGGER, .proc/activate_action) @@ -165,7 +166,20 @@ /datum/element/polychromic/proc/on_examine(atom/source, mob/user, list/examine_list) examine_list += "Alt-click to recolor it." -/datum/element/polychromic/proc/register_helmet(atom/source, obj/item/clothing/head/H) +/datum/element/polychromic/proc/register_helmet(atom/source) + if(!isitem(source)) + return + + var/obj/item/clothing/head/H //going to just grab the headwear this way even if it may be inefficient + if(istype(source,/obj/item/clothing/suit/hooded)) //so how come it be like this, where toggleable headslots are named separately (helmet/hood) anyways? + var/obj/item/clothing/suit/hooded/sourcesuit = source + H = sourcesuit.hood + else if(istype(source,/obj/item/clothing/suit/space/hardsuit)) + var/obj/item/clothing/suit/space/hardsuit/sourcesuit = source + H = sourcesuit.helmet + else + return + suit_by_helmet[H] = source helmet_by_suit[source] = H colors_by_atom[H] = colors_by_atom[source] From 67000cd182610dd2af6cec84b1e78cf39fcaf078 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 10 Sep 2020 00:13:57 +0000 Subject: [PATCH 14/37] Automatic changelog compile [ci skip] --- html/changelog.html | 7 ------- 1 file changed, 7 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index f440b8c76c..2b6b76f920 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -1435,13 +1435,6 @@
  • Actually adds the juice reagent to make laugh peas donuts.
- -

09 July 2020

-

timothyteakettle updated:

-
    -
  • bluespace tray added, allowing twice as many items as the regular tray, printable at the service lathe, researched through science
    • -
  • bluespace jar added, a kind of pet carrier that allows human sized mobs inside, and smashes when thrown, researched and printed through science
    • -
GoonStation 13 Development Team From 1b77e69fb44f1638ce87c145cb711004d9587451 Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Wed, 9 Sep 2020 18:11:25 -0700 Subject: [PATCH 15/37] Slimepeople diet changes --- code/__DEFINES/food.dm | 1 + code/modules/food_and_drinks/food/snacks_cake.dm | 4 ++-- code/modules/food_and_drinks/food/snacks_frozen.dm | 4 ++-- code/modules/food_and_drinks/food/snacks_other.dm | 6 +++--- code/modules/food_and_drinks/food/snacks_pastry.dm | 4 +++- code/modules/food_and_drinks/food/snacks_pie.dm | 2 ++ code/modules/food_and_drinks/food/snacks_pizza.dm | 11 ++++++----- code/modules/food_and_drinks/food/snacks_salad.dm | 4 ++-- code/modules/food_and_drinks/food/snacks_soup.dm | 2 +- code/modules/food_and_drinks/food/snacks_vend.dm | 2 +- .../living/carbon/human/species_types/jellypeople.dm | 3 ++- 11 files changed, 25 insertions(+), 18 deletions(-) diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 77e8d82aca..03110ad04e 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -12,6 +12,7 @@ #define TOXIC (1<<11) #define PINEAPPLE (1<<12) #define BREAKFAST (1<<13) +#define ANTITOXIC (1<<14) #define DRINK_NICE 1 #define DRINK_GOOD 2 diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm index 1117dbc3d3..be07826a7f 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/snacks_cake.dm @@ -133,7 +133,7 @@ slices_num = 5 bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10) tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) - foodtype = GRAIN | DAIRY | FRUIT | SUGAR + foodtype = GRAIN | DAIRY | FRUIT | SUGAR | ANTITOXIC /obj/item/reagent_containers/food/snacks/cakeslice/lime name = "lime cake slice" @@ -141,7 +141,7 @@ icon_state = "limecake_slice" filling_color = "#00FF00" tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) - foodtype = GRAIN | DAIRY | FRUIT | SUGAR + foodtype = GRAIN | DAIRY | FRUIT | SUGAR | ANTITOXIC /obj/item/reagent_containers/food/snacks/store/cake/lemon name = "lemon cake" diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm index 39c9c6c04f..32a89dbd58 100644 --- a/code/modules/food_and_drinks/food/snacks_frozen.dm +++ b/code/modules/food_and_drinks/food/snacks_frozen.dm @@ -103,7 +103,7 @@ icon_state = "lime_sc" list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/limejuice = 5) tastes = list("ice" = 1, "water" = 1, "limes" = 5) - foodtype = FRUIT + foodtype = FRUIT | ANTITOXIC /obj/item/reagent_containers/food/snacks/snowcones/lemon name = "lemon snowcone" @@ -191,7 +191,7 @@ icon_state = "fruitsalad_sc" list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/limejuice = 5, /datum/reagent/consumable/orangejuice = 5) tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5) - foodtype = FRUIT + foodtype = FRUIT | ANTITOXIC /obj/item/reagent_containers/food/snacks/snowcones/pineapple name = "pineapple snowcone" diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index e0697cecea..b771a90907 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -232,7 +232,7 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //lollipop, but vitamins = toxins filling_color = "#00800" tastes = list("cobwebs" = 1, "sugar" = 2) - foodtype = JUNKFOOD | SUGAR + foodtype = JUNKFOOD | SUGAR | ANTITOXIC /obj/item/reagent_containers/food/snacks/tobiko name = "tobiko" @@ -451,7 +451,7 @@ var/mutable_appearance/head var/headcolor = rgb(0, 0, 0) tastes = list("candy" = 1) - foodtype = JUNKFOOD | SUGAR + foodtype = JUNKFOOD | SUGAR | ANTITOXIC /obj/item/reagent_containers/food/snacks/lollipop/Initialize() . = ..() @@ -756,4 +756,4 @@ bitesize = 2 name = "hot-cross bun" desc = "The Cross represents the Assistants that died for your sins." - icon_state = "hotcrossbun" \ No newline at end of file + icon_state = "hotcrossbun" diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index d65907daea..13a46395ea 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -509,7 +509,7 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/omnizine = 3) cooked_type = null tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) - foodtype = GRAIN + foodtype = GRAIN | ANTITOXIC /obj/item/reagent_containers/food/snacks/dankpocket name = "\improper Dank-pocket" @@ -556,9 +556,11 @@ name = "exceptional plump helmet biscuit" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" bonus_reagents = list(/datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) + foodtype += ANTITOXIC . = ..() if(fey) reagents.add_reagent(/datum/reagent/medicine/omnizine, 5) + foodtype += ANTITOXIC /obj/item/reagent_containers/food/snacks/cracker name = "cracker" diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 81805f5529..24522503c1 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -171,8 +171,10 @@ name = "exceptional plump pie" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 4) + foodtype += ANTITOXIC if(fey) reagents.add_reagent(/datum/reagent/medicine/omnizine, 5) + foodtype += ANTITOXIC /obj/item/reagent_containers/food/snacks/pie/xemeatpie diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index f30c182963..75cf8ffb82 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -109,7 +109,7 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD | ANTITOXIC /obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket name = "donkpocket pizza slice" @@ -117,7 +117,7 @@ icon_state = "donkpocketpizzaslice" filling_color = "#FFA500" tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) - foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD | ANTITOXIC /obj/item/reagent_containers/food/snacks/pizza/dank name = "dank pizza" @@ -127,7 +127,7 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6) list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) - foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY + foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY | ANTITOXIC /obj/item/reagent_containers/food/snacks/pizzaslice/dank name = "dank pizza slice" @@ -135,7 +135,7 @@ icon_state = "dankpizzaslice" filling_color = "#2E8B57" tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) - foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY + foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY | ANTITOXIC /obj/item/reagent_containers/food/snacks/pizza/sassysage name = "sassysage pizza" @@ -187,6 +187,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2) + /obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM) @@ -244,4 +245,4 @@ icon_state = "meatpizzaslice" filling_color = "#A52A2A" tastes = list("cardboard" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2) - foodtype = GRAIN | VEGETABLES | DAIRY | MEAT \ No newline at end of file + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm index be7c3d25da..44ddb99f55 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/snacks_salad.dm @@ -20,7 +20,7 @@ bonus_reagents = list(/datum/reagent/medicine/omnizine = 2, /datum/reagent/consumable/nutriment/vitamin = 6) list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/medicine/omnizine = 8, /datum/reagent/consumable/nutriment/vitamin = 6) tastes = list("leaves" = 1) - foodtype = VEGETABLES + foodtype = VEGETABLES | ANTITOXIC /obj/item/reagent_containers/food/snacks/salad/herbsalad name = "herb salad" @@ -133,7 +133,7 @@ trash = /obj/item/reagent_containers/glass/bowl list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/medicine/earthsblood = 3, /datum/reagent/medicine/omnizine = 5, /datum/reagent/drug/happiness = 2) tastes = list("hope" = 1) - foodtype = VEGETABLES + foodtype = VEGETABLES | ANTITOXIC /obj/item/reagent_containers/food/snacks/salad/gumbo name = "black eyed gumbo" diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm index ffafcc6b1e..eea7cdb87d 100644 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ b/code/modules/food_and_drinks/food/snacks_soup.dm @@ -89,7 +89,7 @@ icon_state = "nettlesoup" bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 5) tastes = list("nettles" = 1) - foodtype = VEGETABLES + foodtype = VEGETABLES | ANTITOXIC /obj/item/reagent_containers/food/snacks/soup/mystery name = "mystery soup" diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index b4c7c89b74..4e8687fc23 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -89,7 +89,7 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5) filling_color = "#F5F5DC" tastes = list("sweetness" = 3, "cake" = 1) - foodtype = GRAIN | FRUIT | VEGETABLES + foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC custom_price = PRICE_CHEAP /obj/item/reagent_containers/food/snacks/energybar diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 49c55f70b3..43f5ca5526 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -18,7 +18,8 @@ var/datum/action/innate/regenerate_limbs/regenerate_limbs var/datum/action/innate/slime_change/slime_change //CIT CHANGE liked_food = TOXIC | MEAT - toxic_food = null + disliked_food = null + toxic_food = ANTITOXIC coldmod = 6 // = 3x cold damage heatmod = 0.5 // = 1/4x heat damage burnmod = 0.5 // = 1/2x generic burn damage From 7f028899fad2da6e4cf26df2c002d0da0f71c5db Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Wed, 9 Sep 2020 22:18:17 -0700 Subject: [PATCH 16/37] Forgot valid salid - also included ambrosia deus, white cannabis, and lime fruit --- code/modules/food_and_drinks/food/snacks_salad.dm | 2 +- code/modules/hydroponics/grown/ambrosia.dm | 1 + code/modules/hydroponics/grown/cannabis.dm | 2 ++ code/modules/hydroponics/grown/citrus.dm | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm index 44ddb99f55..8c6eecb829 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/snacks_salad.dm @@ -38,7 +38,7 @@ bonus_reagents = list(/datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 4) list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1) - foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT + foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT | ANTITOXIC /obj/item/reagent_containers/food/snacks/salad/oatmeal name = "oatmeal" diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index e84025208a..5756bbe585 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -40,6 +40,7 @@ icon_state = "seed-ambrosiadeus" species = "ambrosiadeus" plantname = "Ambrosia Deus" + foodtype = VEGETABLES | ANTITOXIC product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus mutatelist = list(/obj/item/seeds/ambrosia/gaia) reagents_add = list(/datum/reagent/medicine/omnizine = 0.15, /datum/reagent/medicine/synaptizine = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05) diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index 6525ac42d4..e4fe7fcdbc 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -104,6 +104,7 @@ seed = /obj/item/seeds/cannabis/death name = "death cannabis leaf" desc = "Looks a bit dark. Oh well." + foodtype = VEGETABLES | TOXIC icon_state = "blackcannabis" wine_power = 40 @@ -111,6 +112,7 @@ seed = /obj/item/seeds/cannabis/white name = "white cannabis leaf" desc = "It feels smooth and nice to the touch." + foodtype = VEGETABLES | ANTITOXIC icon_state = "whitecannabis" wine_power = 10 diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index d130d50aa5..e199c2c6b1 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -29,6 +29,7 @@ seed = /obj/item/seeds/lime name = "lime" desc = "It's so sour, your face will twist." + foodtype = FRUIT | ANTITOXIC icon_state = "lime" filling_color = "#00FF00" juice_results = list(/datum/reagent/consumable/limejuice = 0) From 697723c027996122e3768387ce5105ef154cd522 Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 9 Sep 2020 22:23:31 -0700 Subject: [PATCH 17/37] Adds some unit tests for reactions. --- .../atmospherics/gasmixtures/reactions.dm | 138 ++++++++++++++++++ code/modules/unit_tests/reactions.dm | 6 + 2 files changed, 144 insertions(+) create mode 100644 code/modules/unit_tests/reactions.dm diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index c0f66be7de..bb65bdcaa4 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -40,6 +40,9 @@ /datum/gas_reaction/proc/react(datum/gas_mixture/air, atom/location) return NO_REACTION +/datum/gas_reaction/proc/test() + return list("success" = TRUE) + /datum/gas_reaction/nobliumsupression priority = INFINITY name = "Hyper-Noblium Reaction Suppression" @@ -70,6 +73,8 @@ air.adjust_moles(/datum/gas/water_vapor,-MOLES_GAS_VISIBLE) . = REACTING +// no test cause it's entirely based on location + //tritium combustion: combustion of oxygen and tritium (treated as hydrocarbons). creates hotspots. exothermic /datum/gas_reaction/tritfire priority = -1 //fire should ALWAYS be last, but tritium fires happen before plasma fires @@ -126,6 +131,18 @@ return cached_results["fire"] ? REACTING : NO_REACTION +/datum/gas_reaction/tritfire/test() + var/datum/gas_mixture/G = new + G.set_moles(/datum/gas/tritium,50) + G.set_moles(/datum/gas/oxygen,50) + G.set_temperature(500) + var/result = G.react() + if(result != REACTING) + return list("success" = FALSE, "message" = "Reaction didn't go at all!") + if(!G.reaction_results["fire"]) + return list("success" = FALSE, "message" = "Trit fires aren't setting fire results correctly!") + return ..() + //plasma combustion: combustion of oxygen and plasma (treated as hydrocarbons). creates hotspots. exothermic /datum/gas_reaction/plasmafire priority = -2 //fire should ALWAYS be last, but plasma fires happen after tritium fires @@ -198,6 +215,28 @@ return cached_results["fire"] ? REACTING : NO_REACTION +/datum/gas_reaction/plasmafire/test() + var/datum/gas_mixture/G = new + G.set_moles(/datum/gas/plasma,50) + G.set_moles(/datum/gas/oxygen,50) + G.set_volume(1000) + G.set_temperature(500) + var/result = G.react() + if(result != REACTING) + return list("success" = FALSE, "message" = "Reaction didn't go at all!") + if(!G.reaction_results["fire"]) + return list("success" = FALSE, "message" = "Plasma fires aren't setting fire results correctly!") + if(!G.get_moles(/datum/gas/carbon_dioxide)) + return list("success" = FALSE, "message" = "Plasma fires aren't making CO2!") + G.clear() + G.set_moles(/datum/gas/plasma,10) + G.set_moles(/datum/gas/oxygen,1000) + G.set_temperature(500) + result = G.react() + if(!G.get_moles(/datum/gas/tritium)) + return list("success" = FALSE, "message" = "Plasma fires aren't making trit!") + return ..() + //fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again, and again). Again! //Fusion Rework Counter: Please increment this if you make a major overhaul to this system again. //6 reworks @@ -282,6 +321,31 @@ air.set_temperature(clamp(((air.return_temperature()*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB,INFINITY)) return REACTING +/datum/gas_reaction/fusion/test() + var/datum/gas_mixture/G = new + G.set_moles(/datum/gas/carbon_dioxide,300) + G.set_moles(/datum/gas/plasma,1000) + G.set_moles(/datum/gas/tritium,100.61) + G.set_moles(/datum/gas/nitryl,1) + G.set_temperature(15000) + G.set_volume(1000) + var/result = G.react() + if(result != REACTING) + return list("success" = FALSE, "message" = "Reaction didn't go at all!") + if(abs(G.analyzer_results["fusion"] - 3) > 0.0000001) + var/instability = G.analyzer_results["fusion"] + return list("success" = FALSE, "message" = "Fusion is not calculating analyzer results correctly, should be 3.000000045, is instead [instability]") + if(abs(G.get_moles(/datum/gas/plasma) - 850.616) > 0.5) + var/plas = G.get_moles(/datum/gas/plasma) + return list("success" = FALSE, "message" = "Fusion is not calculating plasma correctly, should be 850.616, is instead [plas]") + if(abs(G.get_moles(/datum/gas/carbon_dioxide) - 1699.384) > 0.5) + var/co2 = G.get_moles(/datum/gas/carbon_dioxide) + return list("success" = FALSE, "message" = "Fusion is not calculating co2 correctly, should be 1699.384, is instead [co2]") + if(abs(G.return_temperature() - 27600) > 200) // calculating this manually sucks dude + var/temp = G.return_temperature() + return list("success" = FALSE, "message" = "Fusion is not calculating temperature correctly, should be around 27600, is instead [temp]") + return ..() + /datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst. priority = 3 name = "Nitryl formation" @@ -313,6 +377,20 @@ air.set_temperature(max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB)) return REACTING +/datum/gas_reaction/nitrylformation/test() + var/datum/gas_mixture/G = new + G.set_moles(/datum/gas/oxygen,30) + G.set_moles(/datum/gas/nitrogen,30) + G.set_moles(/datum/gas/nitrous_oxide,10) + G.set_volume(1000) + G.set_temperature(150000) + var/result = G.react() + if(result != REACTING) + return list("success" = FALSE, "message" = "Reaction didn't go at all!") + if(!G.get_moles(/datum/gas/nitryl) < 0.8) + return list("success" = FALSE, "message" = "Nitryl isn't being generated correctly!") + return ..() + /datum/gas_reaction/bzformation //Formation of BZ by combining plasma and tritium at low pressures. Exothermic. priority = 4 name = "BZ Gas formation" @@ -348,6 +426,19 @@ air.set_temperature(max(((temperature*old_heat_capacity + energy_released)/new_heat_capacity),TCMB)) return REACTING +/datum/gas_reaction/bzformation/test() + var/datum/gas_mixture/G = new + G.set_moles(/datum/gas/plasma,15) + G.set_moles(/datum/gas/nitrous_oxide,15) + G.set_volume(1000) + G.set_temperature(10) + var/result = G.react() + if(result != REACTING) + return list("success" = FALSE, "message" = "Reaction didn't go at all!") + if(!G.get_moles(/datum/gas/bz) < 4) // efficiency is 4.0643 and bz generation == efficiency + return list("success" = FALSE, "message" = "Nitryl isn't being generated correctly!") + return ..() + /datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic. priority = 5 name = "Stimulum formation" @@ -380,6 +471,23 @@ air.set_temperature(max(((air.return_temperature()*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB)) return REACTING +/datum/gas_reaction/stimformation/test() + //above mentioned "strange pattern" is a basic quintic polynomial, it's fine, can calculate it manually + var/datum/gas_mixture/G = new + G.set_moles(/datum/gas/bz,30) + G.set_moles(/datum/gas/plasma,1000) + G.set_moles(/datum/gas/tritium,1000) + G.set_moles(/datum/gas/nitryl,1000) + G.set_volume(1000) + G.set_temperature(12998000) // yeah, really + + var/result = G.react() + if(result != REACTING) + return list("success" = FALSE, "message" = "Reaction didn't go at all!") + if(!G.get_moles(/datum/gas/stimulum) < 900) + return list("success" = FALSE, "message" = "Stimulum isn't being generated correctly!") + return ..() + /datum/gas_reaction/nobliumformation //Hyper-Noblium formation is extrememly endothermic, but requires high temperatures to start. Due to its high mass, hyper-nobelium uses large amounts of nitrogen and tritium. BZ can be used as a catalyst to make it less endothermic. priority = 6 name = "Hyper-Noblium condensation" @@ -408,6 +516,19 @@ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) air.set_temperature(max(((air.return_temperature()*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)) +/datum/gas_reaction/nobliumformation/test() + var/datum/gas_mixture/G = new + G.set_moles(/datum/gas/nitrogen,100) + G.set_moles(/datum/gas/tritium,500) + G.set_volume(1000) + G.set_temperature(5000000) // yeah, really + var/result = G.react() + if(result != REACTING) + return list("success" = FALSE, "message" = "Reaction didn't go at all!") + if(abs(G.thermal_energy() - 23000000000) > 1000000) // god i hate floating points + return list("success" = FALSE, "message" = "Hyper-nob formation isn't removing the right amount of heat! Should be 23,000,000,000, is instead [G.thermal_energy()]") + return ..() + /datum/gas_reaction/miaster //dry heat sterilization: clears out pathogens in the air priority = -10 //after all the heating from fires etc. is done @@ -433,3 +554,20 @@ //Possibly burning a bit of organic matter through maillard reaction, so a *tiny* bit more heat would be understandable air.set_temperature(air.return_temperature() + cleaned_air * 0.002) SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, cleaned_air*MIASMA_RESEARCH_AMOUNT)//Turns out the burning of miasma is kinda interesting to scientists + +/datum/gas_reaction/miaster/test() + var/datum/gas_mixture/G = new + G.set_moles(/datum/gas/miasma,1) + G.set_volume(1000) + G.set_temperature(450) + var/result = G.react() + if(result != REACTING) + return list("success" = FALSE, "message" = "Reaction didn't go at all!") + G.clear() + G.set_moles(/datum/gas/miasma,1) + G.set_temperature(450) + G.set_moles(/datum/gas/water_vapor,0.5) + result = G.react() + if(result != NO_REACTION) + return list("success" = FALSE, "message" = "Miasma sterilization not stopping due to water vapor correctly!") + return ..() diff --git a/code/modules/unit_tests/reactions.dm b/code/modules/unit_tests/reactions.dm new file mode 100644 index 0000000000..66d9b49099 --- /dev/null +++ b/code/modules/unit_tests/reactions.dm @@ -0,0 +1,6 @@ +/datum/unit_test/reactions/Run() + for(var/datum/gas_reaction/G in SSair.gas_reactions) + var/test_info = G.test() + if(!test_info["success"]) + var/message = test_info["message"] + Fail("Gas reaction [G.name] is failing its unit test with the following message: [message]") From b8c0c77b715f363ca7b68e61e291e2c541001517 Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 9 Sep 2020 22:24:54 -0700 Subject: [PATCH 18/37] Makes atmos not get stuck at very cold --- code/modules/atmospherics/environmental/LINDA_turf_tile.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index 14f480d33a..0c6ca13e86 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -331,6 +331,7 @@ var/heat = thermal_conductivity*delta_temperature* \ (heat_capacity*HEAT_CAPACITY_VACUUM/(heat_capacity+HEAT_CAPACITY_VACUUM)) temperature -= heat/heat_capacity + temperature = max(temperature,T0C) //otherwise we just sorta get stuck at super cold temps forever /turf/open/proc/temperature_share_open_to_solid(turf/sharer) sharer.temperature = air.temperature_share(null, sharer.thermal_conductivity, sharer.temperature, sharer.heat_capacity) @@ -344,3 +345,5 @@ temperature -= heat/heat_capacity sharer.temperature += heat/sharer.heat_capacity + temperature = max(temperature,T0C) + sharer.temperature = max(sharer.temperature,T0C) From 13230d502e8232d6463a68eaa707d95075dc4c74 Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Wed, 9 Sep 2020 22:36:11 -0700 Subject: [PATCH 19/37] oops I fucked up --- code/modules/hydroponics/grown/ambrosia.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index 5756bbe585..b8480a1901 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -40,7 +40,6 @@ icon_state = "seed-ambrosiadeus" species = "ambrosiadeus" plantname = "Ambrosia Deus" - foodtype = VEGETABLES | ANTITOXIC product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus mutatelist = list(/obj/item/seeds/ambrosia/gaia) reagents_add = list(/datum/reagent/medicine/omnizine = 0.15, /datum/reagent/medicine/synaptizine = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05) @@ -50,6 +49,7 @@ seed = /obj/item/seeds/ambrosia/deus name = "ambrosia deus branch" desc = "Eating this makes you feel immortal!" + foodtype = VEGETABLES | ANTITOXIC icon_state = "ambrosiadeus" filling_color = "#008B8B" wine_power = 50 From f88bd9c4d312bd1e867caee68e08404178770911 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 10 Sep 2020 00:36:40 -0500 Subject: [PATCH 20/37] Automatic changelog generation for PR #13378 [ci skip] --- html/changelogs/AutoChangeLog-pr-13378.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13378.yml diff --git a/html/changelogs/AutoChangeLog-pr-13378.yml b/html/changelogs/AutoChangeLog-pr-13378.yml new file mode 100644 index 0000000000..c367629476 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13378.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Superconducting turfs now can't go below 0 celsius." From bb734cc8613b7fcce70dbbc85d2877094f53b81f Mon Sep 17 00:00:00 2001 From: Sonic121x <64410541+Sonic121x@users.noreply.github.com> Date: Thu, 10 Sep 2020 20:22:17 +0800 Subject: [PATCH 21/37] PillTypeAgain --- code/modules/plumbing/plumbers/pill_press.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm index 56510fac87..88f56f111d 100644 --- a/code/modules/plumbing/plumbers/pill_press.dm +++ b/code/modules/plumbing/plumbers/pill_press.dm @@ -42,7 +42,7 @@ for (var/x in 1 to PILL_STYLE_COUNT) var/list/SL = list() SL["id"] = x - SL["htmltag"] = assets.icon_tag("pill[x]") + SL["class_name"] = assets.icon_class_name("pill[x]") pill_styles += list(SL) From bceef0d06aa9b95bd346eb7b9ab18c479caf5424 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 11 Sep 2020 00:14:11 +0000 Subject: [PATCH 22/37] Automatic changelog compile [ci skip] --- html/changelog.html | 26 +++++----------------- html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-13378.yml | 4 ---- 3 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-13378.yml diff --git a/html/changelog.html b/html/changelog.html index 2b6b76f920..d3d490689d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
+

11 September 2020

+

Putnam3145 updated:

+
    +
  • Superconducting turfs now can't go below 0 celsius.
    • +
+

09 September 2020

Putnam3145 updated:

    @@ -1415,26 +1421,6 @@
    • Gas mixtures now live entirely in a DLL.
    - -

    10 July 2020

    -

    Chiirno updated:

    -
      -
    • Gave jellypeople a unique brain object /obj/item/organ/brain/jelly
      • -
    • added an icon for jellypeople brains.
      • -
    -

    EmeraldSundisk updated:

    -
      -
    • Adds a pool to PubbyStation
      • -
    • Slight adjustments to the surrounding area as to fit said pool
      • -
    -

    Sneakyrat6 updated:

    -
      -
    • Fixes hair falling out of hoodies.
      • -
    -

    TheObserver-sys updated:

    -
      -
    • Actually adds the juice reagent to make laugh peas donuts.
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f8f47e456e..6b214a58f5 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -27275,3 +27275,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Made superconductivity work for the first time literally ever. timothyteakettle: - bugfix: accents work better +2020-09-11: + Putnam3145: + - balance: Superconducting turfs now can't go below 0 celsius. diff --git a/html/changelogs/AutoChangeLog-pr-13378.yml b/html/changelogs/AutoChangeLog-pr-13378.yml deleted file mode 100644 index c367629476..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13378.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Superconducting turfs now can't go below 0 celsius." From 680872e08b8f91cc72d90feb163762f2e98bd94b Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Thu, 10 Sep 2020 21:02:27 -0700 Subject: [PATCH 23/37] 100% less band-aidy polyhood solution --- code/datums/elements/polychromic.dm | 27 +++++++++++--------------- code/modules/clothing/suits/toggles.dm | 8 ++++---- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/code/datums/elements/polychromic.dm b/code/datums/elements/polychromic.dm index f0938ca022..7ae0d04b05 100644 --- a/code/datums/elements/polychromic.dm +++ b/code/datums/elements/polychromic.dm @@ -61,8 +61,7 @@ A.AddElement(/datum/element/update_icon_updates_onmob) RegisterSignal(A, COMSIG_ITEM_WORN_OVERLAYS, .proc/apply_worn_overlays) if(suits_with_helmet_typecache[A.type]) - RegisterSignal(A, COMSIG_SUIT_MADE_HELMET, .proc/register_helmet) - register_helmet(A) //just call it directly it only needs to be called once, right? + RegisterSignal(A, COMSIG_SUIT_MADE_HELMET, .proc/register_helmet) //you better work now you slut else if(_flags & POLYCHROMIC_ACTION && ismob(A)) //in the event mob update icon procs are ever standarized. var/datum/action/polychromic/P = new(A) RegisterSignal(P, COMSIG_ACTION_TRIGGER, .proc/activate_action) @@ -166,20 +165,16 @@ /datum/element/polychromic/proc/on_examine(atom/source, mob/user, list/examine_list) examine_list += "Alt-click to recolor it." -/datum/element/polychromic/proc/register_helmet(atom/source) - if(!isitem(source)) - return - - var/obj/item/clothing/head/H //going to just grab the headwear this way even if it may be inefficient - if(istype(source,/obj/item/clothing/suit/hooded)) //so how come it be like this, where toggleable headslots are named separately (helmet/hood) anyways? - var/obj/item/clothing/suit/hooded/sourcesuit = source - H = sourcesuit.hood - else if(istype(source,/obj/item/clothing/suit/space/hardsuit)) - var/obj/item/clothing/suit/space/hardsuit/sourcesuit = source - H = sourcesuit.helmet - else - return - +/datum/element/polychromic/proc/register_helmet(atom/source, obj/item/clothing/head/H) + if(!isitem(H)) //backup in case if it messes up somehow + if(istype(source,/obj/item/clothing/suit/hooded)) //so how come it be like this, where toggleable headslots are named separately (helmet/hood) anyways? + var/obj/item/clothing/suit/hooded/sourcesuit = source + H = sourcesuit.hood + else if(istype(source,/obj/item/clothing/suit/space/hardsuit)) + var/obj/item/clothing/suit/space/hardsuit/sourcesuit = source + H = sourcesuit.helmet + else + return suit_by_helmet[H] = source helmet_by_suit[source] = H colors_by_atom[H] = colors_by_atom[source] diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 632d59187f..f496468371 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -5,9 +5,9 @@ var/obj/item/clothing/head/hooded/hood var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this -/obj/item/clothing/suit/hooded/New() +/obj/item/clothing/suit/hooded/Initialize() + . = ..() hood = MakeHelmet() - ..() /obj/item/clothing/suit/hooded/Destroy() . = ..() @@ -48,7 +48,7 @@ /obj/item/clothing/suit/hooded/update_icon_state() icon_state = "[initial(icon_state)]" - if(ishuman(hood.loc)) + if(ishuman(hood?.loc)) var/mob/living/carbon/human/H = hood.loc if(H.head == hood) icon_state += "_t" @@ -131,8 +131,8 @@ //Hardsuit toggle code /obj/item/clothing/suit/space/hardsuit/Initialize() - helmet = MakeHelmet() . = ..() + helmet = MakeHelmet() /obj/item/clothing/suit/space/hardsuit/Destroy() if(helmet) From 81e9d346844fca14e87a845bfad4a34a616411e4 Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Fri, 11 Sep 2020 09:34:56 -0700 Subject: [PATCH 24/37] I love having my ears assaulted by 50 minesweeper_menuselect.oggs --- code/game/machinery/computer/arcade/minesweeper.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/arcade/minesweeper.dm b/code/game/machinery/computer/arcade/minesweeper.dm index ad325455ad..a9c9b5dfd9 100644 --- a/code/game/machinery/computer/arcade/minesweeper.dm +++ b/code/game/machinery/computer/arcade/minesweeper.dm @@ -178,9 +178,12 @@ table[y1][x1] += 10 if(href_list["same_board"]) //Reset the board... kinda if(game_status != MINESWEEPER_GAME_PLAYING) + mine_sound = TRUE game_status = MINESWEEPER_GAME_PLAYING if(table[y1][x1] >= 10) //If revealed, become unrevealed! - playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, 0, extrarange = -3, falloff = 10) + if(mine_sound) + playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, 0, extrarange = -3, falloff = 10) + mine_sound = FALSE table[y1][x1] -= 10 if(table[y1][x1] > 10 && !reset_board) safe_squares_revealed += 1 From e3ae91c06e452a6b058ef529539fa8ce7cd08d2e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:13:28 -0500 Subject: [PATCH 25/37] Automatic changelog generation for PR #13385 [ci skip] --- html/changelogs/AutoChangeLog-pr-13385.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13385.yml diff --git a/html/changelogs/AutoChangeLog-pr-13385.yml b/html/changelogs/AutoChangeLog-pr-13385.yml new file mode 100644 index 0000000000..b687aa15c0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13385.yml @@ -0,0 +1,4 @@ +author: "BlueWildrose" +delete-after: True +changes: + - bugfix: "Minesweeper will no longer blow up the player's ears when they select \"Play on the same board\"" From 2030f4594c9721ce731a50a04421c6adf8928836 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:13:37 -0500 Subject: [PATCH 26/37] Automatic changelog generation for PR #13381 [ci skip] --- html/changelogs/AutoChangeLog-pr-13381.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13381.yml diff --git a/html/changelogs/AutoChangeLog-pr-13381.yml b/html/changelogs/AutoChangeLog-pr-13381.yml new file mode 100644 index 0000000000..837a6083c9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13381.yml @@ -0,0 +1,4 @@ +author: "Sonic121x" +delete-after: True +changes: + - bugfix: "Fixed pill button on chemical press" From 817c549f24619cfa3b650566aa92e1602cabf04b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:13:59 -0500 Subject: [PATCH 27/37] Automatic changelog generation for PR #13377 [ci skip] --- html/changelogs/AutoChangeLog-pr-13377.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13377.yml diff --git a/html/changelogs/AutoChangeLog-pr-13377.yml b/html/changelogs/AutoChangeLog-pr-13377.yml new file mode 100644 index 0000000000..328423e448 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13377.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - code_imp: "Added some unit tests for reactions." From 4e2ba97a2ac8d94989642a5a626d8cd3e2e45e1d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:14:09 -0500 Subject: [PATCH 28/37] Automatic changelog generation for PR #13374 [ci skip] --- html/changelogs/AutoChangeLog-pr-13374.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13374.yml diff --git a/html/changelogs/AutoChangeLog-pr-13374.yml b/html/changelogs/AutoChangeLog-pr-13374.yml new file mode 100644 index 0000000000..7150e0ae29 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13374.yml @@ -0,0 +1,5 @@ +author: "BlueWildrose" +delete-after: True +changes: + - rscadd: "Slimepeople will find warm donk pockets among other toxin healing items even more repulsive, as they are anti-toxic." + - tweak: "Slimepeople are now neutral to gross foods." From 75b409b99485d68434dd98faa02b913a0747d89d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:14:19 -0500 Subject: [PATCH 29/37] Automatic changelog generation for PR #13373 [ci skip] --- html/changelogs/AutoChangeLog-pr-13373.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13373.yml diff --git a/html/changelogs/AutoChangeLog-pr-13373.yml b/html/changelogs/AutoChangeLog-pr-13373.yml new file mode 100644 index 0000000000..750715da4b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13373.yml @@ -0,0 +1,4 @@ +author: "BlueWildrose" +delete-after: True +changes: + - bugfix: "The Polychromic winter coat's hoodie will now polychrome, alongside any other new polychromic items with toggleable headwear." From 595fee20ba71199fb94a4075444bf3370c08ae8c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:14:36 -0500 Subject: [PATCH 30/37] Automatic changelog generation for PR #13370 [ci skip] --- html/changelogs/AutoChangeLog-pr-13370.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13370.yml diff --git a/html/changelogs/AutoChangeLog-pr-13370.yml b/html/changelogs/AutoChangeLog-pr-13370.yml new file mode 100644 index 0000000000..01e314d4a3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13370.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - balance: "AIs can no longer qdel() the gravity generator" From f541dea712038a3bc32e919ec0e40557bf5af947 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:14:47 -0500 Subject: [PATCH 31/37] Automatic changelog generation for PR #13369 [ci skip] --- html/changelogs/AutoChangeLog-pr-13369.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13369.yml diff --git a/html/changelogs/AutoChangeLog-pr-13369.yml b/html/changelogs/AutoChangeLog-pr-13369.yml new file mode 100644 index 0000000000..d59fc3fc3e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13369.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - balance: "Revolver is now poplocked down to fifteen people." From 00e1c586a7a8320c731873e4f644f7c0a4e24566 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:15:03 -0500 Subject: [PATCH 32/37] Automatic changelog generation for PR #13368 [ci skip] --- html/changelogs/AutoChangeLog-pr-13368.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13368.yml diff --git a/html/changelogs/AutoChangeLog-pr-13368.yml b/html/changelogs/AutoChangeLog-pr-13368.yml new file mode 100644 index 0000000000..36d60242a8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13368.yml @@ -0,0 +1,13 @@ +author: "Tupinambis" +delete-after: True +changes: + - tweak: "Redid Cogstation atmos pipes to make it less cluttered." + - tweak: "Removed a few doors from the main hallway to mitigate chokepoint issues" + - bugfix: "All belt hell conveyers are now on by default, so that belt hell actually works." + - bugfix: "IDs for poddoors and belts and the like. Everything is now properly hooked and should work as expected (except for the pressure triggered mass drivers)" + - bugfix: "addresses most if not all roundstart active turfs." + - bugfix: "Issue where wires were connected to the SMES improperly, and SMES were not properly precharged, resulting in power failure earlier than intended." + - bugfix: "various rogue turfs and wirings." + - bugfix: "security office APC being hooked to maintenance for some reason." + - bugfix: "TEG is now directly wired to the SMES." + - code_imp: "adds a subtype of mass drivers that is triggered by things being on it. TODO: Make these mass drivers trigger poddoors, to make belt hell fully functional." From f1dd6867e8487e1cc9516e8e6e9beb8a00ce801f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:15:40 -0500 Subject: [PATCH 33/37] Automatic changelog generation for PR #13363 [ci skip] --- html/changelogs/AutoChangeLog-pr-13363.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13363.yml diff --git a/html/changelogs/AutoChangeLog-pr-13363.yml b/html/changelogs/AutoChangeLog-pr-13363.yml new file mode 100644 index 0000000000..3cdc78df7f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13363.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - refactor: "replaced handle_changeling and handle_bloodsucker with signal registration" From e8899e927f34b8a97de8db383b8f6cf4ce471f47 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:15:57 -0500 Subject: [PATCH 34/37] Automatic changelog generation for PR #13357 [ci skip] --- html/changelogs/AutoChangeLog-pr-13357.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13357.yml diff --git a/html/changelogs/AutoChangeLog-pr-13357.yml b/html/changelogs/AutoChangeLog-pr-13357.yml new file mode 100644 index 0000000000..3e4264acda --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13357.yml @@ -0,0 +1,4 @@ +author: "TheObserver-sys" +delete-after: True +changes: + - rscadd: "Brass now has a proper datum. Aspiring Forgetenders rejoice!" From 19f372f81ee879778e8fec8512f6000c3a472b3b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:16:25 -0500 Subject: [PATCH 35/37] Automatic changelog generation for PR #13355 [ci skip] --- html/changelogs/AutoChangeLog-pr-13355.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13355.yml diff --git a/html/changelogs/AutoChangeLog-pr-13355.yml b/html/changelogs/AutoChangeLog-pr-13355.yml new file mode 100644 index 0000000000..aad9db167e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13355.yml @@ -0,0 +1,4 @@ +author: "lolman360" +delete-after: True +changes: + - bugfix: "glaives now work again" From db25ca03b52eb0437879f4955809e648367a98d2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Sep 2020 16:16:36 -0500 Subject: [PATCH 36/37] Automatic changelog generation for PR #13351 [ci skip] --- html/changelogs/AutoChangeLog-pr-13351.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13351.yml diff --git a/html/changelogs/AutoChangeLog-pr-13351.yml b/html/changelogs/AutoChangeLog-pr-13351.yml new file mode 100644 index 0000000000..d15d6a8c73 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13351.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - bugfix: "Race based drinks will no longer stay inside your blood for ever." From f009253b361afa11bb0c57e163c4dc65b43bf205 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 12 Sep 2020 00:14:16 +0000 Subject: [PATCH 37/37] Automatic changelog compile [ci skip] --- html/changelog.html | 57 +++++++++++++++++++--- html/changelogs/.all_changelog.yml | 40 +++++++++++++++ html/changelogs/AutoChangeLog-pr-13351.yml | 4 -- html/changelogs/AutoChangeLog-pr-13355.yml | 4 -- html/changelogs/AutoChangeLog-pr-13357.yml | 4 -- html/changelogs/AutoChangeLog-pr-13363.yml | 4 -- html/changelogs/AutoChangeLog-pr-13368.yml | 13 ----- html/changelogs/AutoChangeLog-pr-13369.yml | 4 -- html/changelogs/AutoChangeLog-pr-13370.yml | 4 -- html/changelogs/AutoChangeLog-pr-13373.yml | 4 -- html/changelogs/AutoChangeLog-pr-13374.yml | 5 -- html/changelogs/AutoChangeLog-pr-13377.yml | 4 -- html/changelogs/AutoChangeLog-pr-13381.yml | 4 -- html/changelogs/AutoChangeLog-pr-13385.yml | 4 -- 14 files changed, 91 insertions(+), 64 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-13351.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13355.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13357.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13363.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13368.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13369.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13370.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13373.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13374.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13377.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13381.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13385.yml diff --git a/html/changelog.html b/html/changelog.html index d3d490689d..9fc946ba06 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,57 @@ -->
+

12 September 2020

+

BlueWildrose updated:

+
    +
  • The Polychromic winter coat's hoodie will now polychrome, alongside any other new polychromic items with toggleable headwear.
    • +
  • Minesweeper will no longer blow up the player's ears when they select "Play on the same board"
    • +
  • Slimepeople will find warm donk pockets among other toxin healing items even more repulsive, as they are anti-toxic.
    • +
  • Slimepeople are now neutral to gross foods.
    • +
+

DeltaFire15 updated:

+
    +
  • AIs can no longer qdel() the gravity generator
    • +
+

Putnam3145 updated:

+
    +
  • Added some unit tests for reactions.
    • +
  • replaced handle_changeling and handle_bloodsucker with signal registration
    • +
+

Sonic121x updated:

+
    +
  • Fixed pill button on chemical press
    • +
+

TheObserver-sys updated:

+
    +
  • Brass now has a proper datum. Aspiring Forgetenders rejoice!
    • +
+

Trilbyspaceclone updated:

+
    +
  • Race based drinks will no longer stay inside your blood for ever.
    • +
+

Tupinambis updated:

+
    +
  • Redid Cogstation atmos pipes to make it less cluttered.
    • +
  • Removed a few doors from the main hallway to mitigate chokepoint issues
    • +
  • All belt hell conveyers are now on by default, so that belt hell actually works.
    • +
  • IDs for poddoors and belts and the like. Everything is now properly hooked and should work as expected (except for the pressure triggered mass drivers)
    • +
  • addresses most if not all roundstart active turfs.
    • +
  • Issue where wires were connected to the SMES improperly, and SMES were not properly precharged, resulting in power failure earlier than intended.
    • +
  • various rogue turfs and wirings.
    • +
  • security office APC being hooked to maintenance for some reason.
    • +
  • TEG is now directly wired to the SMES.
    • +
  • adds a subtype of mass drivers that is triggered by things being on it. TODO: Make these mass drivers trigger poddoors, to make belt hell fully functional.
    • +
+

lolman360 updated:

+
    +
  • glaives now work again
    • +
+

zeroisthebiggay updated:

+
    +
  • Revolver is now poplocked down to fifteen people.
    • +
+

11 September 2020

Putnam3145 updated:

    @@ -1415,12 +1466,6 @@
    • a singular stray pixel
    - -

    11 July 2020

    -

    Putnam3145 updated:

    -
      -
    • Gas mixtures now live entirely in a DLL.
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 6b214a58f5..ff0cc4817d 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -27278,3 +27278,43 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2020-09-11: Putnam3145: - balance: Superconducting turfs now can't go below 0 celsius. +2020-09-12: + BlueWildrose: + - bugfix: The Polychromic winter coat's hoodie will now polychrome, alongside any + other new polychromic items with toggleable headwear. + - bugfix: Minesweeper will no longer blow up the player's ears when they select + "Play on the same board" + - rscadd: Slimepeople will find warm donk pockets among other toxin healing items + even more repulsive, as they are anti-toxic. + - tweak: Slimepeople are now neutral to gross foods. + DeltaFire15: + - balance: AIs can no longer qdel() the gravity generator + Putnam3145: + - code_imp: Added some unit tests for reactions. + - refactor: replaced handle_changeling and handle_bloodsucker with signal registration + Sonic121x: + - bugfix: Fixed pill button on chemical press + TheObserver-sys: + - rscadd: Brass now has a proper datum. Aspiring Forgetenders rejoice! + Trilbyspaceclone: + - bugfix: Race based drinks will no longer stay inside your blood for ever. + Tupinambis: + - tweak: Redid Cogstation atmos pipes to make it less cluttered. + - tweak: Removed a few doors from the main hallway to mitigate chokepoint issues + - bugfix: All belt hell conveyers are now on by default, so that belt hell actually + works. + - bugfix: IDs for poddoors and belts and the like. Everything is now properly hooked + and should work as expected (except for the pressure triggered mass drivers) + - bugfix: addresses most if not all roundstart active turfs. + - bugfix: Issue where wires were connected to the SMES improperly, and SMES were + not properly precharged, resulting in power failure earlier than intended. + - bugfix: various rogue turfs and wirings. + - bugfix: security office APC being hooked to maintenance for some reason. + - bugfix: TEG is now directly wired to the SMES. + - code_imp: 'adds a subtype of mass drivers that is triggered by things being on + it. TODO: Make these mass drivers trigger poddoors, to make belt hell fully + functional.' + lolman360: + - bugfix: glaives now work again + zeroisthebiggay: + - balance: Revolver is now poplocked down to fifteen people. diff --git a/html/changelogs/AutoChangeLog-pr-13351.yml b/html/changelogs/AutoChangeLog-pr-13351.yml deleted file mode 100644 index d15d6a8c73..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13351.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - bugfix: "Race based drinks will no longer stay inside your blood for ever." diff --git a/html/changelogs/AutoChangeLog-pr-13355.yml b/html/changelogs/AutoChangeLog-pr-13355.yml deleted file mode 100644 index aad9db167e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13355.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "lolman360" -delete-after: True -changes: - - bugfix: "glaives now work again" diff --git a/html/changelogs/AutoChangeLog-pr-13357.yml b/html/changelogs/AutoChangeLog-pr-13357.yml deleted file mode 100644 index 3e4264acda..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13357.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "TheObserver-sys" -delete-after: True -changes: - - rscadd: "Brass now has a proper datum. Aspiring Forgetenders rejoice!" diff --git a/html/changelogs/AutoChangeLog-pr-13363.yml b/html/changelogs/AutoChangeLog-pr-13363.yml deleted file mode 100644 index 3cdc78df7f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13363.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - refactor: "replaced handle_changeling and handle_bloodsucker with signal registration" diff --git a/html/changelogs/AutoChangeLog-pr-13368.yml b/html/changelogs/AutoChangeLog-pr-13368.yml deleted file mode 100644 index 36d60242a8..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13368.yml +++ /dev/null @@ -1,13 +0,0 @@ -author: "Tupinambis" -delete-after: True -changes: - - tweak: "Redid Cogstation atmos pipes to make it less cluttered." - - tweak: "Removed a few doors from the main hallway to mitigate chokepoint issues" - - bugfix: "All belt hell conveyers are now on by default, so that belt hell actually works." - - bugfix: "IDs for poddoors and belts and the like. Everything is now properly hooked and should work as expected (except for the pressure triggered mass drivers)" - - bugfix: "addresses most if not all roundstart active turfs." - - bugfix: "Issue where wires were connected to the SMES improperly, and SMES were not properly precharged, resulting in power failure earlier than intended." - - bugfix: "various rogue turfs and wirings." - - bugfix: "security office APC being hooked to maintenance for some reason." - - bugfix: "TEG is now directly wired to the SMES." - - code_imp: "adds a subtype of mass drivers that is triggered by things being on it. TODO: Make these mass drivers trigger poddoors, to make belt hell fully functional." diff --git a/html/changelogs/AutoChangeLog-pr-13369.yml b/html/changelogs/AutoChangeLog-pr-13369.yml deleted file mode 100644 index d59fc3fc3e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13369.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - balance: "Revolver is now poplocked down to fifteen people." diff --git a/html/changelogs/AutoChangeLog-pr-13370.yml b/html/changelogs/AutoChangeLog-pr-13370.yml deleted file mode 100644 index 01e314d4a3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13370.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - balance: "AIs can no longer qdel() the gravity generator" diff --git a/html/changelogs/AutoChangeLog-pr-13373.yml b/html/changelogs/AutoChangeLog-pr-13373.yml deleted file mode 100644 index 750715da4b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13373.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BlueWildrose" -delete-after: True -changes: - - bugfix: "The Polychromic winter coat's hoodie will now polychrome, alongside any other new polychromic items with toggleable headwear." diff --git a/html/changelogs/AutoChangeLog-pr-13374.yml b/html/changelogs/AutoChangeLog-pr-13374.yml deleted file mode 100644 index 7150e0ae29..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13374.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "BlueWildrose" -delete-after: True -changes: - - rscadd: "Slimepeople will find warm donk pockets among other toxin healing items even more repulsive, as they are anti-toxic." - - tweak: "Slimepeople are now neutral to gross foods." diff --git a/html/changelogs/AutoChangeLog-pr-13377.yml b/html/changelogs/AutoChangeLog-pr-13377.yml deleted file mode 100644 index 328423e448..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13377.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - code_imp: "Added some unit tests for reactions." diff --git a/html/changelogs/AutoChangeLog-pr-13381.yml b/html/changelogs/AutoChangeLog-pr-13381.yml deleted file mode 100644 index 837a6083c9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13381.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Sonic121x" -delete-after: True -changes: - - bugfix: "Fixed pill button on chemical press" diff --git a/html/changelogs/AutoChangeLog-pr-13385.yml b/html/changelogs/AutoChangeLog-pr-13385.yml deleted file mode 100644 index b687aa15c0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13385.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BlueWildrose" -delete-after: True -changes: - - bugfix: "Minesweeper will no longer blow up the player's ears when they select \"Play on the same board\""