From a3f5be0b217810035aa87dd40848c5d392862e6f Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Fri, 3 Jul 2015 21:08:21 +0800 Subject: [PATCH 01/52] HoSArmour --- code/modules/clothing/head/jobs.dm | 2 +- code/modules/clothing/suits/armor.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 7d2d81b6fa9..c832a7d83e5 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -68,7 +68,7 @@ name = "head of security cap" desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge." icon_state = "hoscap" - armor = list(melee = 40, bullet = 30, laser = 25, energy = 10, bomb = 25, bio = 10, rad = 0) + armor = list(melee = 65, bullet = 50, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0) strip_delay = 80 /obj/item/clothing/head/HoS/beret diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index d3b65c48e3a..05932bed45d 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -23,7 +23,7 @@ icon_state = "hos" item_state = "greatcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS - armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0) + armor = list(melee = 55, bullet = 50, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0) flags_inv = HIDEJUMPSUIT cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS From 2f058bbf3784d71c8a09ebe385ebad3c51722af6 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sat, 4 Jul 2015 00:26:08 +0800 Subject: [PATCH 02/52] ArmourPiercingRevolver --- code/modules/projectiles/ammunition/ammo_casings.dm | 2 +- code/modules/projectiles/projectile/bullets.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index b5e553dfed3..c506c0b67fe 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -1,7 +1,7 @@ /obj/item/ammo_casing/a357 desc = "A .357 bullet casing." caliber = "357" - projectile_type = /obj/item/projectile/bullet + projectile_type = /obj/item/projectile/bullet/revolver /obj/item/ammo_casing/a50 desc = "A .50AE bullet casing." diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 647210069ac..d377f56bca0 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -6,6 +6,10 @@ nodamage = 0 flag = "bullet" +/obj/item/projectile/bullet/revolver + damage = 60 + armour_penetration = 10 + /obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage damage = 5 From bb88dda82be1cba4b173bcf198a76864c184237d Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sat, 4 Jul 2015 01:38:30 +0800 Subject: [PATCH 03/52] ERT/DS --- code/modules/clothing/shoes/miscellaneous.dm | 2 +- code/modules/clothing/spacesuits/miscellaneous.dm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 58101dca40a..37d3b578fbb 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -36,7 +36,7 @@ desc = "High speed, no drag combat boots." permeability_coefficient = 0.01 flags = NOSLIP - armor = list(melee = 40, bullet = 30, laser = 25, energy = 25, bomb = 50, bio = 30, rad = 30) + armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) /obj/item/clothing/shoes/sandal desc = "A pair of rather plain, wooden sandals." diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 2f7f85299e6..4ac4a2cd0ef 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -25,7 +25,7 @@ desc = "That's not red paint. That's real blood." icon_state = "deathsquad" item_state = "deathsquad" - armor = list(melee = 50, bullet = 40, laser = 30, energy = 50, bomb = 50, bio = 100, rad = 100) + armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT unacidable = 1 @@ -40,7 +40,7 @@ icon_state = "deathsquad" item_state = "swat_suit" allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals) - armor = list(melee = 50, bullet = 40, laser = 30,energy = 50, bomb = 50, bio = 100, rad = 100) + armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) slowdown = 1 strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT @@ -53,7 +53,7 @@ icon_state = "beret_badge" flags = STOPSPRESSUREDMAGE flags_inv = 0 - armor = list(melee = 50, bullet = 40, laser = 30, energy = 50, bomb = 50, bio = 100, rad = 100) + armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT unacidable = 1 @@ -68,7 +68,7 @@ flags_inv = 0 w_class = 3 allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals) - armor = list(melee = 50, bullet = 40, laser = 30,energy = 50, bomb = 50, bio = 100, rad = 100) + armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) slowdown = 1 strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT @@ -154,7 +154,7 @@ item_state = "ert_command" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals) - armor = list(melee = 30, bullet = 50, laser = 30, energy = 50, bomb = 50, bio = 100, rad = 100) + armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100) slowdown = 0 strip_delay = 130 From 387f36f2619b1b36e18d6f8da26149e2d347bd22 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Sat, 4 Jul 2015 18:44:50 +1000 Subject: [PATCH 04/52] explosion cinematics no longer delay round end --- code/controllers/subsystem/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 31b485b79e3..b9c95206d11 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -293,7 +293,7 @@ var/datum/subsystem/ticker/ticker cinematic.icon_state = "summary_selfdes" //If its actually the end of the round, wait for it to end. //Otherwise if its a verb it will continue on afterwards. - sleep(300) + spawn(300) if(cinematic) qdel(cinematic) //end the cinematic if(temp_buckle) qdel(temp_buckle) //release everybody From 2780f62ec9fdd78decee10bf2cb6f66102805777 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 5 Jul 2015 01:23:19 +0800 Subject: [PATCH 05/52] CollapsingIntensifies --- code/modules/clothing/masks/gasmask.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 35fe69e2060..6190d1f971a 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -50,6 +50,7 @@ ignore_maskadjust = 0 flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS flags_inv = HIDEFACE + w_class = 2.0 visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS visor_flags_inv = HIDEFACE flags_cover = MASKCOVERSMOUTH From a693f924786e4bbb1d549b4f6041a68305c747a8 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Sun, 5 Jul 2015 15:03:04 +1000 Subject: [PATCH 06/52] indents under spawn --- code/controllers/subsystem/ticker.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index b9c95206d11..e824814c577 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -294,9 +294,8 @@ var/datum/subsystem/ticker/ticker //If its actually the end of the round, wait for it to end. //Otherwise if its a verb it will continue on afterwards. spawn(300) - - if(cinematic) qdel(cinematic) //end the cinematic - if(temp_buckle) qdel(temp_buckle) //release everybody + if(cinematic) qdel(cinematic) //end the cinematic + if(temp_buckle) qdel(temp_buckle) //release everybody return From 1e727e34eb4d3ecc1054a719defebe5a5a37076c Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 5 Jul 2015 19:05:09 +0800 Subject: [PATCH 07/52] BulTo40 --- code/modules/clothing/head/jobs.dm | 2 +- code/modules/clothing/suits/armor.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index c832a7d83e5..0ed20624539 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -68,7 +68,7 @@ name = "head of security cap" desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge." icon_state = "hoscap" - armor = list(melee = 65, bullet = 50, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0) + armor = list(melee = 65, bullet = 40, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0) strip_delay = 80 /obj/item/clothing/head/HoS/beret diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 05932bed45d..913cc36ab03 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -23,7 +23,7 @@ icon_state = "hos" item_state = "greatcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS - armor = list(melee = 55, bullet = 50, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0) + armor = list(melee = 55, bullet = 40, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0) flags_inv = HIDEJUMPSUIT cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS From 973683b8bf5eb33ca408214885b3e25b2b8876ed Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Mon, 6 Jul 2015 23:22:01 +1000 Subject: [PATCH 08/52] local narrate verb --- code/modules/admin/admin_verbs.dm | 2 ++ code/modules/admin/verbs/randomverbs.dm | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 23e0bc6142e..4f157aadda7 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -57,6 +57,7 @@ var/list/admin_verbs_admin = list( /client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcom*/ /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ + /client/proc/cmd_admin_local_narrate, //sends text to all mobs within view of atmo /client/proc/cmd_admin_create_centcom_report, /client/proc/check_words, /*displays cult-words*/ /client/proc/reset_all_tcs /*resets all telecomms scripts*/ @@ -163,6 +164,7 @@ var/list/admin_verbs_hideable = list( /client/proc/admin_cancel_shuttle, /client/proc/cmd_admin_direct_narrate, /client/proc/cmd_admin_world_narrate, + /client/proc/cmd_admin_local_narrate, /client/proc/check_words, /client/proc/play_local_sound, /client/proc/play_sound, diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 57bea51a682..0e37c270f71 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -82,6 +82,25 @@ message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
") feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! +/client/proc/cmd_admin_local_narrate(var/atom/A) + set category = "Special Verbs" + set name = "Local Narrate" + + if (!holder) + src << "Only administrators may use this command." + return + if(!A) + return + var/msg = input("Message:", text("Enter the text you wish to appear to everyone within view:")) as text + if (!msg) + return + for(var/mob/living/M in view(7,A)) + M << msg + + log_admin("LocalNarrate: [key_name(usr)] at ([get_area(A)]): [msg]") + message_admins(" LocalNarrate: [key_name_admin(usr)] at ([get_area(A)]): [msg]
") + feedback_add_details("admin_verb","LN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + /client/proc/cmd_admin_godmode(mob/M as mob in mob_list) set category = "Special Verbs" set name = "Godmode" From 52acb19a555e27d5b302bf028e5750f80fcee5e0 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Mon, 6 Jul 2015 23:46:21 +1000 Subject: [PATCH 09/52] custom range and changelog --- code/modules/admin/verbs/randomverbs.dm | 5 ++++- html/changelogs/jordie ln.yml | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/jordie ln.yml diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 0e37c270f71..602382d5e52 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -91,10 +91,13 @@ return if(!A) return + var/range = input("Range:", "Narrate to mobs within how many tiles:", 7) as num + if(!range) + return var/msg = input("Message:", text("Enter the text you wish to appear to everyone within view:")) as text if (!msg) return - for(var/mob/living/M in view(7,A)) + for(var/mob/living/M in view(range,A)) M << msg log_admin("LocalNarrate: [key_name(usr)] at ([get_area(A)]): [msg]") diff --git a/html/changelogs/jordie ln.yml b/html/changelogs/jordie ln.yml new file mode 100644 index 00000000000..31ccda78706 --- /dev/null +++ b/html/changelogs/jordie ln.yml @@ -0,0 +1,6 @@ +author: Jordie0608 + +delete-after: True + +changes: + - rscadd: "Added a Local Narrate verb for admins." From 8241a5acc59037cdfb8349a47a267e7a4c453c04 Mon Sep 17 00:00:00 2001 From: Jim Boonie Date: Tue, 7 Jul 2015 07:38:49 +1200 Subject: [PATCH 10/52] Makes screwdriver eyeball spam less bullshit --- code/game/objects/items.dm | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b71cb447ff7..3390542f55a 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -386,6 +386,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s if(is_human_victim) var/mob/living/carbon/human/U = M var/obj/item/organ/limb/affecting = U.get_organ("head") + world << "7 damage has been taken to [U]'s head." if(affecting.take_damage(7)) U.update_damage_overlays(0) @@ -393,20 +394,27 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s M.take_organ_damage(7) M.eye_blurry += rand(3,4) - M.eye_stat += rand(2,4) + if (M.eye_stat < 10) + world << "[M]'s eye blurriness is now [M.eye_blurry]" + M.eye_stat += rand(1,2) //5 or 10 eyestabs are necessary to become nearsighted + world << "[M]'s eye stat is now [M.eye_stat]" if (M.eye_stat >= 10) - M.eye_blurry += 15+(0.1*M.eye_blurry) - M.disabilities |= NEARSIGHT - if(M.stat != 2) - M << "Your eyes start to bleed profusely!" - if(prob(50)) + M.eye_blurry += 5+(0.1*M.eye_blurry) + if(M.disabilities != NEARSIGHT) + M.disabilities |= NEARSIGHT + world << "[M] is now nearsighted due to having an eye stat at or above 10: [M.eye_stat]!" + (!(M.stat)) + M << "Your eyes start to bleed profusely!"//warns the victim they're nearsighted + if(prob(30))//30% chance of being stunned and an extra 10 blur added to vision + world << "[M] has passed the 30% probability check and will be paralysed, weakened and further blinded." if(M.stat != 2) - if(M.drop_item()) - M << "You drop what you're holding and clutch at your eyes!" + M.Paralyse(1) //we don't paralyse or weaken if already stunned to prevent chainstunning + M.Weaken(2) + M << "You drop what you're holding and clutch at your eyes!" M.eye_blurry += 10 - M.Paralyse(1) - M.Weaken(2) - if (prob(M.eye_stat - 10 + 1)) + world << "[M]'s eye blurriness had 10 added to it for a total of [M.eye_blurry]" + if (prob(M.eye_stat - 10 + 1)) //chance to go blind, currently 5 or 6 stabs after going nearsighted grants 10% per stab + world << "[M] has gone blind at a [(prob(M.eye_stat - 10 + 1))]% chance!" if(M.stat != 2) M << "You go blind!" M.disabilities |= BLIND From ecfe36f440c349a97f589862cefbfd94f289fd08 Mon Sep 17 00:00:00 2001 From: Jim Boonie Date: Tue, 7 Jul 2015 08:36:31 +1200 Subject: [PATCH 11/52] Removes debug lines and tweaks a few final things --- code/game/objects/items.dm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 3390542f55a..cc7e5b36794 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -386,35 +386,26 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s if(is_human_victim) var/mob/living/carbon/human/U = M var/obj/item/organ/limb/affecting = U.get_organ("head") - world << "7 damage has been taken to [U]'s head." if(affecting.take_damage(7)) U.update_damage_overlays(0) else M.take_organ_damage(7) - M.eye_blurry += rand(3,4) - if (M.eye_stat < 10) - world << "[M]'s eye blurriness is now [M.eye_blurry]" + M.eye_blurry += rand(2,3) //adds 2 or 3 blurriness with each eyestab M.eye_stat += rand(1,2) //5 or 10 eyestabs are necessary to become nearsighted - world << "[M]'s eye stat is now [M.eye_stat]" if (M.eye_stat >= 10) - M.eye_blurry += 5+(0.1*M.eye_blurry) + M.eye_blurry += 5+(0.1*M.eye_blurry) //if nearsighted, each stab adds extra blurriness based on current blurriness if(M.disabilities != NEARSIGHT) M.disabilities |= NEARSIGHT - world << "[M] is now nearsighted due to having an eye stat at or above 10: [M.eye_stat]!" - (!(M.stat)) - M << "Your eyes start to bleed profusely!"//warns the victim they're nearsighted - if(prob(30))//30% chance of being stunned and an extra 10 blur added to vision - world << "[M] has passed the 30% probability check and will be paralysed, weakened and further blinded." - if(M.stat != 2) - M.Paralyse(1) //we don't paralyse or weaken if already stunned to prevent chainstunning + M << "Your vision is a mess!"//warns the victim they've become nearsighted + if(prob(25))//25% chance of being stunned and an extra 5 blur added to vision + if(!(M.stat)) //we don't paralyse or weaken if already stunned to discourage chainstunning + M.Paralyse(1) M.Weaken(2) - M << "You drop what you're holding and clutch at your eyes!" - M.eye_blurry += 10 - world << "[M]'s eye blurriness had 10 added to it for a total of [M.eye_blurry]" - if (prob(M.eye_stat - 10 + 1)) //chance to go blind, currently 5 or 6 stabs after going nearsighted grants 10% per stab - world << "[M] has gone blind at a [(prob(M.eye_stat - 10 + 1))]% chance!" + M << "You collapse in pain!" + M.eye_blurry += 5 + if (prob(M.eye_stat - 10 + 1)) //chance to go blind. after 6 stabs while nearsighted, there's a 10% chance to go blind that keeps increasing with each stab if(M.stat != 2) M << "You go blind!" M.disabilities |= BLIND From f021817b8cb5e570851d8dd1bf25f9de5dfcbc7d Mon Sep 17 00:00:00 2001 From: Jim Boonie Date: Tue, 7 Jul 2015 17:48:08 +1200 Subject: [PATCH 12/52] Imagine getting stabbed in the eyes. How fucking shitty would that feel? --- code/game/objects/items.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index cc7e5b36794..d134a4cd87a 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -393,19 +393,19 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s M.take_organ_damage(7) M.eye_blurry += rand(2,3) //adds 2 or 3 blurriness with each eyestab - M.eye_stat += rand(1,2) //5 or 10 eyestabs are necessary to become nearsighted + M.eye_stat += rand(1,2) //between 10 or 5 eyestabs are necessary to become nearsighted if (M.eye_stat >= 10) - M.eye_blurry += 5+(0.1*M.eye_blurry) //if nearsighted, each stab adds extra blurriness based on current blurriness + M.eye_blurry += 5+(0.1*M.eye_blurry)//once nearsighted, each stab adds more blurriness based on current blurriness if(M.disabilities != NEARSIGHT) M.disabilities |= NEARSIGHT - M << "Your vision is a mess!"//warns the victim they've become nearsighted - if(prob(25))//25% chance of being stunned and an extra 5 blur added to vision - if(!(M.stat)) //we don't paralyse or weaken if already stunned to discourage chainstunning + M << "Your eyes start to bleed profusely!"//hints the victim has become nearsighted + if(prob(25))//25% chance of being stunned with an extra 5 blur added to vision + if(!(M.stat)) //we don't stun if already stunned to discourage chainstunning M.Paralyse(1) M.Weaken(2) M << "You collapse in pain!" M.eye_blurry += 5 - if (prob(M.eye_stat - 10 + 1)) //chance to go blind. after 6 stabs while nearsighted, there's a 10% chance to go blind that keeps increasing with each stab + if (prob(M.eye_stat - 5 + 1)) //For a 10% chance to go blind, maximum 14 stabs, minimum 7. Increases with each stab. if(M.stat != 2) M << "You go blind!" M.disabilities |= BLIND From 70ae3d2134b165cd10f77c159dae061e82d45b01 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Thu, 9 Jul 2015 00:52:19 +1000 Subject: [PATCH 13/52] fixes ooc autotoggle and adds loc to sprayer log --- code/controllers/subsystem/ticker.dm | 7 +++--- code/game/verbs/ooc.dm | 23 +++++++++++-------- .../reagents/reagent_containers/spray.dm | 14 +++++------ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 064f438da46..1d1d7145b2a 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -100,7 +100,7 @@ var/datum/subsystem/ticker/ticker if(!mode.explosion_in_progress && mode.check_finished() || force_ending) current_state = GAME_STATE_FINISHED - auto_toggle_ooc(1) // Turn it on + toggle_ooc(1) // Turn it on declare_completion(force_ending) spawn(50) if(mode.station_was_nuked) @@ -162,7 +162,8 @@ var/datum/subsystem/ticker/ticker mode.announce() current_state = GAME_STATE_PLAYING - auto_toggle_ooc(0) // Turn it off + if(!config.ooc_during_round) + toggle_ooc(0) // Turn it off round_start_time = world.time start_landmarks_list = shuffle(start_landmarks_list) //Shuffle the order of spawn points so they dont always predictably spawn bottom-up and right-to-left @@ -204,8 +205,6 @@ var/datum/subsystem/ticker/ticker for (var/datum/html_interface/hi in html_interfaces) hi.closeAll() - - auto_toggle_ooc(1) // Turn it on //initialise our cinematic screen object cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=20;mouse_opacity=0;screen_loc="1,0";}(src) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 60f4b66da8b..592eda9b691 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -58,16 +58,19 @@ else C << "OOC: [keyname]: [msg]" -/proc/toggle_ooc() - ooc_allowed = !( ooc_allowed ) - if (ooc_allowed) - world << "The OOC channel has been globally enabled!" - else - world << "The OOC channel has been globally disabled!" - -/proc/auto_toggle_ooc(var/on) - if(!config.ooc_during_round && ooc_allowed != on) - toggle_ooc() +/proc/toggle_ooc(var/toggle = null) + if(toggle != null) //if we're specifically en/disabling ooc + world << "toggle has value [toggle]" + world << "ooc_allowed is [ooc_allowed]" + if(toggle != ooc_allowed) + world << "ooc_allowed set to toggle" + ooc_allowed = toggle + else + world << "toggle was the same as ooc_allowed returning" + return + else //otherwise just toggle it + ooc_allowed = !ooc_allowed + world << "The OOC channel has been globally [ooc_allowed ? "enabled" : "disabled"]." var/global/normal_ooc_colour = "#002eb8" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 054b8113f2f..1f606a3f885 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -47,16 +47,16 @@ playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) user.changeNext_move(CLICK_CD_RANGE*2) user.newtonian_move(get_dir(A, user)) - + var/turf/T = get_turf(src) if(reagents.has_reagent("sacid")) - message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].") - log_game("[key_name(user)] fired sulphuric acid from \a [src].") + message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src] at ([get_area(src)] ([T.x], [T.y], [T.z])).") + log_game("[key_name(user)] fired sulphuric acid from \a [src] at [get_area(src)] ([T.x], [T.y], [T.z]).") if(reagents.has_reagent("facid")) - message_admins("[key_name_admin(user)] fired Fluacid from \a [src].") - log_game("[key_name(user)] fired Fluacid from \a [src].") + message_admins("[key_name_admin(user)] fired Fluacid from \a [src] at ([get_area(src)] ([T.x], [T.y], [T.z])).") + log_game("[key_name(user)] fired Fluacid from \a [src] at [get_area(src)] ([T.x], [T.y], [T.z]).") if(reagents.has_reagent("lube")) - message_admins("[key_name_admin(user)] fired Space lube from \a [src].") - log_game("[key_name(user)] fired Space lube from \a [src].") + message_admins("[key_name_admin(user)] fired Space lube from \a [src] at ([get_area(src)] ([T.x], [T.y], [T.z])).") + log_game("[key_name(user)] fired Space lube from \a [src] at [get_area(src)] ([T.x], [T.y], [T.z]).") return From cec7bb98371fc665775d5ef542b245462f568f76 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Thu, 9 Jul 2015 00:56:06 +1000 Subject: [PATCH 14/52] removes debug messages --- code/game/verbs/ooc.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 592eda9b691..d0f2ca01bc9 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -60,13 +60,9 @@ /proc/toggle_ooc(var/toggle = null) if(toggle != null) //if we're specifically en/disabling ooc - world << "toggle has value [toggle]" - world << "ooc_allowed is [ooc_allowed]" if(toggle != ooc_allowed) - world << "ooc_allowed set to toggle" ooc_allowed = toggle else - world << "toggle was the same as ooc_allowed returning" return else //otherwise just toggle it ooc_allowed = !ooc_allowed From 515fb80758f78b9b05e8ab165fb9e1cb2e7bc283 Mon Sep 17 00:00:00 2001 From: Jim Boonie Date: Thu, 9 Jul 2015 03:25:31 +1200 Subject: [PATCH 15/52] Fixes some other things I can't remember what I fixed right now. I'm imbibing, rev up the lawsuit. Eric once said Bloodline was a pretty good show, but I've yet to watch it. So nevermind. Fuck the opening theme of True Detective's second season is catchy though. Goddamn. Leonard. --- code/game/objects/items.dm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index d134a4cd87a..263d667f01a 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -375,6 +375,8 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s src.add_fingerprint(user) + playsound(loc, src.hitsound, 30, 1, -1) + if(M != user) M.visible_message("[user] has stabbed [M] in the eye with [src]!", \ "[user] stabs you in the eye with [src]!") @@ -393,19 +395,19 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s M.take_organ_damage(7) M.eye_blurry += rand(2,3) //adds 2 or 3 blurriness with each eyestab - M.eye_stat += rand(1,2) //between 10 or 5 eyestabs are necessary to become nearsighted + M.eye_stat += rand(1,2) //between 5 and 10 eyestabs are necessary to become nearsighted if (M.eye_stat >= 10) - M.eye_blurry += 5+(0.1*M.eye_blurry)//once nearsighted, each stab adds more blurriness based on current blurriness - if(M.disabilities != NEARSIGHT) + M.eye_blurry += 5+(0.1*M.eye_blurry) //once nearsighted, extra blurriness is added per stab based on current blurrinesss + if (!M.disabilities & (NEARSIGHT | BLIND)) M.disabilities |= NEARSIGHT - M << "Your eyes start to bleed profusely!"//hints the victim has become nearsighted - if(prob(25))//25% chance of being stunned with an extra 5 blur added to vision - if(!(M.stat)) //we don't stun if already stunned to discourage chainstunning + M << "You become nearsighted!" + if(prob(20)) //20% chance of being stunned and an extra 5 blurryness added + if(!(M.stat)) //we don't stun if already stunned to limit chainstunning M.Paralyse(1) M.Weaken(2) - M << "You collapse in pain!" M.eye_blurry += 5 - if (prob(M.eye_stat - 5 + 1)) //For a 10% chance to go blind, maximum 14 stabs, minimum 7. Increases with each stab. + + if (prob(M.eye_stat - 5 + 1) && !(M.disabilities & BLIND)) //Minimum 7 stabs for a 10% chance to go blind, maximum 14 stabs. Chance increases with each stab. if(M.stat != 2) M << "You go blind!" M.disabilities |= BLIND From fdc75e0725fe7b273d18f8e34e87fb0b08851bfb Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Wed, 8 Jul 2015 14:09:02 -0400 Subject: [PATCH 16/52] Reverse nerfs, retain bugfixes. --- code/game/objects/items.dm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 263d667f01a..0b4e66da895 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -394,20 +394,23 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s else M.take_organ_damage(7) - M.eye_blurry += rand(2,3) //adds 2 or 3 blurriness with each eyestab - M.eye_stat += rand(1,2) //between 5 and 10 eyestabs are necessary to become nearsighted + M.eye_blurry += rand(3,4) + M.eye_stat += rand(2,4) if (M.eye_stat >= 10) - M.eye_blurry += 5+(0.1*M.eye_blurry) //once nearsighted, extra blurriness is added per stab based on current blurrinesss - if (!M.disabilities & (NEARSIGHT | BLIND)) + M.eye_blurry += 15+(0.1*M.eye_blurry) + if(M.stat != 2) + M << "Your eyes start to bleed profusely!" + if (!(M.disabilities & (NEARSIGHT | BLIND))) M.disabilities |= NEARSIGHT M << "You become nearsighted!" - if(prob(20)) //20% chance of being stunned and an extra 5 blurryness added - if(!(M.stat)) //we don't stun if already stunned to limit chainstunning - M.Paralyse(1) - M.Weaken(2) - M.eye_blurry += 5 - - if (prob(M.eye_stat - 5 + 1) && !(M.disabilities & BLIND)) //Minimum 7 stabs for a 10% chance to go blind, maximum 14 stabs. Chance increases with each stab. + if(prob(50)) + if(M.stat != 2) + if(M.drop_item()) + M << "You drop what you're holding and clutch at your eyes!" + M.eye_blurry += 10 + M.Paralyse(1) + M.Weaken(2) + if (prob(M.eye_stat - 10 + 1) && !(M.disabilities & BLIND)) if(M.stat != 2) M << "You go blind!" M.disabilities |= BLIND From 625410748dbbca05f7a30bd8c16ea88d9696e592 Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Thu, 9 Jul 2015 01:54:51 -0700 Subject: [PATCH 17/52] Adds an examine message to braindead Ais --- code/modules/mob/living/silicon/ai/examine.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index 033a5bcd970..64863157b39 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -18,6 +18,8 @@ if (src.stat == UNCONSCIOUS) msg += "It is non-responsive and displaying the text: \"RUNTIME: Sensory Overload, stack 26/3\".\n" msg += "" + if (!src.client) + msg += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem...\n" msg += "*---------*" user << msg \ No newline at end of file From 2e9c4f3211f811af5e3e53ebeea47da1210cbef2 Mon Sep 17 00:00:00 2001 From: AnturK Date: Thu, 9 Jul 2015 21:22:17 +0200 Subject: [PATCH 18/52] Fixes teleport-swap --- code/modules/mob/living/living.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 48b78d3fb65..27d40bacf7f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -91,6 +91,8 @@ Sorry Giacom. Please don't be mad :( //switch our position with M //BubbleWrap: people in handcuffs are always switched around as if they were on 'help' intent to prevent a person being pulled from being seperated from their puller if((M.a_intent == "help" || M.restrained()) && (a_intent == "help" || restrained()) && M.canmove && canmove) // mutual brohugs all around! + if(loc && !loc.Adjacent(M.loc)) + return 1 now_pushing = 1 //TODO: Make this use Move(). we're pretty much recreating it here. //it could be done by setting one of the locs to null to make Move() work, then setting it back and Move() the other mob From 6f051f9899a37c302d3fcd3d027995093cebe6f2 Mon Sep 17 00:00:00 2001 From: duncathan Date: Fri, 26 Jun 2015 21:49:24 -0600 Subject: [PATCH 19/52] refactors update_icon for trinary devices the base trinary update_icon now adds pipes in the same way all other atmos components do no longer overrides icon_addbroken and icon_addintact with its own silly pipe + cap overlay used for filters and mixers filters and mixers are now oop in terms of icon_addintact (not as much in terms of icon_addbroken) --- .../components/trinary_devices/filter.dm | 17 +++++++++++++++++ .../components/trinary_devices/mixer.dm | 15 +++++++++++++++ .../components/trinary_devices/trinary_base.dm | 14 +------------- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index cedd26af4b2..7121909054c 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -49,7 +49,24 @@ Filter types: radio_controller.remove_object(src,frequency) ..() +/obj/machinery/atmospherics/trinary/filter/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) + var/image/img = getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", get_dir(src,node), node.pipe_color) + overlays += img + return ..() + +/obj/machinery/atmospherics/trinary/filter/icon_addbroken(var/connected) + var/unconnected = (~connected) & initialize_directions + for(var/direction in cardinal) + if(unconnected & direction) + underlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_exposed", direction) + overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) + +/obj/machinery/atmospherics/trinary/filter/update_icon() + overlays.Cut() + ..() + /obj/machinery/atmospherics/trinary/filter/update_icon_nopipes() + if(!(stat & NOPOWER) && on && node1 && node2 && node3) icon_state = "filter_on[flipped?"_f":""]" return diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 53b1d1b27f9..f486cf066ad 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -20,6 +20,21 @@ icon_state = "mixer_off_f" flipped = 1 +/obj/machinery/atmospherics/trinary/mixer/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) + var/image/img = getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", get_dir(src,node), node.pipe_color) + overlays += img + return ..() + +/obj/machinery/atmospherics/trinary/mixer/icon_addbroken(var/connected) + var/unconnected = (~connected) & initialize_directions + for(var/direction in cardinal) + if(unconnected & direction) + underlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_exposed", direction) + overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) + +/obj/machinery/atmospherics/trinary/mixer/update_icon() + overlays.Cut() + ..() /obj/machinery/atmospherics/trinary/mixer/update_icon_nopipes() if(!(stat & NOPOWER) && on && node1 && node2 && node3) diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 1b2cdb378b8..d756a14e444 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -45,23 +45,11 @@ Iconnery /obj/machinery/atmospherics/trinary/proc/update_icon_nopipes() return -/obj/machinery/atmospherics/trinary/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) - var/image/img = getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "intact", get_dir(src,node), node.pipe_color) - overlays += img - - return connected | img.dir - -/obj/machinery/atmospherics/trinary/icon_addbroken(var/connected) - var/unconnected = (~connected) & initialize_directions - for(var/direction in cardinal) - if(unconnected & direction) - overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "intact", direction) - /obj/machinery/atmospherics/trinary/update_icon() update_icon_nopipes() var/connected = 0 - overlays.Cut() + underlays.Cut() //Add non-broken pieces if(node1) From 3c6daf9c760a939b8cbb1a9f5b7d1dddffb10ba3 Mon Sep 17 00:00:00 2001 From: duncathan Date: Mon, 29 Jun 2015 18:26:10 -0600 Subject: [PATCH 20/52] cleans up ugliness in manual valves; moves the circulator's icons to binary_devices.dmi --- .../components/binary_devices/circulator.dm | 1 - .../components/binary_devices/dp_vent_pump.dm | 27 ++++++--- .../components/binary_devices/valve.dm | 57 ++++++------------ icons/obj/atmospherics/binary_devices.dmi | Bin 18191 -> 22000 bytes icons/obj/atmospherics/pipes/simple.dmi | Bin 21159 -> 17641 bytes 5 files changed, 39 insertions(+), 46 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index c7ab2358bfe..e35bd758f6d 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -5,7 +5,6 @@ /obj/machinery/atmospherics/binary/circulator name = "circulator/heat exchanger" desc = "A gas circulator pump and heat exchanger." - icon = 'icons/obj/atmospherics/pipes/simple.dmi' icon_state = "circ1-off" var/side = 1 // 1=left 2=right diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 496d11b61ff..703edd0df9d 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -1,3 +1,10 @@ +/* +Acts like a normal vent, but has an input AND output. +*/ +#define EXT_BOUND 1 +#define INPUT_MIN 2 +#define OUTPUT_MAX 4 + /obj/machinery/atmospherics/binary/dp_vent_pump icon = 'icons/obj/atmospherics/unary_devices.dmi' //We reuse the normal vent icons! icon_state = "dpvent_map" @@ -20,10 +27,10 @@ var/input_pressure_min = 0 var/output_pressure_max = 0 - var/pressure_checks = 1 - //1: Do not pass external_pressure_bound - //2: Do not pass input_pressure_min - //4: Do not pass output_pressure_max + var/pressure_checks = EXT_BOUND + //EXT_BOUND: Do not pass external_pressure_bound + //INPUT_MIN: Do not pass input_pressure_min + //OUTPUT_MAX: Do not pass output_pressure_max /obj/machinery/atmospherics/binary/dp_vent_pump/Destroy() if(radio_controller) @@ -65,9 +72,9 @@ if(pump_direction) //input -> external var/pressure_delta = 10000 - if(pressure_checks&1) + if(pressure_checks&EXT_BOUND) pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure)) - if(pressure_checks&2) + if(pressure_checks&INPUT_MIN) pressure_delta = min(pressure_delta, (air1.return_pressure() - input_pressure_min)) if(pressure_delta > 0) @@ -84,9 +91,9 @@ else //external -> output var/pressure_delta = 10000 - if(pressure_checks&1) + if(pressure_checks&EXT_BOUND) pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound)) - if(pressure_checks&4) + if(pressure_checks&INPUT_MIN) pressure_delta = min(pressure_delta, (output_pressure_max - air2.return_pressure())) if(pressure_delta > 0) @@ -195,3 +202,7 @@ spawn(2) broadcast_status() update_icon() + +#undef EXT_BOUND +#undef INPUT_MIN +#undef OUTPUT_MAX \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index de7eb50987e..2ad2a547930 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -1,37 +1,28 @@ +/* +It's like a regular ol' straight pipe, but you can turn it on and off. +*/ + /obj/machinery/atmospherics/binary/valve - icon = 'icons/obj/atmospherics/binary_devices.dmi' icon_state = "mvalve_map" name = "manual valve" desc = "A pipe valve" + can_unwrench = 1 - var/open = 0 + var/frequency = 0 var/id = null + var/open = 0 + var/type = "m" //lets us have a nice, clean, OOP update_icon_nopipes() + /obj/machinery/atmospherics/binary/valve/open open = 1 -//Separate this because we don't need to update pipe icons if we just are going to crank the handle /obj/machinery/atmospherics/binary/valve/update_icon_nopipes(animation = 0) normalize_dir() - icon_state = "mvalve_off" - overlays.Cut() if(animation) - overlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "mvalve_[open][!open]") - else if(open) - overlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "mvalve_on") - -/obj/machinery/atmospherics/binary/valve/update_icon() - update_icon_nopipes() - var/connected = 0 - underlays.Cut() - //Add non-broken pieces - if(node1) - connected = icon_addintact(node1, connected) - if(node2) - connected = icon_addintact(node2, connected) - //Add broken pieces - icon_addbroken(connected) + flick("[type]valve_[open][!open]",src) + icon_state = "[type]valve_[open?"on":"off"]" /obj/machinery/atmospherics/binary/valve/proc/open() open = 1 @@ -40,19 +31,17 @@ parent2.update = 0 parent1.reconcile_air() investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", "atmos") - return /obj/machinery/atmospherics/binary/valve/proc/close() open = 0 update_icon_nopipes() investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", "atmos") - return /obj/machinery/atmospherics/binary/valve/proc/normalize_dir() - if(dir==2) - dir = 1 - else if(dir==8) - dir = 4 + if(dir==SOUTH) + dir = NORTH + else if(dir==WEST) + dir = EAST /obj/machinery/atmospherics/binary/valve/attack_ai(mob/user) return @@ -63,27 +52,21 @@ sleep(10) if(open) close() - else - open() - + return + open() /obj/machinery/atmospherics/binary/valve/digital // can be controlled by AI name = "digital valve" desc = "A digitally controlled valve." icon_state = "dvalve_map" + type = "d" /obj/machinery/atmospherics/binary/valve/digital/attack_ai(mob/user) return src.attack_hand(user) /obj/machinery/atmospherics/binary/valve/digital/update_icon_nopipes(animation) - normalize_dir() if(stat & NOPOWER) + normalize_dir() icon_state = "dvalve_nopower" - overlays.Cut() return - icon_state = "dvalve_off" - overlays.Cut() - if(animation) - overlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "dvalve_[open][!open]") - else if(open) - overlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "dvalve_on") + ..() diff --git a/icons/obj/atmospherics/binary_devices.dmi b/icons/obj/atmospherics/binary_devices.dmi index d127cabed5871858cd6c8117cabdf2d43a263dfc..bdf19ecbb8467a1908d6b3e65128af5858b0300b 100644 GIT binary patch literal 22000 zcmeFZ2{@E*|2}*VA*qn0vZjR+k}M&kqSA)!Sqs_seVtK>2$d{l8Bt{4_hm%L7P5sH zOV+{I1~X=PuTeeE@A*H^d;EUy@qds1alFUzc6^U7WA3@{`?{{rb$-tC{Cw_tu73CW zzCB0xKoGP~^@j322%-bO(m}f!!H;#XULpj+6nwPw+>|X`&0MUV+^iiPAjm5rG3v9! zlXH8Yb+%~gEk@sYDuI76>gp}&PmChJ zaKE&oUsa|5aG_~5+~-H5iuFZgvrwniv)d$r@P4rBq zEI-8JKDehTM{cz}Oye2+=(!(v+b5@`vc4j0xm=#-!JDt_#^}b|GDm!^hnQPVnJXAf zm-a=cnJgxfA790xEPf#9?;qrP&vD#sqQ@qsxz}#o>88NNv~_Of-L;?gjNIgcAOT2K z`LdQ*!orBZm)2B`I0@IrH8GaWEC%Sz1sqKp>wjL%tL#iU=t z7nk%MR$E;8u6U(2E!d%IvHMB){!sD81NkaXT$oD_WxbYZ7}a9A!{%OQ@IXkA{gfn@ zU{-j@_LS|YWsYzEPfVw~GsCF{Kb$`Ltv=d4FIGcKJE-S&qMUZkYO6?rAHl`V-TlF2 zQ}`?nr>h(pc7rkM)SY`X?Qfrmts%!d|KFPefcy!UnEl*CZKBe z!HqjRZ@%iexXSw>^Na#tWbH|%)w#Jj7}Opo@r3E|(CvSI8iE3qpwJY7!+S&d_6**R z-w+iRHYGE#lPMgDYHwJ7rZBzCRT8K>t)v=s<=6{unf;;lnrIc;+i&64-#*DPYi+c2*rp`Ubb z;!}i|y%Y}1IPgT$m8q`lbc*CvKh`z&Zd~8gvD-IwpYm!G(_Ag?2lJx(pI%jw9G;H| zYJ+=6*g=p3?E9R^mDiVQsfoA~)ty8X`31rIo%p-i8F4wx9&kiC!wpE5{zM&Wdm9FM zmXyGt2;n_RdKCvCrvUvUYikN77rHx5+yY837Q(uI)gLm|*MHk}`77zLK z?vk%GT_7~-H5nckDdoFiXXw&$63iyieScFpcRD;q|JlfNM8FSkIeB)vvAKmWLusel z?QI+C{5N5{`32m~-7r?UGoA4=tXzgpfpgp6ts0)~Q=Q4XU$UoeZqsMoSNibYl>B@) ze}8{SKmntguuOD4uoICtsLLER2dWne+n|Ke2^PjD>e`%>&5^;GnX=xi9|CG!E?cIuRYq1e#CfvmvUXpB9^v`xTX^(Ti~%H& zaw;?Pp_kWTMHFjh=DfiQoIIztQqLm(4sdn`Muanx{$Qc_MOCF3<$ zgCU5jX7Mq=%`JDv)6FgU)2AB<6BTr1U=Oa(d<{WpGnto!^F>}qh+mg?pFjBcb8;66 z=a2JM6-_rBdozHFGFPA%*uLx~UbFt1;#oGF<2hoP2GZi;p<&jRY%0%=H>LIkzuBtNtaYF<&JcyIk{mhlQWoS zm-^wP$9L}3%`zox_vGpPqOL?DdNE}~dlRI?n4X$on$qOol44B)yxR--hqn8-YWey2 zu7NGk<(KYU5BAJ=2QbN=cX^(kd>8U0--Q8-8hLUqarORp#a#oibU0~mwqpL-ctVSq z>!kPS^HmIj>VK>AD%UI2Ef+F==7hBr^r%Pc1pnK}t1qJ!J1$y&o8z|sx%!~?hhMic z9MMe}jM1S_zH^D`$>q6pqy>OYu)DxcJ4O;vC{&vnc9b-k_;aMr*H5qz#dnFn##g+? z)(EeM%I zc9Fp$E(x=n=vj~_UV*D7Ml?OC3;A`NNEVkv37dTAgRFWeLTX9v^QK>qfF0vB@r5}6 zx^;7X+k^)BH?m+|%fe0YDy5xVN~*+T!EClJCZJOL$o;J+bw*g z8wUobOc2artebNAyy(%eV9<4AKfrw2_EKSevWtyO;Q~l6{#}vL)ZAPdT`k%&6D~7a zN859xMMnh3rGtfU|K4rCJM;qMb8S_^SW#-UY*-`Uz~4{5g9!@@ccEvWZI6fi68tk1 zC!wS4AAfy$&T*KJugMoz6YM$a&D0#pAA1IjQ#j$;aY4b?td>wnNXUsVjL49X8&~Z9 zn-_2TKO!w;Xo-hQZEH3)(o5A)P|#)XH|RqKNG}Q7tIfi1&#SDf-*~xnMAC~>^tn6r zB|cW)vuq8EixYvpvv+TP*w|kVaF5{?P_ z+1Jkq$)*TShY9AQ-EAgrwF@_|#iBRTzf4bw%b9qj zU;x7?YH{9I_p>_)H@C10@{*G;D9vDY-KUbjT32np+9H<{3xZ~_1K{|p?&#d~B94=( z)Y2k~;F^UHkt`$!ALc1x8S5mIg&Ed^{1KO7OLI$%l~s5Qz0z`QO6y;PN8Ea&*1v75&AG9@ky4sz(~he|$X?AM7P#Zpz&kg$D7d8eI@&8_)ZXhI zP_^eQn+N@mzTT(0S(*8l4%TOBYtvqhq@tOi0nz9yYb|nB?7jrsY(s)jlv=+*f6tSl z)|+Rsb4S+XvveuX!4Rrmec8s;M-7$V<=ei0BHcYd!%#9yXdqK8U@uGmXke|HHDn*e&i?A@|G5|D zW5FYmTHR&>&X4jb_sqysF|2r9t-h7cKyY{Wz8rxB1qGQaR9FSH%SL^&_Rs=vt}Msi zh7M97&Zge1ooN&EA@FM)R48yc2}$6~9}ebT6Lua0&&VT85H@)JB)&eU3B zVk)X+I>O`UCfC8Sq$P*sD*1^`$x6#lOlPwZDSm~Au;McPa9^GZ76^*LuP2ul9%%FN zX(D}_kEXr-%>k-<_iouno3k|didRYI9`GuE*oj{RLu&aI^<>~RUeVzUPQTvrMzFm=6%YXMA3u0{TLz%DJv@u^HTrGQR* z(C?O(fl!C9YZhEJB$#Pz9dS5OT)rCz2YZ%-rXW!E5ecyJteiV0v!ByWmG5nQ zdCbJ)WNMqqcF{yZ^M}^oaOpSroThm?Pc`$>FWOk-6kheP25WEDd1U zUdq~{xH{#Twk0DKjR9$?_aAch(E_M2i4V;G_tJlY=s&=)j3rrFd)&tM>h3x+1H+He zk$rBSW{Km9JHeE>U+>-v0IEKJqR@0>K?1$~U~@0N`A{GHtzY5Y^EmX<(h(a@4Aon7 zbUSZ57=R}K8Vw4U=)mCLgV^4DdPUDfJE$bJ$N6ZM4y9!}3J)T3V*{Pnqvc&2UJApn7vYwk-$<9@TghD-BFFT7fukn|dt`=g)@;2&Q}h ziW3?abz&DW?IsYO(opwfcCymK{8hIA#jyh?z!4dldm@`t9iO+wpwxCwaTCzCgDRKL z9e#5jZnAThH@oOy?=_cG*47weO&KdK+tpPf1HU{VPo1(Qm(b$?zj|sH81{_``7lqn zk0N^!wNHsLb3e~mU;2qAV%wd5V(=f`D>ywD_Dy`lr?2(h(dv~Jp-_w4Bf82=P7 z30-&3$-c}pyKHR6z{QSd+ITaG{fE1(%=6#JPiaQHAdFPZBs_`Wl~>o-d@}m&?yaTzOSh+}hgO?C?&bdS?&LFE zt?0aXin`h+-VCG|Q*0Z9iUu%OfHh+%#-*j*c*HURrlPStmyS9W4fiLyZTTsZox!_W z+A2Vzf?t6C2_Vx&Ha|&85qwXGu!WGziZW`JLVz_j`CMhnEg;VR1iM$X-^3vstp_fi z28Wqy+lzJ$&c%@;BK9BT_aE^mxWoYzA4aH^I@lTT?ECk739`;~5D=B%KcEGh z%u#agdp?`0Th&e;MV8#TLsXP?^TawTR&9KyWz7GQU=7(ES$Z?)5Lv6#t!8-rq6gNX zRVJ0^+Y z<)U9R@2(rl$`5}HdoLHx6z%NF=r?aZxz2oR{QmJ)cTdlgVE%x^WHPxl5q3-tj#|D~ z2R8PFMO!azZB7@_fWI5}bws#8AQlGH(khOJ+2Y=YNf4nZ<2AcaH z?^~qQM#$){uEDqg!@2pcbb`|zN}474)zdKS^|VXHm`By|+%rO&0gB^0aKP~7@{1QQ zlr-LiIKGQI2}k{g5o@sfBkH*l|3Jidu;ppu92XNS`uC7TuvQHX4PLmK&E;?MxG`{- zG?WV9+F^P-Kz8C74YQOFJfxx8fBypHOQa^JZw-<2O~n3vD`6QYcj7qKptct!30VvO z3ywVZl2E7g%p)v>u;RzbWU5NP$u%FcqjLb6*Yot47t3(O-P=Gf{3gRYyyN%w2kCW) zL45(AS%&cz+StSc8kHTo=b&#*X0!_1zpi`X&c_TsYwUxd1st~F7eiYCZUwJbZ1pN& z8|%AChn!Nm0Vw}N@)Ur*aD1m2NKjBdI0QoG7?jPICHj852qoj93RYFv#8KJJw1Z-~ zv8YQC3cK^Gs)pBvAiJMM*R2%w#Ya~+9n8sVMn5;H68&&YV-7Va8*zqb5Yp1teoNVf z)GjFjQo&~>hT3(8_P#$=ZRc(Ew;tFt5&SN3JdJE`^``PH9dWebw%3vcFl0Ew`@cNsDbxMN)fdzbX@j4%E z36I3a4CUH zj0Vgk{=f{#OnZX4qn%ji(B=OWOpXlKX)BJ-V~yfE+g#f`VAh?YLR`$ljj%v5T*ovN z^}}{<5s>dHo&gA|1BcK}ikGZ3;?t*Mpkaf~2O0b{2A;X!LccO0P?CddBIYb+f`>T_}uF(5N2Q7>kt(DBN9=oyp#0o}CF znQ(`AV*UjPf6tg@{Nz!Zd}>WN9tqG*Fr}S_8G^6bXpkewT=0MN#Y=;AC?OLda0!~9 z_vk(4h@gev+w5OKgH*o8q1E53Tzy!WT0n8>nWvt?il5A(IBq4HAXKyyr8fRQgBWKA z%V~%KV&9;8is}m18mv7xy6ra%XlqB$sX<;I+Bsc2K~)CgVK^Hx8dgTqwKpYef+EZR z9~6HxiE|r`k^ask*qsalAaON=5}GMzyRdSols7RBct^i2k^d@7X`WFsh&e~}+Fg(s zxYw${W&$VG776=bXzFhqEqk1L6oLSt1h=rnm|-Td1yX&yYX*o zFan$kG6jdgAcHc8K1cb@1XoB2BV;xeCSbg?>HzU}w7fT)si$WdSnMBO<9zQ4<~8Mb zcoT6({tt@$6Cg%&Ip3-EhZ#_xXCrEX6VgPqj6BYb^y1ZXv`nA6ZZ@sSG^_lNTrgQ~ z20hZ&nnl1pKhu$CKyGwf`0>Ddg#$PYJK4g;j9e5p0CUp&&&k#Hw@!~x*ztkRH~hb# zo$g6nv>q&Z|Ninwg=;!73Pn;D6%i@Ivz%0(;b5PlmxkVystccRS7d(`RRBwV!+G$j zi8Nq-fH+qA38whfF(P?{4(tnyx;(ur>TKvQxbX31`_fI@iE z41IVHqE*D!#%Z?e*qhkcRPf5en$AxVb>GB<6|%CjQZg~&_wn@|Un6K$jfS8Ch^KAx zDi8FCZyl(v?VKDyJCq%ddC866B=}_(P&^*BiRsQG8usC3w-<`ocfZJ|9C0$FH~qO9 z@u>NxUK?(4;ps~H?K^-qZEk~_Q~*?$-E?i(#UETxSB4)_mn%7V{P^YGzK)q-WCsW; zf0aHHg+$5(B*4tbjyNEInU}EtQY8sMw7#J{Mn}J4`0Ye*q!f1J9pek$Fgo?(er9> z2FfnOeWrILu&AZOJbfS|Q)(4&8|U+E^O;1dgdLhIL)UtWL)fw}98+yqdJiQ((lI+8 zBW4tul*Gp)>m;z)tU4X`6i7Hm`yt6!7Q zt0yM0doufe$xUjJ58lQPYk>I3inZsw}AO$8XNo)Hllcl5SdpAixk7Y{~HUAv7^M1SEus*XqHe)wQ+3rayS_puoXBmo*NOwVFdiLqkxpMjl6!_{r2o=uu}< z_zZMgL>yeRzPiFS-(&H_@ zL0Ol}#7_bUX(03@9G7?!{5J-L6YqzPJUc6Dz7JR{I_DxUgp00kgz(nJV{M{{~i{g z5cKRBV{w^~r)e=r0hyU+0L@f4HqPab6B0Bz++}Zxdfm&SIbTL=d;>FR zfTu1;lvItV+)rct{r*6Ik2i8P+Xb2wnZkfbf=ovSp_X4W+n13;lzcL!N7J$BD0lbh zs6!i}yov1G7AxKiPUSq?^}cuwlpeE>maUhxadTt10DM~CY=+$27QO&cj2B&e_3Bkf zjsuvJBaHUaO50T){My>%9#wcW0^s*)Uiz-l(TJ7FW-PToH_3{0#sXL{lx7*3}YKm8xxY%y=`?p)q6Dr$^Z@xo&};r8A>=%WkOkLOAEJ9t7a9GnnmG(?}w zWW~%MY5LJnZ$l>>sNTBn_s355!vZ|AfliuvO%8wuoY)d}l2^Oh7UcTE^}*hw{g{A? zbBuS|G~mlD@YV;N)?VEdLYZ!I3b=t0UL}XKz9LOypk&2{7&Pi8RG4~g?P{f3OXMa= zGBL68){i%UO#5WEr^_7ZXM6BwfRW;zS__!QyN-+AA9o zFt!)^*goYlm!3Z2+|2u<+&MLe02(lwIdu&K9sMS`y|6iD%gYU{!|&A6%XX>wEw45h zEA+$Rva2_dCt^HqzU7S_f6+L(GMm2e>M%(lh8v6X1DV_6`0;TON9%CpZqOkBcT576 zrDh}O&3UkXBf7?)f5FMjCOkY(YviGN0!Z@cPy3intBor%jm4c#oS?&^xVD&Yo^}Q8 z9(`El2{A}8W!;$(dGF9(#ufBT$JMJ>>E-0*Vezc>lE&Ypqr{8f?{&&j0}|1gHk^}e zyJrW=%Hm6>a4TM3dm(m>cRwKYA!W7CVc&!VUCskmbiSMB;XV&ph2_y4sT0S({d+C$ zYsCO;Ec(;09Rq{rO>ids)^DA3JDToyrTNz^W8KV}Gx5s9zdZ5nEv$f25d$1B5v*)prND-x$lLzwIg$oyw^YU10YHCUk)z7SD$oy1~Eb3I` z26$kyOZp!cinuk7&g$a)^|?;2v7r(8*J-ZL>a2#_s`UOc;=HcZzRnpkdT|)FJ;(yZV%BvbmyqzDA~;IT zMo2fk^q?Pe^xhMo!0?7Hyhi5Z_BrcepLJL}XgBCoSbH(0-(;Pq{47{a@BGP+?zJi^ zldo&h(fo9x*U5FApd{U8VCPSNXfZHnTc5gXv#gjByB!z+zbOROuxU`kcK%jKp~P^H zH>)PQ$sM&Hg?8yt&6iN^hrf?9bd^t^a^s=wTk@Yqq;0busqpPSYiOWIhiD5g{iUs= zlQQ**KRP;kxlAEwb=76dK=JeXT+cYjJ%AM`f&2_w{y4!Z!AlJ^-`KP3=7l!?3ZSiK z&HPO$mA`s78aCn}LlQ;3ploL><06TYh(c98&7UC+W$t5d!OQ7 zmbA9sEH+#kFku=e!lmw0)y|nU?cFkPD6XaqVMj2lEmq{?*xVY$?9yr0a9L90euXvu z&7s#^i%Tk0mVuZ7Y$wKMe3Kkb#3ol)^MLtD#UpHrDX1Un)E*q@ySbFMQ=c#!#4;XyFqU6?Qwz@8 z;{btyBsED8A2_B+RHVA1wHAN%9 z?|I+9v(EJ>#mJFwd14)DYiT3L?hx zZ3W`iK4Tue@HBT0`xZ0u@e&@q+58iCJz{^&&bw`q%M*2LR`<*5V*nD}qpb(|7H>?F zYaU=xrKAS(;jN7@Jx`q|QE$S1YB4twoM>gD&Ia80sgdBXUoVBp7bLGgC?0WckD;Z= z>!h934bg0HXjW4rZ(%eXF^uLH#|v`{fT`~10B&J zqEsg|jqFiZ_})Cc(kXr6tWW;!z~JD5$1}i(KfqL1+%L7$yz;g-CH96TAfB6l{75% z>C>mKbo1;O7Or<+gCwl#ufrmtsiLm(CJHMO^NnEHZz6zb6IwPquI|ujt=Apkn}Fw1 zbt6*=Ww=6${!1PDa|(WR@S&2!x}9&IJPF?az-!B?v^lz~qzVBolv=X96x_#(s)LiQ zqKv5x4MKMO4J8}_(E4x@!;M$K$)NQi;DBXvA!wmF@0rFssJRbcR-}(3rD_yTu zx{x{6s#&Wj)v+z;^wGEZ6yOX1b73a9m>a4iX5GZX8JODGWIa2+P9p|k@_T!Ujii(mx@BUWOJYr{2VtOZU@Zp`mLZTEUd$dbO$1I z1*3jDFe2yQ!Mf5W7D2jxpLxcM9W-X8tbdTAH7f%`oBw1P$be^AdDlQ1AN5)^5 z*rY(<5B#4R0H?KMJrf;FI8^YLfP%_JGH0)#$7RqebJ6J9KIA7O2vn~e%D4f8AJ>Nt ztP%WvGM$jvv391v6VD6mWZqA4BLjPAlMx9Dl-{m0V^c;|63!FK>zkXyG~@Qam;hjD z)~>fUL!h8nQd`Rhbpey2wpMX{V}q89Jvb)-QT+sf{Wf~+)-q8s(u7($5}|j+p%(+* zZXyo975(ii1*mQ-6E`+Iipzp^tA|+X_tO$WRy-?2Q#r3*3Czz=uc??y{#{Sf%kF5m zTr|bUZn#u*g|{gClNHa<@Njo`0SEGuc%9aUj6VKKdyvH80?M==!nS}i(Pa9C81H(I z%ks+%{!- zMpcJE7Ayxv!2^n;1L)d4G-d+E&+GZqnF*9dAAc5zQ6QXv#wwbcLYfBx@}@>-H|e1y zqgq4iNToa03HTsez_1vnQZQcz6t=n}1D=8z0?PY7!no(&Ea3kk0|=iu6qqHiI%zoJnz^RQpP3{r{GZ$f1JtuY0GMEwtPbq_S2D;Z-y zT>9X?_r;$MT+(;_nE~=mOP=gQ)F3!0cVT|Ud7^lJo}=}M%%Qc&6Po1C`dvSYh>=FrJCvL) z?ug0la1lFyYTl+}y?z{$GdxUi31vh6=m<$Wj_w7n*ZBB&$nYgTR^X6<&e;Gs#GIaB zJXphx+J~x3(nUlzhH+u3xNKHMAhd~S81V7TK;I>m8L~ty!?d*faAjUA5A6mE8UCot zduCk}-0?^SP^nIZ$Ii~ocvKabetujYsq$d17tY;-1nDlcb4IhKw$se~L|pG-B9VAL z{G;&7Ji22hsPt4}Dn&8R(`~wevecT||y@J&3=v&omndO9okfW2=&U zEE#-)_YUti3Aj7!`|4;7)CE%6Mx#IMu(EG6qQ|=@)Z)&;cG`n$7{ntT+?h-Q^fB`? zcd51p^LZ~u(`wgW*M3xdP`_)z8^8G}D<1WI{hMuGO&Zmx$|prSm3>c;7iZ(akN2n& zjudloBO4d^;#Gk`;^xN2DbDEA^693oFf9L^qpV`(YSdLlTI`IGH!*6Nx7r3$l}<}6 z?u%VdN6Ku^DGL9qx8f^EnqLcvdHoRoH9}tA64Z*CIzJ{u=<{08`{q=tt$I_EqEi4ZOC-gY7%gdkp9VN4@-t!gfkNovhZ0 zUykf$lsJF>u_el1=SPM)O_o_iei`G|0PP5%*g1163wCZvn$7*9K8Os|Es!vjGgNK4 zX#UNTNS^5`itUTB=8B#>;<`)pTNuKvCgh*vDF{5v;T{j&dP@01J8IhuD# zaiUebHGICmg8?IG3$r%;9=I%tiHXP#rg3Wn%8<Ziv(4V~1RQalCMM3W0N^2k8d65ZqA{xM6rd2^f zO+e&N(LIS_r`-Nq?S1XuhwPl0To3y4ca?3db@k^lt^)%Tm|UPMTdS(b z;vXey_&o>c-~C~G(WhY7*#6TR24H{uA7K9)By~XDtQ;MgAS?0R^0Z_FU>ZsWR_?WH zk3npAas|@-UQmGp`RMAk0a!VOh%Ep>_QkWk5C}5x(d*Zn??M~Zkmex9ypKhKYbPO? zk#ib}Vcb`ho4Pv3*8+y;<0L?VGW>G|7u{ojex<)6>U+3Nq9e_L#i4M#5?FpJMP~rv z6ve+x%zhCPhL1!bvapCtI-p<+>sr&NmT#&(+8f~jEokZMKi^)e5+5hmQt;a4wykTAGBNGL-HywHo!mHWJ=<+$R@cxY|2zRwqnYo!5Ic3nj`v)9$ zLb2SlMKf3gRZB{R8$y{P6OU@R2_&K0?-eFhD+@midS9AN5ssr zyR{ds2Ijc@m_KUX0+~^hzu^=(5dAr{={kPfakz9J_@`QH zZ_`;{c`WOTT1Eq#f(i09|Ggf4h{o;kLO;s&UfQ6CagS@;r3B|$pPGcR3_R2QT3Smz znbL=Fnw=@<6RGb|JE(zYsxNXL&SzG{m1$-oo=HN~-374+w)P=|N>A92Rs$}UmH-Zf zl^#)KH2EhSqkij!e*)-XiDyo0MNaL(P9`QMX$7kK-CLi!IFX6_tlY>o%P`jP5vZ_; z0GoAOuMFe=Y_o3iQLbi;2OJ-di5+Z&}&#Opup9(a;WL z@lP;nQ{W&Vv| z18=an=4xhMUS#>flY^kY_V*4(3unF?vA@TlP}?aY(HwSDKZ1{onE+KX|4C zx|l0{ynHERp-$5#S#D8^4lMTc)t1exBz|FPTX{yZ~aMyt=A z_|pLWKdjY%M4VLW_Bwgy_r|3a5E=fQZ3mxJ|Mt7O(E}Kf^*^>lRB345{?VN+dGIkm z50BP){<}72aWbC!0jk(|mM;9`#%MVMfC?51N}eFnXR+9;j*fXbLBLG1p-B?pYCj&> z^se1)_vP;_n0!~_M2-j>hsB$`+oqI^`xR^mX zA_YB(Cm{!7Tdtaa$>mCR9ulDyePY~F@6Q-$T@ahwp7FijPHaZQu_)eb1Q4K;82DQW z^Ipgf&9bccrscTobqkA=OI5hqr<>cv0p0Ou-1E(cl&V~`Q?hj4{!|;DVNgPOgf-`$ zuDGK~TE1dPZzZ(D@|W~+n5XuNd7}D2-M=`B|J+1oo`A&cxT7*Oj z2Sa)WdWS1pqh@p_IYn^ z*TJXsnz2g{AyD03@Q79Cf?_7-x-uX-jtuv0@B=A{c+4*}r!lHr4G9R`GI8Nz)Wu55 zILQD;I<9j;j1CyafE3Yfb;J!M+v55602(fh~DpTW0+1?Jg7F zcUoB7PaIwT;B-ek>?zl|YDF*p$JT3WtxF?Yc3ZnPs)^g#3oJ)Lkbu~j$NTdgKmNJL z?A&sF@QCp&{X7=ic0u~I$WeaIA!w+AF7y+;zK!Qp9;^zRcL^~myO0TAj%4#a{R#u= zS>3wlMuyoBa+$_Im>bro?x2!wS1xgQ5cyW0h9iRpE!h;Maz>C5gY%5=nCZ2Mv{W{x{gyZeCt_d)!MfgU7{GR5wij_Nj@7W~OZh-5i=@2JVmOuP}j>{~+O& zB7lUq+o4Th-+znM*y#ZKc4GAmA7D)b}{r!ad zw}gx36QLqqeSJZo`DhG098|dYn2q)y?g@b#+{VH-`retN^q9$f$#vm9a;Z+3d4hVFWz6TFp&Y%#AV1Jx@Q2*48@02}wMERtA>$0Y@RQcyX<_gTFwoj!v27dRS*9ZynVCR5(bW}O_dpPM zn7P!Bd>+0{IKoTMwwF;uPcN?J>IW5hcMT0$teWzheJosJTAV7XTg?m9Q)|=%mkzBh zc6$EWi)@>E3<{Q+nSd42t~irXe{4djZEHp?(g#HMQsvzzIP-}kPZZ`$y6a+|_1wo6g` zoUE*JXA9UhY?2TZZ!mMN?Y%1*nq=!7zYA+KosnCc-xB4=c@t0P=H&D_V)7q6u@3NR zgOg$A@5G6O;b_!`1Vr^24-yX8wkKhOxPS$2y}jO}1}b--N!Do$nNuaOdyBvBCj#bS4PR{Sn}-AA z`>+2WAdgjhQ#n6xlc3;zk6Knbk&&Bw&DGWQi@$+^L4ifvA*ilL4bHpioT^)Wbn=kZ zy!c+w9&}Kb_PqeQy1L({<1YoAAr$<;lcHMGDq!Uu*v2OTa1SZziRpO9Ch*){P=zNZ ze7M^9LYh><`odt*b)5MNwUBK0_<=B{;AiX6wf(z(7*Rn#vL2OoE4&sK7VIKPq6VeP zcFs0sWu>JL2MaCCbktiyM(HAA`S0}mihnOwgTgh909ss5Wk=1IzT^wJ2{{PY43_b3t@ zmcjQ7fM@OvuSH%2$R$Or+C}RCS=74Tfg@2uCRtykm6kOucmNjCG<@Y!07(`)fj44o zj^LH-2x;`HOuOd0e<%(-MUb=+D-5drW>d_ORyGNaGdmBADK5ezMmJA7&mfYWi~? z7tPs953K_Oaz=H^!oSf{s7ZQ9r zFL@P|aAF)Cn$X5x$0*ywj+14q3P>hgEjJaYAtru5HhR>h@b8ihBLm>$&2H{HZ6u(* z;C)5y-SmuEO=B8p3jN zyz(oK1mnu-gMxwp!MkOl5#G`oOpGV!^kzg11xA2XoOZYkdREyS!!C1Qx3?GF&${nH z?t|)~Ep+ttbgSu}evjPeC3tSzsn_i~pfbt*`0T>;Dr@X*#VL08^~JWEa%AVu#(P&W~*0t(!0i5Gtnj+{#L zJneK=VT1L0QF!NgQ|1{G6Y|}=qu@+l3Q5JZW_LIr2(8IO?tnQWe_>G>pq%s&JRHt! z8?e?PL!UY@vBedbZgoFg1hLJl;Ke5Ixy0l8e8|fH_~A=02vvI9b($TKLQ$ky#xHTG zg?^7p!lOvX_Q-)3AEHp*o-i+Z49v+Vba+0aY1TjgY7**!;8Mq|go*E>6s=hXO3q`O zq4S#0NIy5=lsU1 zvMsoA9Cv(g+wZ}|U1Z;UIM#6FFyhpDf#S*+4))IR79muxBNGyI9gX{9wv8*p#Kh+8@B!?n>-W5e@AM2aO;c%JQbKR|oDYipD~%-Cn{BT>b&{Y!lJ z_rtpNO@5P$gg8g(?FXf#$?)URBw%RS?h$bLm1pXw zPv9FuYz;IH7IWWq--R^l>x;u~PDFe`1vvy>cRRMAjZS4VOP z-Gz1|;=p4~pz9jbycHhYB*J$M=ja&ugX-sVyR6ZB|0ssMA6jQTVMI_zNV0m@Y>jli ztX=KB>z?rL8d=hPtS<0_%_zXI42^Uvn<|Og3H-zG#>rp3egWs=J?>hx8F1iOtnVel z*rM}t%u7h-I<o5T3MS7&_Na1wkL;P3IV-=ek~Xav>L)(=HQntbY$C)33;%^2qG#1-OVL zbW}d_0!XZK8FPR8<7+CWXt0wZO^3`7i)Es3TUIMgDbeD+W3LTTuNGG zex6Gscd8aICt>ftDWFgS-b6>AEID9fZ?B@O%k?fk-g$ZKbIA6`B8G(9wbu*?28sNR z*x_$8{I*kIeL($nXlN)ze6rw{m_KhpyK+Bf>!k9KS^%$v#&mIXSD{5)lVMDM`2<6~ z$u%<%HiJ_Jbt|i|8*d#A36}EkMI0T(w&Gsx;pqRIB=_*`)J-zA@fVN3V5=c@_M~|U z=c~6~x;eKzS>gyAGwD+F=K@Gxe)uet#yc`2Pr(DsEZi~Gro~4!Fq57}Bfb*PQ_Er1|7MX?Ma1UKtKBNfX0>Yt4{wC>aZzBrM8| zxN(3!P>HgN!HvA*rz9N0|6uF*T9UD3;VsPHXu=ZhfyIo=0?YAl4z!$a9{Dg&tFAc2l z7hpw)OY3N2054)f*yB(+cZ#%)rpojA%pNnKHOX|;2eD||%gMb0bd1KsnOOO5&%4wX zfE|x;ki<|(FFar$dKAo~+NMIcj+%g{t2#Fphogo<&O7ATybw7*EiVMmxkv(E?g5^j z1ZaM&8D<4)N8me;f~GjwTa+~p_Ss>3>^^=W{p?iBg2_5h?0Oa)yfW&G8&C8c{R}K_ z8lT_C$~p-;EVtHB)EA&YHw^9!_`p*}(0!%}kE)fg$0L>91P0?6Ri#Zd4%!VBtLoJb zQn;oiQH1u+8NXKXhx;dmfK~kdUJ~qFQem=D_@}I_w$i02Lc68n+S^XQY0D&j3Hp4e z@hjRIZ=NFB`Gnt6V`mHEI{m8FBzaxW5P+iLSwql{lr+(*9o~XEIy&Mmx;|=WVOKT@ zE3d3P3RF>?wEfXT;>Istzditnx#W_?ZW+5Dratm(Z^h5^L$%u@xF%BK0JafL9!8&R z9}t^4vdD$r3Zf{4k5o$hzL&*zPg@zl!?3Y}yO7_%pZD83<}|N`XuoX1vgUdYy>JcM zKF5X+I_NP4SJz>L%7>r%Wxa`shHaf^B%&H*(1bfY7Z23Fv0RVuI@4q!EQrp}-#e4U zvUhJt3wkB+-op0zE)yAnsWmWcj;SgxF+!jDNI+=VmswdE7xm8PY(D+P^|F(w; zcbGdNeJ~NR#8ekdx3;-B94tQBMhw#{odHt^9#)1^No!!t1lx|WK*+q*;xR3$6*2Fcm`Q#$X^rJNDy`7=b=tkLD-!tT>wtbl^NYXfnFg*DJW zCklj)(iNRWOjrf$21z@RqlE&o^u42?^pvyonr1Fc3UMJMY=0=#`a~)&27)&kE{aB#ozf!3IA!%1&1|)}5ds zLeX05;KS&5QZM!l+qZF%NU6G{M}z_^Gqv@VteRI3!?k_Inq(fjySvvHd^uWWM4)#c z-wyKu&u&L?it{78NH1d0V*}`o!NgD0mZ=%m4{Ip}KYaui_ zhqN<&QABhADb_(OqFgkfhG3x+_X*rmGBT-^mG^NyC7 zL(PikJ_TQaLe#pONmwa_VNnP-2RGgYKg!(>oUlkw`ggOb`0(SSKcsSUa?;FOLM^_~f0nuCG+0KuZ7i%ios(fQ!tQR-)vy-3d8!>vnn{iCq-;;T*rn?U? z7xGhWysUcufca}B`gSYxjag>P-pYK|pY;dQtAA2o26XV?LG0YQ6W{#iH)Ag7Xz|Wn zG}{79Ha}UJO1`#ywftmXr}hV^=Ow~dTHGASK}Q8 zt}(8Jjrp;OZCdFx$dUWy?F!pn=q907T_$D;X_6nUzmA^0mj; z{vPZ3Ge7hEWdBdH`H80H;*G^=`DUUIj53ZT(H3a7^OKQje)NZMGG|a_E1&g`pPvlb z>mShow6?a!Jq6F~f#RKp6-%rwKrP=a&-i4FD_|@0jbn&aP^9lqYs~!D@mQH3{hZBK z1a>}uvlRsE&-z=PpHBTF8i4-(ew3A!CG{cP+S-b)t}Zk;H{;;JgAw;jXA3Zye2rF6 ztMlV^vvxlJSSvr~XP$2~G&Gd-*KsyCH>0(+HK{kDHdeDsaYpY0bZUO04g%(oX z0%Jb&MdkzPb>IN>i*77lyci`VB`7H=iFsd*vFXWV3xN5|XFl^Y$#-9O-F0~W`R4&Z z|IekR4*&oL2JVjd_mLxw2_HO}K^wcCl9CeU=Uo2(-`@SBI0!^x0RLQa3}F{6Q_U$- zO%>}sMXEi(f{@-*q|qw<)+z0T6yD>d(C4bFpvHe2z7M7t$nYB7#BL4ZDd#BSK0C4@z`}@!7{k~)RMr)<#**9yMBnjd;hPC$3T&D1~R)??LZ`N{d z|5%)$b}0^0Y4+*Aw%@gOX`lYK{9P19j^j820M=T#u3LUs^V`p!o*+i*$g@XPqRS!r}L%VzL3L*K*gN?9xIS8ADM8R9rb5Cjkrr#hFZe65wHTFWJT-DukS z^k3iaUc2aT(cb}ph?I*kFz%oChNOA1^y#nZFOe_|0igEfTXHV+>C>m*^dTZ;v(^fL zUdL9D$Ng4Kw00000NkvXXu0mjf7`Ozn literal 18191 zcmd_SXIN9+);7985d{$&pme2+ibxX>0)k-ZQbeVSC`eU$4>k}HkS0h+=~bi&2tko1 z(mMe{mEKE$lyzoMpZ)B2@BM!JT;KV3ykb^NW>)4}bBuf3;~rxgprxTqN5f15K@c7C znxZxYQG%D0(Efeku4Ci+1i8hjmIGf5$unnB^CK&(00`bTgjJC z`?zgnwOh_B)zfh2=*Q_1DjkcfBylQkStldu~%`EQ6rOun#g4b^HJl#3Q+2OiJbjUZ2rOkZLj{2S) zmzEGEBBs_!cl>jOsWi&bVh%||?Dq((mcEp{RG6s9jjp{lX|{a+$=*<&)2jO(#Ai32 zlf9`DrRieTI&&@Eo32jpRGei|02i!wM!)Ev{qjCxnA$&O|XP0^A4@pkopJ1UE zTefp!-Y23Uh!a98%ImttEexUD47IGg^PdP8Oph=e!`*Ip$(}T+T#zYn zF`2KSy5QJJ!QQU{OU(z;=??6Dbmct#M4g7=6gN+*KP%Vt3AJSIHxJA%j8Ml$TpINc zedfhM%}gCD7jyg}&nqhS=6Sq-QK|CBv(2yWFNt~f;5RP&D81U}-J7#CEP}1v9I#eq zt-s#)BS8jJwlx-5?6vJsNmy+f_;BZ`F^ahHV#b9+JX+E*t?=RK6(gtis~+2vQN_-4 zH!6vnn8ypKwDCQY@4hd%i&vQJzJHYEP7_kXa7Bl z>LZ-o!j$IK=t@#K_spB%L&y$$t|KxZ98$Swazt9WecskfG_T_&*wB4fZb6?^M)xoO z5NQ=1*dJ^EM3-heQOx>{NRPQ_sqNkPbf3B0(z+l0(+qU)+cR79c*7+Zv8$cu z*w}7kdeSVF{W}EpJ>Ufge+42l&AI!8TZQ)}w}Ve>97puFK2z{Nl$n)vX6gD5vpV|D zhsD`lrRWO>oGG+ulzj#D^H_yxjsz*y$45_8iQ~n{rsOcuAS@VLmj8$&J1eV>P?@W8 z3Z`W`uX~nJ`scRpnbezS(`x+b!E&}H=7WC%+aP^HS(6CcQZQkSA+Ywd^Px1gw`0WI z0<*og?aTf~HaNR`+_f%CJp(1;=VqtdNYab1MMdRjOKYZ-RAor_qKwiCTV*|e5HDhI zRk+Hy@%-DxDjn_K-s`fl8tGt4sl&s@$cyXas&EgZ?FnVYm0BbxnBvle)kM&08v7!!wb( z;HFx4cem2GKk{Y?`hq|P6b&q5Eef?Ab-T)|%w=I96~9;^)RsIwf2TDqjd#dvty%uL zY~53OS$dmbq&eB2_ZMAO0mS4zl|*o;S>B z^d%(k}4`H>f`*wG}0@jyTLtM7^=|ci+9>Zh$*+LzMl3^soCA+9H&}j z78^8OUU9C$byeO2rvzlY_O9R5kLr;Se5W*Jc}`jR`b|fy@_DIo`XMs_&fWHWmONW7yw~`{;@W{U_zkym`m|#dfnz$9icd8!Le>u*6Gynl=eo zZ`_b%<@qQ~Pk9X~tO(3Fj%3$XtLd>dXpxnxK0CWAOX#q*?O3KxGO5Y;`36r4p=K6J z7x%|WzvQE{#r9uyJ-?FZvomw|r_U$6?WPX`SOjpR_bWBL2f^Hq8$!A_ZoK)%eYR6g z?duta3G}D%3pF3lm2o_oOL@=XbBmC0^Tv;@vQ76*=iy_usI_JZ@5)0%iUe)#S@PF) zp;uyRRQSHj^j~faUzqy(TsiUJa)bZY{qflQJH*&v6B{Z9XtB*vD!#;Lf1gtDIDe$d z%<^bW9pC7wOBE*W&$k$VLkN~W{0yYjdf#6L+{>c@iW*ZTM|}EgvKF~VQdOg7C!m++AS*`OlXQ08R_UOI) z`s)Ao&K;N@LHLjnB!5X)S9cmr!wWL_{*TWMe^8c&<0>ENNXiE%W?qmDKg2C7)g=5mVn8BA8r~ z;qlAVrVk&s84NRSx|6o2Hnzq?lu66}h-f<+%KIL$1RIEPRJnUzd-sa;@p*1{tt{I4 zubTh)AP54}bdx9_z07LL)QJb6ELS$d&FuS`Ro3g~o;`a!#)Bl*XS4HX+maP-)Pngu zyCVug^ELYc!(w~~o~o}L2hTTOkeL_lb?{_*ip4&%)#tcD_?Ub_ zf0tzpv$#G=a)smBAHuQ0_R_o2vi2J*^z3`uwQv2yJ!yT5L*Jd8Gv6i4XVxhJ#MKHM z-!gto9$N})E={*Bu`oM1=tucrdKleE>b0fuAfh@E%+@B4S4$clnTp)!7=K4fmQZZ@ zX{@U7-IY>jXQYu4mk(CVHLvr7Yrg$lspM5Gda3p~n@%D3&2>sRNn z(D+s-FO02WnRa_lfIiEfMHE;83lCU?4ILf5cRyI-OH_YbXt0R?y;c0*4K_VmH7wRE zJhU%bB#K}VM8M>-u5vtzYeQ2*&}%*=vf*i^&g`3*+nLLE-DMU_WyQ9(VJV(Vl@i*E zyLNYqaiMEIC!RV0Us6b`Asf z=%6TkU%?CW_SfAYe@!T@t(l_lc)%r$KiUa}ZA%KTC|}3y2Jv4e^>){!?pC-8c6O(} z^xK!p%(AByoeA#v5S%uSX>kGuYGRWtO*OLPt?<-kbKO#2p+*>u_vkg8ily`PRYs@bTQR#^9d8djbuj*6yt(<52-~kQzwck5fKxa`0aZ^tUnC<*^yPnrkN-PE z0pI?Q!1U|P(a*qrWb3r`l{DdlZ_J$re|J2#*8a0KJ-80A>4AR=a5C{*sV0QtQC)*G}32=R6`Yu$W6$}k_w2wM_kZ)X$dEa5IOFBIcjkmA$#@%87H-nsV z{Bf!)64WDaU(!qgvt+3=u_< z{@9%CBqC~SS@S&JM8DTC{V@@p6I2R2dwb_~E~{_ChR;@y%Yo}*prb247v8?(w=b8C zJ=k%3V=~d&YinsD@BF!p{9cRlijeJitO@B@tv{M~04D6Lwu;FTB!)>-xF~>sHQY{A z)qv^_b+jh~EaG;rv7hmExdQIS)FCtxKsm54GWH0PDI6j8)$gnNgHpg-IO%x4#6N#v zwrf@B=2@@=C;o=@zelPi#{#T^c!iwO!HQQ;{HHke-x=B!cL_Pj_oRqLixZg^2A(g! zCWIz@EU_EPD#iLpo2e2UzJg!lv;f33D=VwxmPI_sJ*CuR#hbIXCZB;w`MT6nG>c0) z_$CXQRSW#+>d)O=vv{S60-!0U1xQ*u+Kzk*5HjstX*xiD%btPZK3W!76ZJYL7yw8P zW1ze8SV^rAAMhIA&nemhfF=WCC^#NP3p_~9SUWSK{gfN{K9$U+14fQhQfU~-u>n0~ z(~Op0$$R(iYr~OGGh1PzTbla}V36Fym{rhP~=ym!^mCf+N5{}67cB?jsqui6i5aj5=+#s61 z=3aOmVP_rAJp@3vim#gN6aTDoVS->Yis4Ch{KM7{~4JRAsG~d8f`vK4%0{>7y#m6C z6)X6V?2i8k2H2F7E1x>oGc{*iVbW4PVX;d`qrD{8Ko8rOkuX%@eew{F%g5R}+i|ns z!t)qyeXQ=*(2|$(v0C)xoC$7GbA;49-%ZmwQ`9k21ni+p+Kb!%qR+Gvq~Xd+M$b?u zi>uGs=Vrso%Ztv>iILaJN4>3)N0y*KT2LZ2&&|$iD=5^wsMlcWj?q||Jr|1a_V7Oxy7j~Ov!$u299VIX4CXz6$$QFm`$*n?dGf9&S>?-~aZPb7P8VW%cy=vI+s=$mr}X^V??LyoO79)Pg!si6Go1RP(x8uE=RD;;%a zt#7zZ0GD%&?2RoNmsb>lKBFEl)&2c928iH3it40?0Pe8s!f|CaiyS^%$&r6NKFzM) z;LIOHSY*o2JmB`%>3}eGMo>^W=Zu98!Ql!$CFJl%BVFv$rHpIb7soUlOTPU%r^0gD z{ZYUyG{{U`GCLzf>rCY8;yHT*@HN2D8~R6U{KY`N2C{U8{HmR-Lu^v!df+lD!SD}< zxxn-Pf!c!+zZqX-8q47uB4dy2sZw3>_%h+*djLql<2w)h3Oa5IT)Rs`e0Cc*tmA!m z{6!GOWNR~AThWLP`b>n!C$LJ!Bm@(Q;BO}|vLYq@LWLaW{stC*@iJ!`@~Qq6Hs0?2 zA6~mlM7$8svY^-h2`9MKj&qPs!!BIpM=e7+rCb;pO1K}a{cIj~Oiyrl$?ZO6P8i%@ z7f289x`{*uoeg>5z4kv zE)v_Np|P-i7)mfwhr|_pEUzS_w_je@><>K#(Vs}>k-K0~%b2AD0c)G8i?#1b7#_as zBaxq{0p6%@<&Gw&djA;ui(=zX=~DS}FU%}-=hQZBbP(r?%^Qy{ZJW#w@F1)B?)+iU zWD=bR@Gxv04BO4x5ENN+^wa5qZxjZZ0EF!tICAz(nd5kz3pb$lDv0RKKhRj=B*FI{VjlN9{buiOSR?QOc&5`u{zG;1n{zngXtweJe0(E*0Nv-5AC* zyoT;8Rt@vg{0h_{#va_~&vdTTFR3ZbI|#;i^^&Iu-a& zi~S4em<)jJLeK^GVN^}2q>Hg$L6AMM18jiPb-;U!;^y=7dajhDUbN~7F z@vzocCohPf`Z&aYlQ+CTN)~!{k_uYAab38mKc({lNJHkv_Q**lL2}dP7f;rj2?G`v zV@Cr$V@ynHh?QPv4^m92ir^f+fwmw#xFUr{v=VzC7+;>8wM4^vy39*2U;JodM|aTc6W5VV={J= zANcU)nzZR*Wp5DDuYTDN(S)g_g7U^IwXcDSr-xg4HRPe)naP6$sXzw;%rY`E@^-nC zfIh{|v!T}>9%?X~K&_sRQ$F_tSm@j*vh9vnmJGfs9^cs5pz5I}mjeK^_BJZ9OimcC zQs_+A?48R;+vy!ryBLourL!YF4YrkDHIa?pqeX@%9grq?<2N%)O33V}{>^F5&})~P zo14Q@-n?Pl*xbxYPbc&916ImjFcDWg5*8>nHLuB^u$AFM7;oYHdL=a!Ry;jwK80xL zD-nz&n0PxEYRGPzr)oc)Kph2gjX8&V2;;Y?4=iX4P(DHo=nLU-MWVNtuWBO=_fSSK6q9;3S9aWs*?>YN%IMfuO-6081?_sAue;Yv?hl62YNwds*BPaXVa_%2>}coW>Tx3bm}S-|D#J8wk987Eq^(8Nn$Kfm32b@KyGage}-SFM&=ZRUf07%3VzaS>fIHCzzK zir|k&wpGgpF$h!@yU*4g?A=I5l7c%!wJI(@iraShb3cBH%uR5jkFhJZ!uiE|*ntvt zcybdH^bH%XHp`-KoXIidF_%JW$?s5h{{`ShJ}@_LmS>4$?j!qJ(2I&>OK{V zLKNq1zbIkbLObDW*1SW+-tdUn=`FD6XA!@ebFR$J%|+UvEVou$ zTa}KEj*A^I)SF>N_E_2XE4BrEZ@Y5$g+NoK#SdmWQawPPx;|i?&p>c(kzTsIqkI(8ca1aw0|Ne;8p6)qF37w>JK{bn9CtNS62c>lK&qxNpzt{9;=Hpdb=ha5O z?E5Z3F6OlkcPng94%LC2O@B8Vc3TpN*AP4!;P!}C515SJscoUU&?IS0WRjOciUM#N(WPMZ;K6kZ3%g_Q6>dSIqN1+= zhb%5G9{zUu*oy6ub?RlyAvU(z#p&0gWkN|nIYKhu?&UN%%cuj=w**&{DOuUAk*8sz z1PX3@{?)f^((7NU?<{z2nsg5i=AcMZs2)())bN-)2kyxdj7SK_dZ-4ETXv?YgPNzV zqhq0zv~;8jofWnU`|8DHoeSn-c@TmyN>8py<1X$Hksax>8=0)0Rw-mFqiIA5`#r|* z?3@NJC%_H+SQ(T~T9Uj&TyijZxl!xMPMvyIMr&Nyaod3+q!nTZ%#B`Up?5k|nY~?o ziheT1h%|`+fVPjivs_o()wR^h!qSqVE5>7Cpjb8L8~{NTv6>J`nr26Iit2FWe>E;aFp=5J5AdfTW5od*i*(Xf%h6*oop($?mfSN zDa{|*A_MftkoBR-ph8?A4vRwMOG20unaoU`bPwf$r%#`91($P$zL5Aj61?vdq9Xqh zt1<`y!>vnb*vHrr0%sL-p4DAK4|N|av`=LXP+b2RYyY#`V)6~_bywqCGkV6c+GoQb z!_=>^WbMQ5MY6WGcK$-e!@( zMa{(Tz6b~nk000UC~dS8=ub4j`uR2-JIUUb>XgTMov5H64*u^L4IK(LIr{Q}KVYI9 zjgJYJ9S&*+yheowM&Ucf9tT4a*;?w9iVrS$izH}&IvKE_HvH;2Ay%2xw1*37Fc4+l zIImeTlNMWar^ZiiTr*xukIBd>v}*ae&~z=6NtX<6@R+3+tISc+l`l>HmF^Sh%g-Em zJsWLf|$ zuzUYK;H>S7LlvpMe53b-ETrGE4459hG+PK#McP+T5@)9FcLS`f3jVanMpnVkT6`9G2H=dNtfjdve+NhO(A((IP64(o$)rl)?D zvNC9W6;FRzeoj_r$q#sfLG-}GoZzLoIokD}hrlt*Y}&8z96i7{-B+@!XMp=M$+blJ zuWW;_O_BTPfvMT-STZsSMlzdo?LYj7dJ0h`Qd*)UGGjQ-_C!io-Ttwu#t--kpbT?& zIbt(o`o*LQJYIruYjKI+bb*OiZ*9lSND}13`~WT)d%ZI9jV1ZoK24xSxiQ$zu^7+w zZox!a(eogye$q>EQ{;VjHq_mz^Fv%cquk@=jppqlt!2X^QOEFzZ6PHVn)6WD0=+<{e+qME@l@e+(%UDtKDfUH{(JPE>gJ{+ zAA}UN?IsP3WO$}}@!O}`NOsyg^4ely9{0CQe1kS~n>`!gz43hgi|ri0)_2dE1_~N5ZDFW@?!I z+UIsVqtz#QIYT3rD0FvkZ#MC3N-5jHNjQ0wfKD%SoFYf{rES+zoH^dJW}D-!t1EsP z0~Tbqy1sN~6or;~?e>1Cd;)HdEN&jg<1lSLsGw4|uAZJO;?TrH5(je&>`5^JPm_#q z-EvnOe!6qn1_T3J>4)#^P+OC7V?iYoQ>9s(9C-)l*X;P=C3lQG;6wvLtlv@iipJ_S zEXmG+AAY}@urzh&3zghQqKsHG$)w!-mMi&=EqWCxYtAF&ZRdCwJIyk(vsqT$0N7p& zBL{h82Vr}S2Z=H?$PU+(y|s9-yRpvMqJqS+_H(A=IV}&e>CL%t?sG=vx?x42i4ds} z?(mU=7-56Drd|lElnUWdWO^jcVcT^Kub*u@v@SOm3WpA0)vY#-)NgN&EmYMrH^qne zC}_^ZOvSkdN3LC7MQD@Pg`^(-Cf=c9si1CkI&nCYXyS2YPQ!|p+qmo}dW15`cF0Ml z096boU(kjS7AQ5UFbK3>yk4(Py(gd)v>qM_0UCA^_Y8=Tp&*3Ml0!JW(EmQYbcz3a zSyEM1RYNDnbsC3;E6LEzomt_TF-;~?+{g+bSEP)tttfL4yGrbyC-lKW(`O3I~~KR0U2XS`MsZwXVC$3J+=a(iZEIyZ-O_4l7_C{D5?03$Ve_=U>& zG~rd^l4O!CCgH4y!Kw`Pgg%P38E#Kb>k;EP1=q|sg4ehnu|yuY#-)fpTag~F>_+h>l zlggCpLgx)_XCB|F`t_Mb^G`SelZw5zz_f#6&=Oep7AQJ}0l#5PDwfzHV5{cC!(?9% z7E+Gw6w1bc)e~(SQ*WD1GyyJeBHdlU&NKFb~ zsC*}2D;<8@-?}k^z^eyxf8U2^+)i;q&|zaLlYN)WD$VN4vQ7lazj#fq`v9@~V>PH` zLX2i0s)6Ud;Q8;hbX_fqhXW7NCC{BZ*8==+#%oF%`=|wUhRX3BjSi-V=Lf2TtPduPL_-^*Miu3Xb{U~4rpkNk?bPH{0 zH_(c`L`6ZKd=_-UnTC@&DC^@#ZPlprlV_kn5Mf&=ZoMMwJDSGw5__1l$H~O_Ze7Bps`1ZWK?VcQjsINVz)u5lmL08E@aGd1;UWo6~;%*=I= zr$15omaO1k^uMbByYYQ8b%b_CT3WihUvj;6&hD^0`Gh*1lVK?!NHeplWoOPfh(GcD zQ?^*WkQwQeS3Y~j7Ua}pOpLdjH;y~IxL9FI_;{!aDSkRuHRjV50QU+agai@rfrMCV z1@Tox$%RQom+B0|-90}hm9Bt%^@lqb%ZW=lAO@)=%6e-rFlW;Na*$o_p`wxBT1-QXyR$ya;(Cw7N2si5FGD7l9>Haubl zy`G>a7QE&MX=9XBPj@$xIZG=c}c5@$BvsN08cMe2D9y1#|4`>Cht~9c?@N zIK1bDfkCddNNa`_In8L3&4sMz0CA=5lo1k1)}qoAs)s=;ym4lc5XA?(S?C+tG-TsX^y@)3a}A=F`T70HL_KVAig z+I)wRF=?h%q>w~7sIhtH>7g0HTtUhqxR+02mRr5^We*RRaiTpbR|pcf9Z329U4`!8 z!B=jwyX~;M9kJn}qpv$fq+O<;KCT(qo=4Aue13z34j=YV4ZZdaZ~s>>EkBYEz43;% ze#O{zp}2RpU717gj2O_re8P2D24S2(f{+aS9A~VAMuVR@XZ+c15dHkr^9l5c8eea3 z?@(Y@-;Qx~kC;lOi?45PYKWgzIw=Gj9DP)VRg|AVfVdgr^{SF>ZzTCbUh@4I(zLre zchvSk26Wk&G#)?`pZaOgaBneekNoEUo*hqGYea8QRfD3f%$Q}L(Xd<2`*B0R8~gmi z5w-)OG8rdJ?Jc2>qqGUw{oXjx{Moi z9By5l4Oo1k#2bExq4x4*I4~xXVbpmxU`hURdD}}fGmQdW=2Vh<4QLwRYpAy5Q6bQq zcb9x?he7XgTvm}oJk`s9GHFxUe4%>rSDVU58vR;f?PTNpg7_x9T$-FjX$qJtVB@{1v`n+T_|2K>$9rn+ z^fhb-Ak_nZI6a3u6SS!H?TPC79?~BCMvJsPeX|W6y(z(P;+*5A0Rs-9Sg5d!s_5-9`Nl>^{fZeZ@4f>juL|MIl`18yb1U)m77o?yBF>_o>>YrO&wdCiZh`s+; zDV*>B`xMTC%nn-m6SXd{To-=={e|?}%lCZa9)4I`PW;M)Tw3rOS_8{h3X`&Da&v(LrN zx!}88FesP*9Jp{=38s&Dfofd3P|pe1S}V9QQEETrkn688K6diNrFm7c*&9{e-8v3F z-evmVCQyW4d^}tggcL|v7Www60p7~TNyGXNo~Mk^LPE0J9Jr0LqElT|a<73l>0Hm| zspB3h8#=-cN%1>P1%FyW%Et)o-ZoSl8>py3VkdO@mBwuN&Y3_KK@7v254) z$HD8Pg11vgsC{4Y_YyR-puXtO#w*Xt&Y9kIC>#qg%`?x*&JGvVb!HDjRi>aj0PKaO zoHHny4zae@yLD2p;C@DVq0v+v@c>yUFR|71u$&(b+#;pe-6}zL8HSKZ&Z1%`NdFg*2eBbtzzm#)%bb z6DG_9jEG8?X1n#ss{*) z9qD@l01WXWnT01rbqTtbsy+21e?wx%Nkc8LKZ6@2=_}uq#V$p&xBDfJO?B3L?Z=Vv z(?;V)(XjP8EoTFzlM`uN<(eypCv@DL#N)n%s9=+y#PV{ja%l3)DlG!xNr=uiP9gW5po#e8(3@-Y;JA9&sDM0y(c>;{du3BbhrQm{dh z@Q0N|!0-_RT3QrjL5nO@fXr`W&KvJELZ;(_d}$JL2EQwhDkSwBc`duu^Uz@O3#ur? z93u7R9ME)oz+&$+J|!k05pwh8(J!38TS6vz#x6Y{(rT={JUX)={c3Q(*}7xu1;x9^ z{uBz?fx5sgeIvGJ<&X0%$LazIfxb3QoRI}8&+D&3dz^aDzHu;_fF_^*t}aJW{nB^H zeHs6Clg$|~9=Xn&0pEAKKFEz9{J&(Rze`HV=b@tkdux~&{|G?g`fc3R1yWV{`9c@B ze@^uJH8GykC9_O&h3a>)Qx@C}GC~Xvo<)*XX?y#84-XGYbwx0atn&Q?{!n|27n>Eo0VMz1o;4y zo8|x+Kth=blE;YSKlVkpZu6qWziC^N>8AMV5~#xF(e*dLeP1JBBm?Bl60Ut&_$^4H z-oZlf0IHIN*w$S)}!@*}E0$eW8cmUf0*>dyp|Z zkBRQOTY9h(wgIr&&e7YG_3>hsS+f>UA6g{w$FklUy$9FVrKcY>=m$>RmENloz>que z@m?UvLL3IPcx{_C8p9|rNW&dkiPp^;xt5i^o^mdF+_nWdJvwHeCWpI%eP6fjM7rqk9QnDzS}T4UKUuc-1V*lH+ZBs)k$&<;BBDW)+gs}OwfAd6W!@&q=WbPUn3McpCTenkNk+n)v>yt{@bPYmD0%|`9&23c zdyXmqma3;^SvUG{iJBw@BWSP8-uR}r@6{_|iF0&95{=&%5@bf97ISfHh( zQzj|XtnP7}-}=Is1auC>blY-NBHMRi7`T9Ji}E#B&9S7j!3#d8?;_h`=Qh3eFI@r1viZOuQCpb* zj4|T2zNydtxOd3Em>&-jG3%@m7lzYG>jXM&$AZvH?z#rn0cyfYh zC~&a7@2@lYKcR&hgS*ondi~F|{bJcmu+iZ{%5oDlBo>%D$RsJZ{Rg)0Jw5`EEmIHhG6(VT+Wiv$J!Ixb5u%j98w4PFe=oS!)sZ$gf2fKVLn* z2RiH$E=6@XNXdDkA=IpxhuqE#w&{TszTHxEnarbxQfSEJ3^c=%KVD1?4Bh{p1W4Oy zu;KJqK^`=*&NxZ!4mOexhwym3-ddZ&PQL;@GVD;@_*L63MbJ$PNF~_rN*NT`@%kEf zoX{rD6ZUq!+_E4?!KvvU0+Cg23nI}YyI7Bw9c9>wCfX8n(5N4tqWD@Fs_JbN{u2hP z)8T?MX~S?p5l=tU`c~}Vi>r$DOpv_A+dpHAx2#P%cY1CNMLH`o9)BZT(rQE`T7{Rm zUJK;TRJh&6Yb#Meq>zhd@RF!TBc@oJ-6k1`M9Hb+g))-vpqSsii;*qWci)Q^Au+JS zRuf{n?{1LzLmEoCKCmy&aQ(ZW$6}nLQ@dckC7us)>xX!d;GgaQ0G62*6$YNTMLmGT zTZc>PQBjP<_@W{2gJ<$8h|TfR`fF3Iy*2cRd70KtYECtP<909Vo%JtfF68ExFP6`d zNx4;fZt1L_n_;d`(efpi#lg&YX;+mn#;EDO}D2S6nINUAlk22fkt|!Si!s zKM8tveV9t_H>scwLkhg@+77$V67$>}6r|M?Wo4#6aGBFnJMNuE*yHDxOeSROHzl4e z(94lS$>6Cr`20-yT%L}mW=M>u$E$;n6CQp&P(@rAH?k7%*~ac65@XmxI2`Rh^$|l` z!Ct1^Ntd!Xb&Sd8w>p-Cwy5Vej(3YaKQ2_Scxxm&lCHzoIJoSoS}86F??vp?OoQv~ z0*&ds8xj`4h+kDjReyO(y-_%t&1Q&DAuAjnS&8xgZnCw6IV!N^V z^O7eKEOruCeNkJh%E=(wZ=#kpW87yGXBM!;D;e0&V(MYtYZ4eF+v zpyFot?WJF#eTBNF7ap_oy|*fjY#+o@edBgb^v1a%=egXSkR6X9=U$@$_zNQQ=eO2t zVQHF)i{2;8ZsZ%EL*6d7>V7dbR7?xZ+}L|V582Ugktj2^U65l?sH;DG;?_f7awjc~`+X>v!Xi zNu;YRtAnJMch<2jKTGa@c|s)xF5&8}1!oLgo6{+Fr@meMJCgp?ycq;hMUwwt03gdZ z2PC$WB<%E?i!eM?5(lhYF6aIHd4FNBtdL*XG?6gD=iGD4!d-$9>`?bG0L>4?7piRe zK*}I$Xd4;Db3gc*iAp2d59Ybe<~x4{RVuKK>+I>8iFv!b9$UajP^tr+Lu7FUC@ZQb zTH_>j!kp?(S^x>e1KnhPk&EWZ%a_TM%%llTl43`jW%YD4v0%yi=SdVV8>!jMr;qr)6WuG<4us2x{&GMY ztPHp&-w*8T0k}zNM09L+<3Wn0z5)fXGbPL~xCB(er3%kGN2Dwy5>gm>!pl#w>lY3> zw!le-!Iu*~W(AN6uIHVUPXKB3%$YMzTg!Kl3LI&_Iw$fQtH$qazVv_J>gpPN3HB^f zmw2_tK8C=*<#wmKb~CbOQ{qj<_#*(gSp2G!kaL_-^`^uvfM(4PcIP{PJ<75?U6^#4 zy_Y!=)7W`^u5?vz` zW*XPw5jRB?@3%eQQ2X}q!74(N@^vNXNrbmIK6vy!rsbma$L7eOCCS*vg{39GQkiht zJ8w;!@Oy1uPQI;a$F=RwlwIV&bMb^~nkpG%9iyLj=qCkQjsL!)z;J5l5U z(=w%NrjCwz0sZ1$)ol(mg&Ez&JK3 zB^HYpZBWqHv?NJrkqKVu$;EX}V~&_`R@}c+larIJMTzcVgI;DPQU21+I}F~-TCTVm z!njENS>S7(ppGu)U9*pC!8cwB)sL_I&IWBIC)qCpKJev>yuG`D&aZ7UuWG3w&K&Y4 zYaOWHx+@m&3FW~$CJ35HOQK8yyI3-HRlqKmhRYBWd7Ad5;W$UcN6EnvGa7#6qPnuD3g2@Xh2_>q8!)|nq_68BlCaU_4 diff --git a/icons/obj/atmospherics/pipes/simple.dmi b/icons/obj/atmospherics/pipes/simple.dmi index 6bb4a9ad0eb3540fd0eb3a0b9e9b01454a852ab8..bc04b708c5fec7e0cbd4f61d98ac46ef2cb5c14a 100644 GIT binary patch literal 17641 zcmajH1zeQd_dfa#or02r3L*-E(j_1zrIJc_NlPP04V@y2iiEV%DV+mSDlIKBgh-4u zLl1NJ;5py#Kkn~dj~+j~vELnQuk}1@Kg%c$H6=ru<_B-^N@eyZs}&{;$i3P1VP>(V&9cJh49fT*qqR*e!Znds+ zXSO{7PqF%OGGb#u$5r{VH2>99-*Ue{U6)LBol&=kQ-lv`JGrLuLsqYHe9JT72$I!* zB~Rx0YJI6ge4T(VF@I*Ovsd{Cmt|0EJiBk3gn1Aw)nY=5EV@+IaL}Z7m1jwmNO?NO z@z)Y3$B1lzkl$>q+tRZ5C-JZEv#(@VrMi4+H04`0C%kXq`pd?wOqt=0$|>C1K-E<* zsO`Zeow+i?bH457>SB&jZE3G3V@3jZWnQy!{vc2&$WUewVr`Qs5Naa5Ix-NLvRyD$ z>g*xPXkIKb81q}rI@jm?BGWWw(z#^=H66F-IfSsd5!F^9MrvO;mB8iAOWX5m*6&wr zb5xr2XSgPpuSob{Qe5w{)8waKuEZx&c$ZKo{WGBLPORFvw7@~qB;g#E_YP%+yWUfW zJW+>jO8K~>%X0x;_aTTCx-T!Q<^5r;3GPTcR)@u=C8bt1DYDMX_*_@fd6nYmR#@9i z{UDlKXHb|k|B-Mo_mhVq+D>TMC@J|VA(jsN>nGRYT82@)3J0_Vgfp;FIkoO`!KK^+1Q|8Xj&dolFjoHn)ws;iz^H78IDA78jKE_LzT`j0EL^ss+2KM0M`dRFGH;ND^1i_x0Q;K=ez}=c|tAPFn0Vr^u=%{)gg^r^qM^H z?~Uc~z=y%7ORogpIu@T69X_JC7sP&FLz^yNE4mWzIvbl@JbO=1PiTp%@o64SU(olv2-&k3 zQ6EVk4aU7vx#7Ao(?rNk-T}QiP`UAj{8U;{@bOk^7N;k1PJ8*NWgfceRrlfx=-w(dk{p!iZc=oxzR0-uzkN7Cs{0`f5ZDZedKVb|HT3>ep|F5gN zoJ zAj^~#+~E_?sf|C2xVSj${R=s{xmWMUA2tod`G9GR^F7?3!q4~sx^?>cnv%VV>5$Nl z!oyFG284Pk+Q>8JoeNDzPo;yTaFbeb}I21?w+SjonQLr7KdcCl^KyY44LpUFAV7)A)H^+eH^ zm^4LiZMm9`x!$|+rZq{>rp#^e`+(4zUTk1X_s*E-wBuG3eTHoZZ0C7t0hhInP48$% zRmS7EAeTdgI&C+?2A?%2Q}g`W(^5FbVOzF6kF7pIx5S9FitT6h)0Dx<$%j|S!|S&{ zeT@AMFY>yuBSbm;R8-hD551tqHrKGQ9AjV1enT>^o24p1V$MMtLj4Kj%N&i9816Uq zFjc5YAZ1uR$sKj(0LFxg>AXLdfQVr}=i|F(3s1gjM*CTIQeZX#o9vwdZyYZKw_4f7>CMV`CcU{Ik{ZG4~ z6G~yv^vL?WBXE!Yy$5#uOCqv?HAVS09-2sS96oaWUtdu3zJkyB?t#@# zSw4E<9C|1BY)I(_h}6wRyey`$e}9%<*N}$eHvb#gt0xl_Lh^GFz=*);(?OU2-U?2& zrD)^hSKy*08@7wQRA=O5<>EqJXLQce($X7MT*D_W&Sap~YQ!TN-)qe;Bos={z%#3h zIHEhpB6TSxFWj)&k^l3=Eu2x6m-Ane4!G3y^76u+Ab#`igxlA&x1~ik;ICY$ShFH~ zugr^)jE;1KHZ>{N)b-d z2gjDdB3VbC5l3IMAijMg&E@nsf>K6)P>8a_fzYYBB4nIO*k6%mg zXNF$&FHs)P)S9<)%i4Wibh~!w7eD}QAD$@lyl2i-CSF3o4@eamzw-xrqDHTR7rNi` zQW;P3QREdoXy$PFaL9#K62oRwG6#~}yF-*wz-8jQCM@8uI@F`OlC(K@;!HIT$x|DT z^{VRUk+p=8Ge8gs2;Zy(Jis&Kgfb*caNibnzO1|gvitFTf`T;l)r?-Ro+PzHn*T1p z8W^G&ZAc46$mY)Wsj-7hdIedPez5NzsdiNH6RrvF}y91L=heyF6T@C*NIX*=Zt(dT2u1W zR)^c&-k$86)n~i0QhJ`}9v(t`i2Er^2>rClTUhSZhy6sX@4I9F{H*FmtpvU9UR30a zl~GrxA|fX4B`)TCFdcMr(4w5h8QVNsH$R>R!i7_-;IP!V_3AzvE!*STZzb^Cz2>)i zospuhuC4-ir4dicmR|j4!ok%A1o=LsO%^xe3?;jF;`LExM)d;%KfDCR`M&%2F))Ps z`uc&%NfZ}0byXU(JM`NkA9K8K>Fq7{ib?RsAwo30Kdw^$lsE61e_h~@6`|&n?S~)k zxOetHkt{cFBLb0Ns`0s?$J*fFU{h9%_ue15 zn96%Ym6pPI!SZb82AIA+HTOwzCrRkqc z4hap&fAQ*SWyqS(O$(#eovP3Osrs)c15S>buFP}qL1H9NoTo-8DHYDQ|Fc_C!JvyO z^uL7ub$tAjnc3MPJLym#cCYmfZ28Y00?5P5i#VB4^e8#!^$N~0^O7|s@^pogFTsyz zzd?~VRkftN`A4F?Y5DYo@q_zuE<(+UbDOiM{27vk3(jFTwdJP}rH zJH;G-+g+f*HNeeiB*9B)!*uWPq(5CcZf?$er8Ab<$}Upk_A9LK9V}+fPAXUU4~+1y zr#D<$Ca(JY&Q*>47vhc*!oVB9^G=!%6rIKTTKUz}Z;BvL92|Br<9fft2+$N;N(3&( z{Cn*UtV}73oEbQTwtndum(v<5fJJY0TW1K8Nwb3JHn+s$EQXyVem2iva+5wLF)68a zq)^v&<;QguRaH%nDAMz|mWOU-Sd<@NryIPe-t!oLZiX^rJ3-8P?I_}~yT5OVUL6@f zNfp*Rm0`l}NMl3N(yln3_A#Aozefo1m^Qxv;eeJbti|TH9{NpwgWhQijb5WS|N2Z* z3^TkT(zm0-Hb=@m-LmUt(v!8VE|xCDNjE~{1_x~(5@EgKy9)F0^t_s+GXGlXO6wTn z)bo}><=5^flJ|=H`6!0Y9k{`6M$6SxqyY5Ec;h>O(-y?cTsXXJp7kP^A3A?dN0au4 z_pH_tMO!7ugk$yZsZr3O7qPMa=&`P}63u>T(~U;f-9o$LpFd-KuCrE2wN*05a$Q9n zPd_0Lh?__I+#92VdsYxdTVO$fmG3q{!YUFpxnyPZg}SBZw6NQY-M91C>WDM! zlIw0tg0-U<>TCamSEMB1DN2n2L%dzM)(vUYn}LqyOh?@#9FJV2lAJ@GfEgJ7@e?cx zqxZWfNgoN-z^Gg^r@3WBFNwK84PG02Cs>`~{l=SqT<_Q>se^H&%(?6`jXz%Jo(t<~ zFbmjkK$>?%)BWC$ICt6JC$`ajN$sB23F3HqW77-1@0GbKxTa8HlU6Bi9?=`Qz2h`o z|Ln)no;y}{d2*}q+W7D=ZNTv)a=rnHDS7|!KrZ3QRI@*G1Qp9UZBs^sqEI(AU@+Hu zlRbZw;Cj^J_hjLhmjpV^t13x603F<(Po9&s&r(VLbxa)MTA!-3oLL4jd+Q51Z{l58 z4KDU3sraaMuT9qQ3kU=^`R-e+{P+X~W@cVhqC)4SIy`o(}_ge~uwDq5K-@b&B0gm46AZ!)a}t&ZJQ_ud^; z>J3`-3Hkob>O!u1y2&O+w0Vot?_e%M%w-lz3plddVVX}K9r?}{?jw-Yo{l}Sfn178 zIm!Cc?m9G+FpD}Fx%9NO1YTtMmLKqe)V`W@;RUDk1}oRB^$gsWhjo=u&v$>l18mf- z9>M3v4MdRKa(KYSZZ{EMVBVJ$9#z*n>GllUOV067`@`8e_!ou!~Q^9`83RX%d^ukMI z(hXO(NV2lios!ElEu_OdtQxC;rEKPy6Z07yu^aJ}vo8~A`SXmbLm)T_sTPX=Hd_nkF|MZttEyP8M*!s&*rz!x%{2Lf2=)>Un+0p{ z6qc5%5JO-01KR~Z=@M7Z#ppMVBPF-Q&dU>y_bjQd;kn5bHaVwJw0!+a(!3Sx3?-JH ze4Z$>VR*q1Yy>@9pSr_-fwbaN5hvOA#m{xf{4CCY0t0)##cF;D3QUHgNJOa)&L{@C~rPvQoN0uc#4XOE~~>gffLp>di-HY3qDq29CWvv({10$ z!}x+G`}ckcl7$~V$5g$9m0lYrxJ9OeM@-<8#19T?c7w`514K;x$U?3>%dL|S3>p|f}<`B({Tfm zFfXbl^MT|)501=;_J_1Qe9zNSSlS#7!WL6H{Pg+2Nz)yvBJVZqBA~}(3#+WUvwdCfn9>4dmh>y7_R>w*CAWWQe!DRhzkuiwkZtGsuI`-R-( zd-6zo`g1sk%3Z~k`QK=voU?9mh_7z8HQ!O|yU*ivvc|Sf$FKmLC?hlTj?ru3WVQ)M zjM)6Q2)1qkKqxJ{BPc;Dd@2$k{=R*19b_M7S4RqKJyzoDVE6U@8S0}<4HpkHZqL>t zyE!M8Hoh04-b|F>B^7i07Cs7^$Kw#-=k0F^Eur3*%41)3)r-|tr#8~f6F2kf&t>4; zyoDOWbB)y+IYJf8$;I#}Vqu2hVv{CujjJ`?4L8w-nRqz?r(ja0J$3Oo9=HB6+Ym0J z`4qsd)dF~wdE#D*If7s%ztos0?lNXquF5Skr7E`DvQ(S%BkkQ8ocFfE`YB7+6 z)=x*LWN$d!W4s~deUX9G?eC?KF|Q|3UQMV&_>~UDp10#0W2)pGy|v1MM5*8feQ7<+ zcthZygsS8bN#NH4pNCjtn%=o2DxVT5sNRwtMnwP ztg5vemu2feH0}llCr()TZ%G}mx=#+|ME6@i(uVu?WBM)J(b9$6mr)e~wnq`r9|}dJ zCsl?{p=i%&nQ?dA-ZpVs-hpe(Bv~z(-F0=rDj0U3yoUkWx<*n#tf8HrM|k7Kpfgfh zbL-pDT4CJ1_9GHCB>Gl{een#RKX#~Lj&f0z=Zwih8U!mSeH$eWxyD>8r z3WB_9%AV+ss954LCe2}b)e^c(m)`sFdKVva@Z9F(%S|fixG?r&s@W_Iw4Ta#qc;AdR0%jM;7NK$ML8!d zMu)Z*DC$2dVv#KOg7L>@&M3y8S=YUL_%fIK5)IOmYmvYTd$UVm88i2z4OlXY0}ba+ zFNWKh+A{?{yR_*-{)BLfY`>pR#rN?DREY|VVCLkW)v1MtoBw3V*Wj#`x|!0;gu!6+ zntX)+;<@r1s<(Q=|LO_7U8+;pX#le?&vg8N;Kv9U*YT zA{s!mZ~)kjT&M!UUpZwkGjQ|f-9~S?#W47Bw ziN}IBYIdsR@(W`~m#!KHUeYuD7zAE)^j{b_QKvpi6AeA=+1syPySpzPV^aDZtgQx? zIxyAaNM=#c%zrd4t9i*T!$D($?0D^%gG(xf5;e3sX*idO3IUDjAb*l)42a?l>^nkI z6(>;3evNalk^z*4rbfAD)P_Ixr1JgQ1AxJ*#G;M%B_i7*KFBTB74aVlFs%B5D8RNRK%pDQq{6GIF)5r zuqec7Axz6Dx+wtTv$L-*b=ZDleCs{7gE!!OqSV6rWp506?6T?p@?f@JwPRA3)}f`F z+XY&3^NI;a?KT>#Bv)WEo#z2kxHi~pU7-kvBXV~*$+Q|iTXvnBl6>9yNBYAvkCSHq zV@Qk1h8s0j3R0m&kcWo{L3}6Yt6u9^U?Y}JPUk?*0Q$Xw0F>}o>J$7HF*&U-ApKRQ z`*oz*GOPc11A)l+WZ%1#o906XZLZ{|k2dw~00ObKuf*c7HMklV1EY>j0;pXF0|&pB z6$2@ug~)H;?n5onblg2iLR>Swpc!XJWV12edIQ`k&AWyzJ&r~C9Q1NK01Qg{VeS@9 z3Nx5-Wi_AYUK=wV^Bpn0>WHq`*x0aDw{O-JojIy0Oj3oaDI#I^1m4t%uI*J0V_X3y zep?-c$S9T@KlQlb+*D3!E*_^~!1OQhPj01lCJVPDluk+Mkc9;ciHL+h=}s6qDWBgL z6Mcux;$1&R6(bt1f?aM{!}DUnG^W_FX7mz=ZRq5#8&zQb_sz{R7$ki%*GM%sBX_(= zCEdF4XOI7U|3i>c!++W;e0&sZYc+m+e2faeb^5KHp!(yGm^pXupp2Z7j=ZKPuBEH{@z^~Vq|0_DcWv&w#KAWq-Snlq*tCb?`t+g zqIE2#++G3b11*TivFq#W(Y}6r6E?lbokKrX#TFk*R}AQF5}lk#iZICeyUw=29H(me z2bP>ZnUIgJ`fLf(3!$|w7h*+cT0TGN=DTypE`aRvF?tO-(NB{en{%TfU#0jR=H+FH z9?7!YHr{!rkrI#(drI5M zE+u#uF9rPidj8K$Q^S0s=!`c$n(Mp4^nrmmy2NvHwv}+{(jB*U57`Oq((lWOK1Hk( zn9f*=n5uZRLnwIvty*sE%8H%oSoyq%xka&GE$F@e9DeMED`3#tlZA7g}?cup4^S);b`tqZrX(9)5BqV%@K*5H1ONC zs(QD?xFK8==||IoxzYkQ>L##J3$U$;sjd`>jm@|fCcrJi+>0BFM~?8#s!vS3=LiK= zf!}Ha&z9NrU#YlIFd{%Jmd`ld=sWTfvz#4wDV>*^F0E?5P>1vV@Xca})5=@G4>r%9`6X2IGeD=#nREu<>$Tyiw%ZUCIXXuix%!J>Q`->5li-9LAwCILGO;`G6!-! z=R5gw)H}uyk{U2xu@unV-re#mi}!Qq)r#|$IN}5GaMI@&&5vetIr-!ibiC?mj{xMwTqutjxswT$qeW?>!Pli`6663_*r(aOkUG^>TJmE<9vydV_7C&b;x2q~@ zw|24-lq|anJVi3o_T29%A#qp+_B6xuZrfUd!Px4_25joY+1ZJeyE!)~x;oDmhTX%^ zjMt;nF(#u`&9<;NEASEg%pX+Shu9VB0pJWz*Q{WDQMXwvcgl~u{7<&Jes2VjXS~rd z15>4Gqyv{Jy5eL6IT_2eeCcpdvkNEx8YTTRw)t^Qm{^~|H|)0`DW|{QsBfO^^rt9( z5r1j6*ei-Ga^asj+4%l_3-m9*(<$H*NN8Su`TIZ`J^a|(@tUaEW&BOKCjLO29Zl3q zf~(%gYc((eGe`=5lX1N!5P|S_f9yY7wW~m$r~;4Fkp?Dla^TPK!qfAqYQT_jIay6Z z!=!EpcFMgU76@zku<|I5#*qFBLp!U-U50^Rp_5y&`%(zg!AWkOn#kymRdVdyn{=(( z=G8e*`b523l>iI5^rxoI5$Ueqqyn_ zRL!J4M0ZASmTc?$&(xhlmT3)w%{i(9Y=5&w&6QHbY5koc5|=T-@sl^Cj*2eamI@Ca z9c)aSbpQN;MIcr>Q5(fxmrCx1ic-IUS(j&LeVUAVu-^_M8GU6a076fzXBDWv{-n7e z7*MpYvv$RyDktO;%farDdSQux)9(Gtgt{L))_n?>>W{%S|8sb{t-Gyo^hJ>zsx)Qf zZtLR}8fkcj8|xk}bZ)@0zHLl3oxK)C_{8U4QOIpf)=;op2EB_+d{llJ47DSVomE_aCY zmCn>TxiL3%Z7Rzt0%;hBJ&|>%4{kb`@u_vK7-Rb5DM)gOzyhUYHW$p>GXLnX!=uAy zfXH@`LElnp*2uC*Q?)QGIB(xXixUkcy(a(4%{E|A73hEt{v3q_))EVxdQ$OLe(6g(-}0ECBZE1%c9o2_2rAx#^hy3e z`*#Tc@+8LEeFwikOTPM~m)^oEO}YXQFDYdbZxf9=-^M5oGBRIY5M{Fwl#?JYDt;_c zrE_o09fsL1r1S_*BzHn|@`3|nr(v<`8KD86eLZSnSGuC}!W}kM1KoS>MX@l^^LL7Q zN&(W=W(>36fNMPYB5qhXvuc@JQE$K4H2JOtU7{TaL@deJ3S{9meCj|vsLEE0 zHJGf+@iwh&M0UxZBjSL~L2^$|wt!y#X@A;XYpU6WIO!5SUe}WYSNHs;CX`9>=K=;w z+PwJ(?T~#a4TDCLSABwO**;O5 z9yIeq-uIy+uVN%-bH*11qu|Xel2>@T2GffJr$may zqtBX_G}hoFUk>ng6gzzyg;levY!NelVlU8NmmEH2h*aSf3KzVZCa`iK8X*dF&^}co zUUASa+KcuEr<1A^RJauS%O4BYKVZyI&ei$rB~{n2xnMt4C^_%8ZEpHqm*nFcC{wVX zj{kxB6K8)kis-^<~x@~%<5xo;#o0Kw6)#M>pRm~ zcHW7|Vohsu_bz7|{PeIMiv=LczVEn3r+vkv-kd-ycib0Jin~(WpdKnl?D9++0$n&~ z;eKw;;Qaa9YmaG*Z=d5Izat_-ul(eogJI{kk#Eou&OI$i*Ge-?KP;;-7{6A5dq`py_i1&++U8DAN6w!St~qSQlgQcTmk&~VS zN7vJzm89U%YgMl$!Gj6w(CepwCZA*zawv6kbNhU=hpN(N`l6S0RLV( z_3k?<+=6xzJ&sYS1NRGu}fRcs} zq0g!1-WZiA0g1kX^EmQXMQFm!X(U|4A5EaP0AZ{wvYZyFgw|mI4`RZDY7q*iRslcxIL!}37~ zaE&gIm-T7=lM8m&ZQH|1tn*@iZWY%$U+0KIZ!JGV)|>p|56_*&mjo;&4bXMQSSSmP9?<$RqL91#sQe;p~_?1FyEKO8qIRq)+&O24(ATDShDxjRJazOF)WrOEZ`ET;uMKhn+1gQ1#QvaB$e$ zxYH+*mVS31VhnffD9|n(7#a$RxZ*?4e z2&RNBG>cQ2{Q}UMEV@mMRh=C@$Va->y?B&QU_9n;8gn+xP--4l#3?)@mI6|`_Av|` z7KFy|5d_#WGa21(r z>B)QmR>kAswOE9}pKDm=L#sF@#~_$( zV9>C@!-hx)+Uw(l?R*pq!HAPZUJY78_+hsxlrg`bmtn_5(I%s-`@R%~%LU)iIYF1g zJ8;slXhe4Ct!{9d7>ISD4!Q`X5itVILQ)>}yOp$9+k6dbqXS^7VD271EGDo9lb;-C z&NzV6g}vU#x24O=HOJ{zX|5C$Sb&4RTCa^X+$Ts#>={UKhe~s--2%}a77jok+jiUR zY&ykAYT`;z%{H*ASlBE*-|dr=i#H^Xj*cK`VPT$Su!eCL7u`0K&XvF7jymH@_( zkdOmFK5%CGLBgx#soW*Lxz@W-cobuyPO%)&W?k`Fz6w%Kcn+gQnQ9kkG{u-W+vHzx z>z2%dd_*T2HRihZQ`iU*kScy(MSklSp3lms_b-BiU^xDX)B7!@det6(3+)7M|HX#i zk_6Dp9So(Ph61cS3y$eCn}Gh9f`;}Fo&}o{*Sp{xyWi1Y!SQie0q<^T0M|P*?R4{C zAjA20;~*ctzSw!Yc>9#}sqxsiA1!5zMq3+J*>{Weby^uUky65wcv%;F{~KbG7Xv3I^z#a$S5{UshT8ZjlTuR&q3!)r zy<2#J8?klMStxO!m`;Ly9JL8<1B%SW!y)$jY%GzM^Ga;5^A0|K`FY_SGf==S^<5U& zC$GZwm?AKXbBfSPE?0|7lOr>@Z0Oqk3tHL=KonvZ2rR92E}vAJ>s|8CqtAWZPS41* z4X7pT{c~%R;HfG%xQ*ztv$N^y_k5qNj+U8nr~nm97N=g7z4o-t;PMR2Yd`&)m5Tp^ zpR#aU+q`_yK~7{o8e;}uqKP5^lDQHTP(>9*zQ5im3>F}sT{htf5W{WEWdOPHkYAv` zzd!X(j9}7>=QKb;%;`;F;mJ8L5;&dPz!5kigMRNQzoj%D%j6^j-b_h} znEn2j-Cd84#O$W2C;|Oj^g#S@VMjc6JJkS5KJp!*95;E?RRIIuD%?B+=s&QRC%!K2 zbk=*KT!5m&y}6tO=9ubcgOPZxtaV_q*7Y;)JntqDe;TSGZ?1SSnFbtQ@B46PXmi}6 zJhHi2%AGJ56IO|I&!+BT7IDOBB7yGaZZ47=tbhFSY1&=i>bb4h^~)}BZ15Wn_4wLW zE$uKMR7pxAH5AvtTvK|PIEGK3aLvqI|MUB7`zMcj2JGL0$qsONeCjaw4f^`oamGWC zD2T_X)=Z~S?q0ib`7?>Na$>6sK|{1nA9$ z9G{EQ6rOjH%a)t}eY&>d;{Pa6gX+uCh_wHaP~hQb_D&CZZXF{ah3M()10tlapBpoR ztNXrOSc(!RJDV=vtP|5Zw+?jOKWCn7xj#mtO} z8;i%QL)v$e43V~ZnqycHM^uld^3fqc2068JjB>ye^dzL#&09iD+EwjVN{md=y8Zwg z(OpR6til3-CfF!n`&%C9_5QGV(gKm^>0{gu1M02tGlj@|95k@MqA+ zIqG(z8Q0-|uXe~avVL(@8igV;hQMEyej3mm&Rq}2Y56{MBlIE}+NCbN7KZY*zE=j& z4k`mh{S=`!BPhkmcb+br;RUx`Ir@yv!p(#Aqk4&0v)b#(d-z-xD^DcE#r*)JlOZ_I z3&fS|54Z9`K<@)WZ`GmsyX2gG%k?j{xD@C^V{w|Ao-+Jb{~%1Kb?`lunb zaq&SP{#xY*DyJi$UoBUp`oUr8{w{7eqcsXLT6xyyt#d6=1qyuC7rtd(oc7uVVN3=!kWc!AjtwpnCi_D}}hW zG_QFHO>a7d)`J5vsHL~_;{O^I9`oJ?q3O*_9Zu|7Byf03<+PDre-d+f;w0XC`x^(W z2T>Hy4jlS&{W%3qGe)BSl*Fi}zp*`3RZ%emM<`ajtw0tI1lBqwM*8JVIBjm9*`Do)J*S2L_~b@lX8yqBw|AX1!IU77hxM8 zedEb|1MsTXA0{Lof^#BVP(Y60I{yC>G*-`MaJ%Z=clh1Efgyiu4ezK1ek`ia;WS~fM(?QAo=|B_4?K|c_7pVoG}7a z?IfWnALVN)NWu7GUtuJ)wR=_Vfs^Rb?pEVA2MY+q<9^`eRLuRiN}FX&hsAW|_{N=g z4@R0y-hPK?`w~wf5rG9K4#`Aqd_Wtxh!T&&9>if?*6>ZM?CEfkV_;i^2KA5?a1{{A z>PxaKDu$-2&(%s>nDD#@!g(uw5%T;Lern$n%IKc=PbP{yIEl&&PWO6$b4KQwKdAoZGNT|)<2}3>2OP1V_UYcyZFt(f@8#ry=TKSiGTO-HWz#cx z0aSLi22z941AlLCZ|5dUW)MnRc%bmi5S%L$Yz3~hj6BeMIRjUQr^2TkCKn`53Dgx7 zFiG-AoH)jti68&~bVYCgQucIG1ZbD%QoUwc=h`CtDHZu%Jgx?b)9p29I5Q~a>SVzl zDE(7?L%xQY1ZTuw-TUuGIQydv#a!nJPB$Z@Lks%(WC35e;r8*-O`xvMtf^s$lRC;n zVQ!s#28B4dT8!njH3h)N7JBb7=8OQe4jfKFfd*~ZJs4l+5E;P6I@+GCH)JVj=m2Iv z9~!yPDo9)T{g`9-4(Amb?K2$DC8A}M$Y&R}ukOg4tju1^&?8T;PLyH9ldZ+&I`;l* zruK|9kiT-hlM|H#LEvz`j2j!vH`#L7>SL*k5Au-G5B#;Yw|+X5cIc#&67^d`(7@o}d0Pv{&NHguAD#B~pNgDt zb|wxSq6U)df`S2|SU-9q8g(sg!U6G$KzW}pa*UVs6YdkW;-VWEH7G>OEZ_p?@F8kc zZ9-Php3y_fNNEL4P>2a*-F5l;w^HY#%wO0K>8DAn#2}zSDWEf_W-Rdar$Da}4to_?p0ib{E ze+KB?Uw{BPu~@w)_I*(R)VFXMTm`7vZ*$)F7z=7L+a9DEAkO1T#DL!|>AT3nLJVn5 zwzmZ!oPNmK5%~D{@QH~c$Z5-v*$CLLBZ!+_u|>7>fDI|UbyAZ^2JS$=RGLl0aMKU`#JZrudL8%(W2?c zd!d{w|Arw!6tgP}Tj+NnHfmyqREIz$19OX4cT)n?qFMb@({pD@FLb)fPyi()xmA;x znORV9=V=ua;53f+{W<;*f6s=C1#}LP#fJM1XH|G?8M=Fi*pX2;kF3} z0Zc#CYwbOk++!(RNaR42!dzWxK{t~6u zSzs|CmI++;F<`hB7CSPgd^zEc)4veh7y6q=%H$2P;ljKfX3o+ZY76}bCC~kTumAR&AAh~67kOiHVhhP5$U|`GyJd^z7`-#!*Pi}L?mZL zs(`ATF~;Nl4Jv`#FCOOEnEzWr*na@Xq!|2EGCU$;U*uXJ;bRumXXgh+K{<(=8GWDt zwD#J3r2hWL&FEaxsZj;uUcLFAVI@skAl;7_+tsnsS7duV>zeT@^XysojhVYI;^HjV zepW4`P&-xgiSB&CptM<#iF;8Tx*rde^|jX-1%`3trl$gq4M5WH;c6g#3H~>ha7aA_ z$aJ##{tF1gzmEHN0enH_(*{cXAMW6^CsRjVWW;lCNC@x;3LM`!;}0M*E0^oF_w-QU ziid&p-rU}vOAC{qf77VmgOp0@fYsXC+K)<}pW%~>9x0t8M(Q{08al-hRj>+ zuRi1BdfyEM^B17mK_!;rgXWn!kW-1y0#9+|8G_+ly;}Z!#~ReKBpU+lJ1$WCZz+t* zI>Hajmw{@N_06|e7lWdrNP#OVGOGJ*k!=sK<@7XA+VhEu5(BFMz_I)D^El8vZjGRW zdLSfD%!@x*V8JefR@8D`fd;7ThrNKfc)hOttfcQ=(ZWtq6G(W0s#tue*++&$JAKaTHHG{bns9|=App1JH(dXW^N-O1CylEse5&YU)cTGWe8I~bq(=YGB7y(ubOk4T z?I+66yOmrR(Khoo6$qNQ;%x8-{;2_^@_+mcx9)(A|Cgu(t}EC6-(5LV>w4|$E;#Do zyLy$5jBr(`J=sy@VJZR8M3eR7S>UV|OEpMb^VRXv%Qo;&m_YXx)Z|O#%!2_?e=d1_XkU1^xx#;eaz+ zpKBe#A8AlcT~|5Fx8^Q3POdhNZy*rQwDd#)$5wu_(6tqvG?N$KCh>V0hqG^J5%GHz z$t;m6vs+E&CHT){u*(D;L<$U_8u^_1G~M&L57(yGE!J5q8(HIZxBYprojz$~OVrLlBY-FWJcvBUq@5?_cGR4f<&dIWRM_Ln zXO6uWC%L0{-XpRb_b*62>m{pkP7=A5?u^H+>&U6|wyoqZxz zXV!^??@3l&*)3N?Dw0Wp5wr;5oHH|QXQ3Q9aqR~eK{t-YTWx?Rz_N=Nr1k3 zxymOXAh0-dl&qAyVj&pW(jxt;$%ht>94ouL?|)l#bA|fe? zN)>Yy4@o5Z;sG5tB&5xBzNWB;xkh4{F^1>^3j@jW_0@$@Xzt=MZP*P{SGlLpX-V#* zqUc}Ivgjo}(>FnU8Q{Nl>-|$m0Q*pk=*whDTi;G`aOYjfqEpHWM%K6$jqTz26PND{ z1ffBD)1#}g`k4nLI^tPsKgR|PWlO-_it!=V58mnW$m?VL&;8V_ayja`cb0@lkwh;^ z)%q~h|8^|KAj}FnV}Hg*d!qo?H!M5Mg(Tv~rTUi8+(I`*-94}nK^yiCyp@jxDda0o zK#$}ymBQn@o$0dKWY7K?%a@_M?9W<%H+c9?U|ix%Bkh!y=#{IS^WysmQLzLq$#!PC2iUt%lcOMjp@3dW!%Y((&xGO}_LM zxNEG80%i^6DU#2&f#`boSaoVQt#A z`$q38`=9Rq&RgWa%@n(w6D!ereze9o-*#_6;(}-CKt$qVTWG$9lY@g@;PPzFdr$8= z-3a;K=TUc;ZQA3vVHPy;J(9`(eBJOOR*`_$6r;*lZ`b-0qwf%&GHvd)E|!<#nw4;W zP-G7R0tF7so+Q@H0d8L6At>)H0;L{#slvTK7+3+R!j4Ow(e(9D#J8f0$?S#(`n7?~ zE+k^hcVzU-BbghV8^%0TiBx6Q81J=t)VeQ#tb3pC-YYS6dnzlA+qsHj1@FE*35m4K z()7$lHOybd_)s*clN(;xO_ZMNlkd)ce`!?rhVeTe|7Le)JO>xbC;pr4gVlL;QBnOc z2al9yy8=Y83j5NJ$wX>IKzoh6m*aZ=HqBwkENKPo`xZ?mqR z!#&X8j-RIaKDbMPXL03{lw)*5wS?KVkp~5of8Cw;{{0^$Qnxp888?sfK@b04eeSQr zDf%#&o22vcKW7R?GSNegyN-dGV!GxFXl(ue?&#wDBF{!%dD|I`jl>Q4^1l{FdGO`O zS-H7)Dt&4G8~wj6_(tZ($QZ`B{@*VbD#O|_#MmLiQ{y+7t>XXR1a$QruSsi$nbL$| zDHyGeGJS=g_c<=5&R^zvuvRt?4-cav<#W36gMeC|YDp$4MYDf=1|)syaJA=btjuq9 z(|Sh!c5=@mfXuV~HqwK|aOS1{bg`z*my-U{`6P$N_w1y5Q9CnrJ-;j{&{8V+iD=IE z)G$rdt-J2w#`jmdsPz@N|6Dok-EeViXA0Nz!&Pe=o0jCJ<2#pE^C)rcVqIxQ_D%&6 zlnod+A7TpfSc)b+OEpO2SmF~h@F`^khWTnwfG9SjUNdH#1l@$3L|+sy>xaaj_Te&yuk2tuM_V!8`8-&yc{@c1$U z;6+|uK|ujx;_B+k4qjd@B>3+GIgdh`6SC4Up~#JV0Z~z|GQ);(4+p&@@@V-`=))^=RY}5*K1t|9oV8y~D12m}5PIhJj$NrU6P4~Sy zUd-HM)YYDU*;n}49I3CVryuHKo}1VyA3a2}NV)RrYOH`fTwn{*fC#JQO9EkvW5@T{ zoo(UsJ0MIG^XT`uQo9>sQ1@n$8h(Zi5J+6-^j-aLS$+Wl>D`bjfE2(?H0^|*4JS8+ z?C!pC(RtEWTsAkOS)_fEF6J>fJgiZ5vGu(uGbLr;e)j9HBjbAmFOpCzh+Km=^G(rL z7pItzlfC)awM>7eSP5i7j`vgW5^G%ig_^b@g6d+TqJt9?`4+B!?Zr*rM>~k=y=Xt~ z(tiy?HdAm}?lpie){}Zy4-f8*(*8`D?10st%(L? z1j6Kh>1=TBsAXKNIaBX^8`$FeMvdz%ccKcZqJ*<%F&7*gTlw)q$2rHVaDOGe1h9kza<8kkB&I@%N9_Nr*^xNlD4}(KoFkhIww6KfSaw zlAF7`oxmPe_+3G}THmPCvr4m5sOyUZD1R9fjh$6(BuA)d|AmX{z0#JVrw1kMZq}&m zJNcY?k3A+ZV=~!lQW_Ts zbG2oBYG|BfS*%-eL-J}vwF0=-I;SqbG0lwCu7MRat5LPH<6e`*04TG1cCZ}(6Xh^d zdvC-4^32&dtT>ig@_ytpO|8RBUa#ZhG2ltHW5L}YVl9)7ZtyWdD_$iYQ1_!uWYbYb zn__}eW`(Q+7(;5L8*t}kc}VkEk&fMu?)QZN4JXys02+cZTVwn+l@Rkxs3OWoA~r`M zHhu$__J2BQ&>wuUL%_bSmWS$iPc87|36C!j9}81FQMV7M@W-f)tWtm2U~E14AACi+ zf)QhwLRV4xRg~K%3o21u)aZM%Y4JaU*~AEKGX-v}M0_%y3d*GIoY}tMXkOX3>n+f3 z2eR-uPBE*fh>*9!tJv^&@X3jL@4&$F$UxbG zUn!%IkkC&HLB;%$j54B}ajPI=#1XZtZ%+9G=%+O%vNnDq*&FmMe=YPQDI)MEe#{eA zexi{y&}~~y4Tyn0J^#~^Z=-O^pIXF!kxq@&{`2havhhw`r)kA?12mP}46~h|tC-3n zzrHZQuCRn7PH|Mu*wA!5#~l_Ds4>51^?{hI%^DAiO$0GCG|bo>=+=IO!U_LeEBkwm=I^!f(p_i7g{mZc_`@`U0!PVLGD8}S)?8+g+vFjD zkx95ed>K{M1YbM|(w7WwBuWJy2Wz0W6h{7dk!N4ZEArelFe3La^ z7RrP;vhIQG%)w?fOn@93eUy1oG9NW++o4<~C?P?TrFmA;IANAF2Q3Pj-SmnaV=d6{ z%nV;>92@x)o^CZr$X2MS^v1@<*(VrSBvT6uEHtK>)?SQ2;hw3aBeAHnVHx#p}DL+QZcWEjw7n`F8@n~C)a1o z-M`#luZdMxS1-(de@i*(k5Zh}EJ~(hjYo5+7>u#aML)A1^V9^5BEX{XzB|OonkZR|H@e2L? z8P0f#LAa9$(X)7#9zlTc04go?edmDf(%^aB?R)vs1JHyFK;v+=mHxC*c42 z^L`H^OaTdr7_B1h#XjMAx%wc&tpei5@eg=_q|KVZ%nR!Yq{c%Kt3f zzu-(lvAV8dhLeK5vB1Li)7+@6leYEo+KaL=RU4nERtw6q!?w*Qaqd6)T!1wJs-2rp zMiQ=m_g2DDQ`;gx2y}s8g!?Q$;iwrSOP9wC#9P4YL@#=GB6kmzVRP}pL4(@*V)tHy z$KIFR+>T1WySHTS-fBG>kc^FsBTp0ergCs_uspp5ulfdeoR{c{oQ>)o5Z?Wuc6<2e z#?I3_20dpNmRQF`0md{okBNhI&Q0A)Rkp}k1qB35y(o+vDfPX*#pXPhiJu_XbGkih z{s!7y561SnM7BI(dKCv}rK{Yq0&DPc(fn9CJ!is8To3pVX(3$>ev@OP_g%_sh*E!; z<&Qhc&;GE*r!dkKsd>I9PZPAfR?_73ky#}}_#~_^VR2Ob&dbO|Uw-$InSO~BeRDTH z4c=u(owB6S)Qpe&y1z(ss!!Oi?E`Ma7z$rWciLi`xTpUMB@iy>^M-Q&h;pwII=)0g{Vq?5Gw+W4a|LGu{8 zT?~P!rv=;)0^e?}ctp9(M^U0tWK9@AkQA~Nf)tkyeevR?91_eL3AKxV0Rny6%|g7m z_bdAJ!hq0EoCs4_JQwWe-vuj~v@JEl1NE8r_h>BuPSFLu!gyKwt~i|XlXmNe=NzkY zY=Nbv_j`MLSw8;qq;k)>D0paKcBI?z19xX0iF$oa>;K{DI;rdyW2>kXOviSc5SIVApyB*@hwlWrzL4;=FbzVpN%#y?M2 z47yXvkD3i(ZdFO35AXcFPZ)H}%(!Zz$wpU3?`Q7JeJtYSZo0UJl~`uleP0j!dw(VZ zHsrB`FYRC-(xMKZ7#z=kA{9Rm zpp>kvc?h*~!x%aIc)@LLVZ3re|4R`{rmJn@l>>rr!>0>byq9|I3~AUn4(xtla@9FX zdWQnP0JUv0aR$k?{Jkm3`AXvo|8g5+WAkQ>RH(qEzhnA+Z_BGcV>)$G&yHKb{n37M zVnlg$E-jmvF_hCYzhhP344=n*!~ME`vo;_TvVTQgi$Q8+2RjhnM}B4sm`6%^(UnVV zU6ht_VZJ$*1qMATo_3%Y}b+Ai=hRTKPz=Gyn37!171!e`K^>hr?Ce~vx2Xb713uf^{T!v zX!i}6@2UpNkHuP_E>7wtu!OB_)3EaW2!~RZXR2*|tZG2s0dohAF((+QA`NrVk=z?$ zMPeTbwS(WjIvy5(7uL#`z<1!$mv7P0da*zIJ}@KVNdCF0c#pBEVaa)uAr{Fm_CHcU zbuV2d**ES#8Lw{tBmOvM@js8ihg}$0d(37T(ujd0U@lE<0}C;hK0ZfFmAWP-_KGhC3EVQR^fH|>-fj$#;^Iy3y$1nqp759JNya75LNhx5Y#9O;@ zgHr{k9=DyJsO>|uINHbPq}XuPr%*VF7^(hUuWJqzlBjKAOvgAeKQE8rYP|oki|yYI zvC=FA?~xJ{XXoeRdY^0$!Ct$&Q&m+}rKF|F>F7{XL}GzB|HqFX{QUd@{rxJ($Hyjq zesgLHX_TBM=uU5%gdA+_?I~DUaY9Vm!bBvlY3ltY4PH9@b#X9O!6QrfB_R6;UClWt z!dL$7*W&a3DBs_E-rn9A5UYUv@>0On9pyJ3cR+6c`$x_8(ed$v z=^5pGZu_aqr{@^}ocNyyfagtINifB3`APEgn`|@{UAsMmEFf#`r%r3VrBrl8ApNlm zum4%dtLZIH3Vd{wmKnPEjGcmpj*hFr-QJ$)SK~SZvp_Wtf$VOJ#A_?Ivb=`nDKGF)pG6N`?W9$Y=%af{sA{>rvf zp>J@Ith2L||Iwq@o_%4s;)PpNU`(Zd0yuP3wS7*nyjO3k)I8}<{a4ZLavbv&gdRKy zVH9(xxi$vF*kt-3WbD)x_~PyrzDlE8)pkwZXkZf_fRLtnuczyNVX>+eqyBWG^q;^=}wD ztTW@5r>X!I!5p``YThX7W(jTjoE}__ocA}SFKnXTa2&l5pfgKNODmox9B%U^#Vc43 zji3tfM1UK7m3-a!0%VLi#&I_ljH@qy9nXIqE3-rbKXYNS!kltGmA5M+Bctb$>xq4!cwjhhz#hE3B+onx%+|Z>U@DPB2{k3m@%#yDafslRwEmTT9_skGy7JkW zy=hQZU7gO9>$h-WaTe>&fDW4NREemTN?^N=;bE&TYk+0|LlVif3Wtlva(_C z367x>=H}+LZnGCbGlp03pIec|%qG6~77j>%T<`v#zGJd`et9%d0d@Q37NeyjCS_Aq zbb_?)S2Wzgq&sUAbUNLcYsda?{e6cBE1@M!?tcR8X|wdVcP;+~66n?6%)uM$kWoUk zaD4b>!T;caCVA=Sn#>y1Zpa(^7?vR=Y-lJXQF0V)hQ4+09>_Ha8XrN-MY@Jt4oeuc?}?fDgKuQ zTA>bnwU>Jw{?qCQZc+MGkI@j3=e54K*EKqN3vyS%#c`et7n1fPgZJXn-)cawsjOBw zH%wK|5_IIW(2Vhn!E<7MJ{BNA$39;BnqDvT%dfvUgCn&us);Bp0&7rMnDGO*{XH4D zg{Bd?SyV|AQzXw8Ck0^S_3PKKN(Ptz+Ua0SToOfG5{3e3`j0wx5G}>ue4*2?hz7$2 z;3rtZ=3+C{D?y~hQ4W;8Lp>XS8NEGe3$311vzKrb&>b1n_Ec4E+syL=V1x6+y#EQN zfa-7F@ir5-=lFQghphZ-bF2K`t|!y7i1qAOi=>BW;HIH9FF1FPQv3Mg;=*~MIk58G zaFJ70laOx*qg^vGnwGARM@AbZ?$GEd;Q)YKUEhpOv82Q8$=xZW{k^#ZN7N<`scBzWws$%k_X!oqtDB2HO6JVsk~u|oR>DCF&_cSk>bqfvzlkQXG@h})1` zMPEDCrP!Q#>>g@gZP`Ma5e`$8do{dS`Wy7oPjR36k8R>^l-eul=H;qZ31)7WpFs zuTLY6h12eD%p;B7ZYc!Bn}6@W7slqE+nWu2{>Zb;;VX%|=VcF{K#}qh<@C&UC;U%dn^HQf z>x4wgeX-SzYTZq4DiAAN+DrE9kjV0UQtB-fc;*MdO3ZzmzpgOsdTye_m6z{M{&1IjIy5^4kHLF6y!Xs31N6N-_SeL^SBQ?2j))->?v<=~>*9{SH z?PN9-y&=l=Nhy&f?Z#GU8_#x7MTNlcauOmU%_j|P#ZZuYL&}?;D$mErm_vs^CTJbwo#ZUPG2yAyrfosAeN4@ukeBJk6J3^rl;)|-oadP zsT$GX=2%fr=N~Mnu$I3HJ4GI8A=9*gbxG5S-|N$|&?YANjfLESv9a@#e-QB#V& zk|#wfYf_ui^QDVrT9+7CR!=Wr8BKSrz5={X$;ha6)2^SIc7{=<&^cfijMsf$S3w|l z%f^L^h+u;gZFjG4A+;ATt$ewWP#TA@QCa#J^R5_EkN|#{^E_v(w{`d~5IC@QtqzyJ zH|gnE-0tv;i_axQwf|2oK*_evP}R0R)Z07p#S3UkwDilZt(xmGTF=c>)hFsbcg5Lify=kH^-R+cUc?CR2Z2$$UtI^ruRX zjtP}@5wFw12SQ)4!%B@@x?X~*U)p7tO|)ez`D3iX{m+>n_!hw{z8O1M_ww*W=aq%) z&s*Q^<@4oEpv?lpGXg|nlrmsS@cHd1eG`3OH<~Dla&08kd=6?_5ZaU;*`c2&xhDDI z8drUOmmy@XimTO1^I$7rqqyCoOng0%`o$t`nmUKj6!D@= zyH{J*ZNuxx*XLSxzB!_@3C7}A?^s0~xL@(fjOoMQbY_hu!Sq*k?0g@(>-*OX0vXf> zvb3tU=3lktI8})aLfG0rEWJ=x=)~vHT-xKlg50J@{m`(Vitt{DC3+|M;2Zf(;a&?t z;DEOF_CB9NrB^o}ANLi1XGY%0XJoL*RFH^QOA-p6TIBZ!p&r01v5+)u~Y(OG2;1S+q1nB>HJ-Cu|~1Xci( z=~sR{Hfa-B)E4*40(dH}ZMK>R_-Q8)-Ff;eJT)kuHx&BqTGyMSk=)%t3hnzazw&L? zBV-7u+;BEAfdI2Xng3%m`_Yd#P)PBfk>oIN8UUz6)chK+0&y2#lBPX=H-Pduc{P@5 zfL}em>F(}c*(C4Z7N!G%Oq9VjPrTeuu*XS5u1|20xkn-GizZdZCu`?oE?>WT?3++Q zoREpbYkcqpSku_N?$fV{A_MZNNx%xXjE*L_;AKu+n8@inco%*xd(or6ML%Y^^cJ?E zK*Aux0*pItfXn^HdR-QY0kd&8NZ=vWpj{cP6G`W*et^&9_xj3YJ(<}epJ7{ME4HbC z2m6a)dP!hYb4jp9;0f7tH~s$peluHJ0^l;DeHKw3qmB2~6a^#0q`o;nij06|`k<1Z z7*6I?d-R)R`X}1|@N+_3q5Wcrn)dlQE!FtMMDp-PwaZXZSrga$UC)QW!9Yh=LPF-h z(%+MBHUmc$y#VP;a&S1D8MsIvM&}EO`L-^~j9&*7#{=KU0WwPJQeygVXwx}Css;c0 zqyB8}8RXyWgJcS_79AuJwRr~SF4NF(`~=Bmz3s@t$_f=6C3+DU1I78&fFB2@+KB-q z7xoASgH3*an_ua*kC-q{4mC)dF!CxKP-Q7gzXP zeST<{aHYFcwctH}kx^pwb9Odu=lGcIY7BMmUb4S*MI6lZ}XRgF`~TMivax@OcTbtJF##zti6y z7|j}U1ATpqiJlC6Hevg6!Qb>TU;Ftn0k!Tfn%TOm-R}URQMM8`u*an%Q7~_3%EieCwfi#tr66`$E@G#$xp=p($vz~XtCm`F{G zslHeX(AQt`JXT*oB6v==r*dwY!8`N8JEm`vl9Kj7_H&pMJNIjNM<@J`B{Eh_g|Xv| zf`*3FRgdb%Ps`+M9!m|;2rlK?Q_U#7Zk-*o`vhH7EZf?xG}FY-(}L7 z+DY0c-_KZPK#j1ypglv}o5(woyo8UXVYj{y?M23FWr~T3B_0d{pHoW$_=fGsV%0+9 z9VXQ$aY+GRi+QDD?R%0azk!f;;cK4d78PPsY+-Se%egoZ9oRjq^O*BeI0wPI_nY-G z+4O1e_fLFwzps4-o0wDFw^?@)plD1Qhs*cZr_f*A-?T1)Yt{xPdcVi`dbqq&Tx-=j zNRkmZV_Mv1o#2-(E&q>QpkP|jv7e*`E~4ki>OI|~Rb;UPBBrT7&<~MuGtvJ%90Hu{jXa1OyMG!scLaQiC3CPyR(n&=NhM~ zy8S`e1TgJg7|m-<_}Jz`#I{A=7*J@#@w3dI6`rqA#g4s>*7B zE79U>>uof!_kDhtlA8L`C^Y8edU~%KezR<> z7H3jG!q&XXZsPtO((1)>nWv<9cbOF)r2f<}cXdjf`*98&)DEukqU$hRWp+p3>&Ma8 zn8JVR-jHv6?1HbzqsB{w9*)%o{Xi5k&GAF`?wHMoe>?>$zF*172GrcD!^5D~zEBr$ zcxI-^$7!8>T=vsez22Y~#!NgahZ7xEE8rd=1j_vK@_{`VQggYLa^HWpi zU&DwCCyd?U2wMRav` zGHe<9JNZ65(h<7CebZYsH4lxETzG;CrN7eenkU#yN{4o&4tc{xJomFU%I87eAl6lM zr=HWSx^llg@@97sxiiSAeAwXV^L%3D%x9X=8|HW{;=Zlh;i!@(lKn(^8Z{;0=aHeP zJna=@8}`ERSHr^~kobDnwS3sx8dP*qQ1L@x`Y!WpD=W%iOwCwxE35p{#ha;L$JS2* zip^Z9>OX@N5Eo_Ooa}1N^~%cEN`qHEd-+YG3<*ex!zDH%1Erlc9m1tn#}=)h@OmPJ zIQ$c@u}+<#^PuQkTrzP@`!MA(}TwzjuNA0k`Zg4Khiyh$HU z*;4`JYymqHWg#{|p1=-PN49Kuf)fA7UnWO?`of&6H3VjC%GV9;#@g!X)TfH*A3}*4 zc08u%wd`)8gVKpojabzL(vlVd^F1MWi?~*-`lZnfX19f4x3%_^1WQhku>;;~d;8+z zeRNO)Io5Ut5_T`KdF}IsS1un74b9!65QZ%s+8aW{6NCyS%Z^DWtz_e(*U_I*uOqtk zG#lNWMK8a;e)EPTGd*UR6VA)~#PdpFPlqRJzbFK_W`-d8)`;-lg$;^W17In@Eb zj|pmcZK}Kry`}U+D!@Q2!wNyt@QeBv#-J(+Tp0hiWV2M_;7F?#)h^}C%xObtbQiEj zG|h3h6}~-^s-BM=(Efv=e37~Y2^dg8bslQGZMi*DNjVT{MEcV@G0T+nXE#~YkNx*I z%6Km~?GT+Cuwfl@P5i0hI)1FzT`vdlBB~4AF6kel5M&>B-iWxae>j}` z)qeI4&avt-?@J9l1B`JPp>u;Oh7WX=07RMlIc4i*G{q00Z>4OjDNlfLqb#G;CQq!> z!u&JF@L`TD&EU_UKl@YM&QA_Cw7s-)9tGKYTX*HB(eL`6r>!!@Y8~&6jg5tV|Nhuc zoJEL(lash17aD5p140jU95K3_YP6YJ(~1FhX02_92xWQyi6$IqY}2o0s^SjkBLG5} z0fiHBUXq*Q4yZhx9+=)zO%pK{^W(n$oFHjIO7#2=KRH-{EO3QtF zG7wnMyW-g5Dvp^rb8p%z>=KDF_@V-*$Yz0a$B&$(QE|j|!GTlr?xN9G@_Jd)e#^iR z!^VzZ*LyN4Rr^sHei)n(JC@~D^a>&rFCy005lh--3zgUi{s1A54k@xinwUc*lJ zrHEP_#I!zRPUloT&=tqZpUbzPtSElv=&9T;RQHE0!~fc=@d)#ZRYYJr$FRV34NIqi zP&=yBA9Zz_=sLK&e1j`lbq0T{5;bSP&h7>jV=@;mvN^?eQJg82aTn)elV+tw$e6?{i&YYa)SgLoYW(2FJ(qd}=E( z_K#0&?8OlKqKLUWb(8^#+WYI~=08gwYa&E%ZxgjlG6rFC2@mM!Qpq}vHBwEE)rqR! zDSb&#D{zXLka2+qUd4^?#~4a)<2PC72Cf?#zo52V8Q?$EK6g#m*d^zROQ0Q-Tl4Pj z<)XM2a!*MW%gQ&-_tkUm&w^Y72=_XHG3B9z3L~e_Nf#Xz*9{7>U=i>W{cOijc~Hma z%LhaQ$gBuf-pPHFpEC}YMtIZH)30bV9Q`k5nuCul+m-l)R2<71``UeCN7Cnwst=9)&MiS^KY>8fXFGySFGMbcGRqy2T)V7EXK)&4J{o}Yjr~G^5JhN`bX}=DZ z^!pC}si2uaxA-=f-3FiRx!OpnVFMTR2HN$4@_)fC*u{TG>9|?H(J@pYytsNfh|BDg zwPl$-T{II)7_$}ta;(pjn>Q(;u-|J&8$~tITp9YCguPUEMrG#hDbwZ;9NRBXDG)LN z+1ad@i=_S^#{7D=?Qs~HnK|{aoL7F5KhXn4`@C&UhbC?rbBEtINv$PX@4ib1@XIBGqSI8 z)3N(HVzaT(5?onOpYD01t^u#rx}b0O`a|YrEj8*Oc-mg>_rZ+O%>t%nisLF)*MkBBpwYe8Q|^I!*jO~K z!s5h8OJC$GmziZp#5FKgQ0#(ohvKu$-;Y_umveq^b5X_AKlGcPH#iJ2sl$dIt~}eG ztY{nLOu2g&Q1P|}T?AZ8zQ+ZL$J`HT|eY=@jA?*!2QL zQp{UAYH)5D!3>L4B`$qv5avMDRb7rHS|G0UUI&&#S`Akhmf!aLs!jU1RIe(p_wI() zoDpJaw1~2=kx$of%sSyzOPm!1=>#E`Jr;sLQZK(z`uvSNgf+Q87%_%tl{Pm@kjRuJ zA5Q=?$O)VysLB&kM$xaw0eSiPJtxYri`@oK3j^&5>NF!un?J<#gS6dKNgeq*rR#LJ zhA=;8WR!|Xa;2*%v#CHu^=+N8WFMuvxk+VFGCPfdES%NJb9!1%2gk_+36=(4HAr_J z99R=qcXxfITZp!wf8zmSZWYPsx%bOtJnw0wL*BxdCv`AL7&n))>0RJSARc~y zrSfRgAtg6>4s{&k2vL$(@r8*#|FT*FGycV>&L^)BEn^ZDXFgzy(-I>)sGn5_Y594k zYshY9kyagMgSx)z@5ekeW9~k|HA+wwcY0lT<+IvN37q?T3b%z*ufvGTAdpgH|7WK{ zTNBAmlyaDrC!!s>QE&At zrlon}s55Kce4PF21wsv692{3}y&~DP*Av7Lv!4LnBh5G-K9|86mjW zdE4=d?1R9u`t*smXT1KO{Kp`p4%o)cA1sp>{8YS-fx*9x5!vT%gb0wM*?#`c`ym$f ztx>PyuFK0OU?7P)brTq*nWT%(rXWoNq8=qux#FOk1D`TpYKXVXn;?Wt{^0JS(;Q&B z20>m5xNx$|w;6J;2L`5}drJY=SLXql_T|HSk~Iw$J{?^3Am0x*j@g!0q{oULq)F_9 zd{+W8I>_2#6Kv5KVss^BFmo-H^^eml=GgTpUAT(7P?8+nSa4VBVIW9zVuuPk#R6+iD1$Mkrr>Su@yEIG)6zlA*lAc?4)@rpH0QN$<_ z{TIJGo(-IAYxEwv5}^$%oB$Imful2xE}Qb3VfW@KXh4*cXHQZ9Hp)N*q;Ax)>s;l< zS}{J$<(`C#en{W@4MF>g3;h8h2hsGTUiV45#T8+2{`pb17#1hl8Wa>yv!wQM`Ga!d zZZdRG-H}Pz0>&*}Ib&x=lh-sA|D@Scv{|Ije}rieWTF-~+<|A^=ID1sZ^3-V3j&it zvF3NlZbHwG-afkGNm4FZYzv$jSF*MM@;e`XEa4w2pjK^tS!4DjSWmJ1S@ zHz%!Ne2SKGvKhVPqYtukbkv!R#JrPpJ4S3=%+VJ_VTD{QVcUQokx#UUk^7y+Xt$4l zZZIN|beR$Oot8L?Ww;57?4U;9^@>cqlGn~)ziPyJ+xL&~7wu5R1Ow z-ztH)C31D*26x*VcQ1>Xw#T=_Y^dmJu)94m*Wg0Wbz0EXAJ0n)Yy;Z$R;C|kS)yRH zKvXBVUJ;oSGTp#`l!l6aHs&iO|5oa>$)|safoy-DT{7%|;D231uf$8jSD6u9RJ_&$ z$VXy1*TJL`3s3RD1&ppl4Cwi4^3ceL`NlMWH>cQdkv5~zPDE|>T{h>!h!9BgASEe; zLDUtG4}MvBhjo!Q&_-qQjQ_dQK|7@?D3c3_ubBMdR&+<_NjM23*IO87^S%&TBJjAN zQq67W^kreaqoYDzhat7Jb zLH#ajOgw#V&dBFPiNVgu;O<4qXPqVI#^VJnt+K^``a*TK4?;jRMFb)a%>8{`2Ly%- zT9%=YTPHz)IId=m&gIQ%3d)r6@_3TDqPNxKh8{|ReA?NF^Fsg4jY{o~%os@@Nnv5D zY0P04uG9`RE}xN!f~Gj4IMz@o9Y|RGc)1!r29<&mk^^-3C3RoT1ni=7-4l`mUK{P3 zk>$eQ0qe~v4jLu35a~-luybX`kKQnUef!HJ_Sc;XSw{|I^Wd zs-&0Ufu<=qrcO?3*Gts!2x9t2S%7fqe|?mB@QX8Zp*57y^QceQ>&|D=%l&Z41YyUy zC{Rkv_VL%k1pK+8+bP5aou)SHduy%?1?qq{YMJ1jtS zlLxryVW9VgkE#+a!0JhyuiV^Z!A8>=0h_={B+5x-b`Wq+Xu>L@+zVFsu6Oq!5Wpn6 zgRe>!w>s?p{Mi@UgJTU)@{1mM1i0ZZy9E@4(&=aZE&9O(zXR4vh*`zt{@;#F>F@-w z#LoRLQ#?t847lGc5PeUuLJ6_ zpA+UwwqXVTWjUzU67(zk4iJ&m1=uVeTcwyd?ahg!>uJdt?Ur*T_An14vNC_t9G?kA zw=FDW?OIFc)Kd_IDqZ0`i&vy#^DG>|`FT6Y=p0A<`uXyHuh4)An3sCj4GKsC%n>UD z124Rd{UV?d@O9expJ$!5Qa7oceDgKlYxsOMGQj9`EChe z3c#HNmA;T@F(y8QxR6vMk?^F`wNSK74o_VvPQ#LVOQLEy*n_0;&wdrMkmxs39Ar)t zhJORpAZHE$wpbjG%s!f@q@czZoCoN#osyt*SG)98BnZ}ot0m}JVzZcnzMwBK17ZfK zwFd#q-;vhiN}-qGESTm5&^XwO78*w#=`h>HA^IX$w4IWV-pt}b04tH}7k`=#(uYay zV>4LT7QkU#ULVRKE*t16PYrqf3`P0tYa#0kj=Is&L5(e;C`!QSi2#}8jS*Ez2WwxT z0Nyv*!kmA-v(T8U#`j#N*q0OCX^_qxw@S$xdhk~2`SM%N^rUZE*9NsIr)svP#<}6` z{84V`LOSAhu-=y)e17EgkL;z4jhWG@k7cxYhZ0hM?(87C$?&&Xr+KV+SWFCw&my6* z6exmwp@F7B@_<(h$ZnPp8b-#%mxT$-iP=E)X7D&e5H3vk zh?ZAGHy>p9A#KnUIl$9&b7Oua73BbG(AnbfEc7@Y$I7t~ky`QrgjRe&*YTdOX&otn z?f}%91Hp|W^~LvvM`tC=l0_E`@F(*b<3Iof3s8PL4t&vrDooA@AIzr-IoRrg0$@GHKLt!lqGd|-NM;*6NFn9rs5%VQ@f`?j%Hy5s*8+kjT*bg)96=9X#i>1&=29 z%~1?BmM$^Sg<7SkZ5ed*U%yXEN~+BM5*ZmOXy}kuLc(pcx6BDN02KdMbTJ9NcyH^B zyWIhAXfPPc|4Ms|i;HVV7ioL0QnH7$Bg7mj2PlE+JX95+)I!id63~* zTH-yXdJk&(xmF9+?j|_6fyMm)NKAUc?<+3}0fmrpbs3=YG4bGEz8f`~?-n@;3iZdA zxNZ^Dd!N3U@?gV=CY$&SIO&d|np}7GX6gpU9ZLNUP7F8R zidEL#19aS#?C(2u zVCFzk`>=Y0sFZOQv z3SBu7hA^HUYX^r=_Gh}fx@!6dQkLIuS_&rjn67pwcKd!?6{~5wdE5=hiyc9Bsa!ry z+bX;ii}Yuw7!sBOFLDU*Bbt!<{@n}W5JEphybfYbkzHf_;iyp&3=rf11AijDNefNW zMy}sZlk{)etoi&Tm&2^ScNt9S)G%F`}ibvQcqHEMkF$3246 z5BDBMYhGhR&-3g8?i)81YhFtI5+#HiY`%eyQ>XkEP?MU6sBO(G{^?7tcU}$~9uscc zmLBVziURCR^cZaia*_&|WwzWW5Nmr!7dHgED1mTU+0vh|*O+?t2wJ)xQUXeicoN z8<6(=q#7N+c4LvaaR}jm+AtrN2j-gk6%0Byu_g@2xgbnDQtl_?Tk7p8XOx1Wo+`sa z^QVUBISAq<+B~u8S#S$tF|rtf$bTDbnv)0NxLv;l$gWe4;Sx{)*<6)+^hoMjCLQ%J z6fl4qK|zR=fdRdZNJtYN=`yKVP$Cx~iPLs+PXdB5&thqE`aate-~-(Gs(G#oK8Rq{ zg7Xu@Y|`A>Iqm_2OlG+0Kdkb7M*C~6hl@R=pM>sCNCig|7k=mDP?o>+dMAYcyN=>{>|+Gz)j7~%@tgW zxaFjrg0p#6w6cC@-ayKQd|x zT*-=FQvb8IxV}_jbFkWgq;`fV^N$vu_c;RJ)JVk#R1gpeu!{&v0iG2TFdBiw&yw6p zILv7}8PSA%IH0uBMFUprN3YxYqmCR5rvdE(bwE52f=`IrbOXR=EH+=3U4I=1m*~;_ zQEFqKp`LPnB6IT1Lxn=VM@t%v3eqL>&qW?d{g1u4*d+*p;su~TMFBq9(KH#M>_$RW z<0rH@3F$Bs=s>=#55hYn!)jAYmQ?Zup58;04Cvs&Hdj3hsWhO{?coRM!)dK`F>kG~ z;)UT0epwruo~Bd0di{l!_=6_|xEoXK?70$cSfBpK(~H)Jf3jA@)CAv+0N>1Df&jS3 z7X%++kOfArwN-`%ks2BHKuYQti2`ZZUYPmB|z)HbIT!W|)$ok;T)|-r|3) zNfG#J$w;~Nvb~#4#e}nqjE6^^jlL#81itIhReu{B{5ZVd&jkI}^EC>|51Nv4c;rYi7=qa?0q*ZDK{Ud=x;dA){~q0tAn26IRT^9QvCh_>_kl6 z3+)ENpp+1kwFNFv#RbsTYre_1*3X=Z%HjWXapv(*u5BEjax6&*siSG^Wjk7k$d-LQ z4HcTQej?6W;n>HTWrpO0Pob1uMrcUr95Qt#OH>@jlFX|ihb%E;M)rBH$DGr9-uJ(m z&n(Y9_uTjOyMEVmU*G$4Nr}Bep&=oNA&7~Ic{q5kOR$MquE`xUAM))VR8JhnxD;Vu z03N`ht6=rqIt8n8_PAQ?XRCbtwCcp4SxV6S4D1xR21NFO0cQwe$;tdaZ_YejuX|s0 z=PCRC7R!WePI}KK5{YGS7UBG?mTkr9V><^-Ni zs!psVaVj%`0t52&7oDRw0H7BBu1|v+vdC~lb!}-*QOgt_FeA`2gJj+3k8va0CYj{~ zyik?%DwRql!u(j#d;)`l94p?`mygNZp?KE{L0`XcG9t$+QgSv<{ef#`vUhWHO@J(* zE%QUn?o>~I|JOg8KF|w(s7a8&mkL8(`CMMm1{vS&4Um;8jRKU4C3ekCTjrc-1vHVD zjMcwn_1!|D>yiFP?I_AO;y^<2Cxvdv^%h+uK`v zcg#Z1U?o1L{u$rW_~Ak|?za>@)^4rX7;^h!7lG?6eH_{TQI`i?D?5Fr7F6D8ql3a- zqbN$Jsb<@T)X}~i--0S%#M3;kxe%j6Lcn9qnkA9m4&rmp`u8Gio*zbF`yY z1le7MQ#O7lg?uMY%XL<-;$94)R?1}cLZ{DCm)!4#?%p1HD+@QO=|Xl7J>Ywia=Ofk z^;_u7NJnHs&I-*hQdB!&MKC@!bw{tH^G0t#htE)guUpcKBle*r*!8hmJsASl***YB z`Si11mW}n+mfVUs$WDc7QX`lNo3R@$7&dG-2n9cF_!i0U!a}p3W{%>1K1lX*<;>hR zNxZ#V{6T$5o!_CrD?uc5r39jpOfPC%*@m)-KfjcPZZ5={zh01*89+@eMxqVz+BK^p zl9#pyQ`b`?Fg4biwhx2JZeBV%pt5@E5EO%{vQk#w*crhGf)n#cf>sXo1xS~M=sO$` zAkjO7ngvIcJ5YPDz6b*JQBptAEkGY^tPs*e_qa`|y*w0y)IVnQ!qiFK^Q_oqo;}S|S zhrK|U7)cqc2I6zS&O-H%nmGQ}YT&V(T`?tW4mUA0Ye@iH$2a3}Qp_Bkhe*R{E5{@t$fh0L`phob)ynHhi(ga9E5nsVQItAkd zx|44_LT6$M=)h!~EBKJ5q=b{7JB0eQ<&G!RL+{K3SQ{ZG52l_X9WNQRM)%|$J$;)jUi&QM z-ljzv$CA)#tq6#OrKEG74?E%j39A@5{UR)>>ZQf`O@2C^{tJr<)k~D;hn&(OKAH#! zGk`ZPZOKD0XZjo}{@?QMkkBR#^?4n-ex`yZG+{QxqcgENoV)IqrNdvuu7iuXLZC&F zCOw;bMw`M9$2<8{bLI}Ion{V$Jz;VotIdu%q}GEthwhnEqpEO?(qS#KvP7y%8&nX+ zq01MAKs(fT`qKtocUc+Uj?1)C*hm+T1mm#)2%7B(wuAX({%x!}s{zwV*$X+!7~?|y zPkW$#S2hZZ*np=RDg+`?9h1voFsR5P_6{K4>30Bu0BO4<=B1No0TCLwMh@gk705#JM@;1~UjFS;pxW#N+IiCj{tNbh?Fimc z;V}#i{)JG-%?GcznO2yf16<4Ye({U{rz2kDZRwq&VONX9f8l6ee1#{XL9<)Kp#tB!O{>T_wnj?VEK;HM8s|F$3 z$fMzt+s1j&BQv{xRx^f8m+Rz$D%jvrJfUK#>1Wqo*yOLD+U9g8jvV;>=FH!og04$_ zgLP|(e*eUy1Z>4fb7b8&TcOqazqSJ5fOQ$|H;k)As;3x)YEi(=&^C0Q`Y?IGJ-_KHb@O zX17&Wjp|p*lw$zHKWtW1QacYRuzUm()U`sqR_Q3I{a(c_3n3ZWmP5Fy`|OwrCr~a= zAAAFL(s-*H18;_-d?F|~Px7a~=d1$TB4S^hxMUU2RNT~sh3W0@_k1>KFT-p7lm@q~ z6V7xHyqaHTZj+#5($doM1==+KVK*R}K-W`64jjtoVL>23A=tX%x$l&x9o%omAs3GA z*=^-X>MmvF0c52r{*$7f%w8)26||_LL~6!;vyy{=Jd;RWaJpDf^ezq%LBZV3nAXMD zFsU}b%Y~3(D%P&w1Wa5$9}b6e8nMI5-Tw+1Vvya?Wzr%X{8tTPPdPr}H-QWUOtUnmJU6K}g;az04rqaJfKv7Cb3xw7y_w!0J$h k5{Bk`a~06Vap=!TP&sx(7~S0i07{gN#gFEXO+6F-14Ls@3jhEB From d5f204b0255b9ad94c4d94a57cb94428dd21eb01 Mon Sep 17 00:00:00 2001 From: duncathan Date: Tue, 30 Jun 2015 00:33:43 -0600 Subject: [PATCH 21/52] fixes update_icon(), fixes welded issue, fixes undocumented(?) issue of the eastern cap on mixers/filters being one pixel too far to the right the cap thing applied to filters/mixers before this PR, too --- .../binary_devices/binary_atmos_base.dm | 62 +++++++++--------- .../components/components_base.dm | 53 +++++++++++++++ .../trinary_devices/trinary_base.dm | 42 ++++++------ .../components/unary_devices/unary_base.dm | 60 ++++++++--------- icons/obj/atmospherics/trinary_devices.dmi | Bin 41323 -> 40611 bytes 5 files changed, 132 insertions(+), 85 deletions(-) create mode 100644 code/ATMOSPHERICS/components/components_base.dm diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index e36e7989db4..c964de9a2c3 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/binary +/obj/machinery/atmospherics/components/binary icon = 'icons/obj/atmospherics/binary_devices.dmi' dir = SOUTH initialize_directions = SOUTH|NORTH @@ -13,9 +13,7 @@ var/datum/pipeline/parent1 var/datum/pipeline/parent2 - var/showpipe = 0 - -/obj/machinery/atmospherics/binary/New() +/obj/machinery/atmospherics/components/binary/New() ..() air1 = new @@ -24,7 +22,7 @@ air1.volume = 200 air2.volume = 200 -/obj/machinery/atmospherics/binary/SetInitDirections() +/obj/machinery/atmospherics/components/binary/SetInitDirections() switch(dir) if(NORTH) initialize_directions = NORTH|SOUTH @@ -35,35 +33,35 @@ if(WEST) initialize_directions = EAST|WEST -//Separate this because we don't need to update pipe icons if we just are going to change the state -/obj/machinery/atmospherics/binary/proc/update_icon_nopipes() - return - -/obj/machinery/atmospherics/binary/update_icon() +/obj/machinery/atmospherics/components/binary/update_icon() + nodes = list(node1, node2) + ..() +/* /obj/machinery/atmospherics/components/binary/update_icon() update_icon_nopipes() underlays.Cut() - if(showpipe) - var/connected = 0 + if(!showpipe) + return + var/connected = 0 - //Add intact pieces - if(node1) - connected = icon_addintact(node1, connected) + //Add intact pieces + if(node1) + connected = icon_addintact(node1, connected) - if(node2) - connected = icon_addintact(node2, connected) + if(node2) + connected = icon_addintact(node2, connected) - //Add broken pieces - icon_addbroken(connected) + //Add broken pieces + icon_addbroken(connected) */ -/obj/machinery/atmospherics/binary/hide(var/intact) +/obj/machinery/atmospherics/components/binary/hide(var/intact) showpipe = !intact update_icon() ..(intact) // Housekeeping and pipe network stuff below -/obj/machinery/atmospherics/binary/Destroy() +/obj/machinery/atmospherics/components/binary/Destroy() if(node1) node1.disconnect(src) node1 = null @@ -74,7 +72,7 @@ nullifyPipenet(parent2) ..() -/obj/machinery/atmospherics/binary/atmosinit() +/obj/machinery/atmospherics/components/binary/atmosinit() var/node2_connect = dir var/node1_connect = turn(dir, 180) @@ -95,12 +93,12 @@ update_icon() ..() -/obj/machinery/atmospherics/binary/construction() +/obj/machinery/atmospherics/components/binary/construction() ..() parent1.update = 1 parent2.update = 1 -/obj/machinery/atmospherics/binary/build_network() +/obj/machinery/atmospherics/components/binary/build_network() if(!parent1) parent1 = new /datum/pipeline() parent1.build_pipeline(src) @@ -109,7 +107,7 @@ parent2 = new /datum/pipeline() parent2.build_pipeline(src) -/obj/machinery/atmospherics/binary/disconnect(obj/machinery/atmospherics/reference) +/obj/machinery/atmospherics/components/binary/disconnect(obj/machinery/atmospherics/reference) if(reference == node1) if(istype(node1, /obj/machinery/atmospherics/pipe)) qdel(parent1) @@ -120,7 +118,7 @@ node2 = null update_icon() -/obj/machinery/atmospherics/binary/nullifyPipenet(datum/pipeline/P) +/obj/machinery/atmospherics/components/binary/nullifyPipenet(datum/pipeline/P) ..() if(P == parent1) parent1.other_airs -= air1 @@ -129,13 +127,13 @@ parent2.other_airs -= air2 parent2 = null -/obj/machinery/atmospherics/binary/returnPipenetAir(datum/pipeline/P) +/obj/machinery/atmospherics/components/binary/returnPipenetAir(datum/pipeline/P) if(P == parent1) return air1 else if(P == parent2) return air2 -/obj/machinery/atmospherics/binary/pipeline_expansion(datum/pipeline/P) +/obj/machinery/atmospherics/components/binary/pipeline_expansion(datum/pipeline/P) if(P) if(parent1 == P) return list(node1) @@ -144,26 +142,26 @@ else return list(node1, node2) -/obj/machinery/atmospherics/binary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) +/obj/machinery/atmospherics/components/binary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) if(A == node1) parent1 = P else if(A == node2) parent2 = P -/obj/machinery/atmospherics/binary/returnPipenet(obj/machinery/atmospherics/A) +/obj/machinery/atmospherics/components/binary/returnPipenet(obj/machinery/atmospherics/A) if(A == node1) return parent1 else if(A == node2) return parent2 -/obj/machinery/atmospherics/binary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) +/obj/machinery/atmospherics/components/binary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) if(Old == parent1) parent1 = New else if(Old == parent2) parent2 = New -/obj/machinery/atmospherics/binary/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/components/binary/unsafe_pressure_release(var/mob/user,var/pressures) ..() var/turf/T = get_turf(src) diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm new file mode 100644 index 00000000000..abe14cb61d2 --- /dev/null +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -0,0 +1,53 @@ +/* +So much of atmospherics.dm was used solely by components, so separating this makes things all a lot cleaner. +On top of that, now people can add component-speciic procs/vars if they want! +*/ + +var/welded = 0 //Used on pumps and scrubbers +var/showpipe = 0 +var/nodes = list() + +/* +Iconnery +*/ + +/obj/machinery/atmospherics/components/proc/icon_addintact(var/obj/machinery/atmospherics/node, var/connected = 0) + var/image/img = getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color) + underlays += img + + return connected | img.dir + +/obj/machinery/atmospherics/components/proc/icon_addbroken(var/connected = 0) + var/unconnected = (~connected) & initialize_directions + for(var/direction in cardinal) + if(unconnected & direction) + underlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_exposed", direction) + +/obj/machinery/atmospherics/components/proc/update_icon_nopipes() + return + +/obj/machinery/atmospherics/components/update_icon(var/update_nodes[] = nodes) + update_icon_nopipes() + + underlays.Cut() + if(!showpipe) + return //no need to update the pipes if they aren't showing + + var/connected = 0 + + for(var/N in nodes) //adds intact pieces + var/obj/machinery/atmospherics/node = N + if(node) + connected = icon_addintact(node, connected) + + icon_addbroken(connected) //adds broken pieces + +/* +I think this is NanoUI? +*/ + +/obj/machinery/atmospherics/components/proc/safe_input(var/title, var/text, var/default_set) + var/new_value = input(usr,text,title,default_set) as num + if(usr.canUseTopic(src)) + return new_value + return default_set \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index d756a14e444..3961aaf50ba 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/trinary +/obj/machinery/atmospherics/components/trinary icon = 'icons/obj/atmospherics/trinary_devices.dmi' dir = SOUTH initialize_directions = SOUTH|NORTH|WEST @@ -18,7 +18,7 @@ var/flipped = 0 -/obj/machinery/atmospherics/trinary/New() +/obj/machinery/atmospherics/components/trinary/New() ..() air1 = new @@ -29,7 +29,7 @@ air2.volume = 200 air3.volume = 200 -/obj/machinery/atmospherics/trinary/SetInitDirections() +/obj/machinery/atmospherics/components/trinary/SetInitDirections() switch(dir) if(NORTH) initialize_directions = EAST|NORTH|SOUTH @@ -42,10 +42,11 @@ /* Iconnery */ -/obj/machinery/atmospherics/trinary/proc/update_icon_nopipes() - return +/obj/machinery/atmospherics/components/trinary/update_icon() + nodes = list(node1, node2, node3) + ..() -/obj/machinery/atmospherics/trinary/update_icon() +/* /obj/machinery/atmospherics/components/trinary/update_icon() update_icon_nopipes() var/connected = 0 @@ -62,12 +63,12 @@ Iconnery connected = icon_addintact(node3, connected) //Add broken pieces - icon_addbroken(connected) + icon_addbroken(connected) */ /* Housekeeping and pipe network stuff below */ -/obj/machinery/atmospherics/trinary/Destroy() +/obj/machinery/atmospherics/components/trinary/Destroy() if(node1) node1.disconnect(src) node1 = null @@ -82,7 +83,7 @@ Housekeeping and pipe network stuff below nullifyPipenet(parent3) ..() -/obj/machinery/atmospherics/trinary/atmosinit() +/obj/machinery/atmospherics/components/trinary/atmosinit() //Mixer: //1 and 2 is input @@ -118,16 +119,19 @@ Housekeeping and pipe network stuff below node3 = target break + if(level == 2) + showpipe = 1 + update_icon() ..() -/obj/machinery/atmospherics/trinary/construction() +/obj/machinery/atmospherics/components/trinary/construction() ..() parent1.update = 1 parent2.update = 1 parent3.update = 1 -/obj/machinery/atmospherics/trinary/build_network() +/obj/machinery/atmospherics/components/trinary/build_network() if(!parent1) parent1 = new /datum/pipeline() parent1.build_pipeline(src) @@ -140,7 +144,7 @@ Housekeeping and pipe network stuff below parent3 = new /datum/pipeline() parent3.build_pipeline(src) -/obj/machinery/atmospherics/trinary/disconnect(obj/machinery/atmospherics/reference) +/obj/machinery/atmospherics/components/trinary/disconnect(obj/machinery/atmospherics/reference) if(reference == node1) if(istype(node1, /obj/machinery/atmospherics/pipe)) qdel(parent1) @@ -155,7 +159,7 @@ Housekeeping and pipe network stuff below node3 = null update_icon() -/obj/machinery/atmospherics/trinary/nullifyPipenet(datum/pipeline/P) +/obj/machinery/atmospherics/components/trinary/nullifyPipenet(datum/pipeline/P) ..() if(P == parent1) parent1.other_airs -= air1 @@ -167,7 +171,7 @@ Housekeeping and pipe network stuff below parent3.other_airs -= air3 parent3 = null -/obj/machinery/atmospherics/trinary/returnPipenetAir(datum/pipeline/P) +/obj/machinery/atmospherics/components/trinary/returnPipenetAir(datum/pipeline/P) if(P == parent1) return air1 else if(P == parent2) @@ -175,7 +179,7 @@ Housekeeping and pipe network stuff below else if(P == parent3) return air3 -/obj/machinery/atmospherics/trinary/pipeline_expansion(datum/pipeline/P) +/obj/machinery/atmospherics/components/trinary/pipeline_expansion(datum/pipeline/P) if(P) if(parent1 == P) return list(node1) @@ -185,7 +189,7 @@ Housekeeping and pipe network stuff below return list(node3) return list(node1, node2, node3) -/obj/machinery/atmospherics/trinary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) +/obj/machinery/atmospherics/components/trinary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) if(A == node1) parent1 = P else if(A == node2) @@ -193,7 +197,7 @@ Housekeeping and pipe network stuff below else if(A == node3) parent3 = P -/obj/machinery/atmospherics/trinary/returnPipenet(obj/machinery/atmospherics/A) +/obj/machinery/atmospherics/components/trinary/returnPipenet(obj/machinery/atmospherics/A) if(A == node1) return parent1 else if(A == node2) @@ -201,7 +205,7 @@ Housekeeping and pipe network stuff below else if(A == node3) return parent3 -/obj/machinery/atmospherics/trinary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) +/obj/machinery/atmospherics/components/trinary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) if(Old == parent1) parent1 = New else if(Old == parent2) @@ -210,7 +214,7 @@ Housekeeping and pipe network stuff below parent3 = New -/obj/machinery/atmospherics/trinary/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/components/trinary/unsafe_pressure_release(var/mob/user,var/pressures) ..() var/turf/T = get_turf(src) diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index 7c2ab9b622c..fe21b9109ba 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -1,47 +1,39 @@ -/obj/machinery/atmospherics/unary +/obj/machinery/atmospherics/components/unary icon = 'icons/obj/atmospherics/unary_devices.dmi' dir = SOUTH initialize_directions = SOUTH layer = TURF_LAYER+0.1 var/datum/gas_mixture/air_contents var/obj/machinery/atmospherics/node - var/showpipe = 0 -/obj/machinery/atmospherics/unary/New() +/obj/machinery/atmospherics/components/unary/New() ..() air_contents = new air_contents.volume = 200 -/obj/machinery/atmospherics/unary/SetInitDirections() +/obj/machinery/atmospherics/components/unary/SetInitDirections() initialize_directions = dir /* Iconnery */ -//Separate this because we don't need to update pipe icons if we just are going to change the state -/obj/machinery/atmospherics/unary/proc/update_icon_nopipes() - return - -/obj/machinery/atmospherics/unary/update_icon() +/obj/machinery/atmospherics/components/unary/update_icon() + nodes = list(node) + ..() +/* /obj/machinery/atmospherics/components/unary/update_icon() update_icon_nopipes() - //This code might be a bit specific to scrubber, vents and injectors, but honestly they are basically the only ones used in the unary branch. - underlays.Cut() - if(showpipe) - var/state - var/col - if(node) - state = "pipe_intact" - col = node.pipe_color - else - state = "pipe_exposed" + if(!showpipe) + return //no need to continue if we're not showing pipes + if(node) + icon_addintact(node) + return + icon_addbroken() */ - underlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', state, initialize_directions, col) - -/obj/machinery/atmospherics/unary/hide(var/intact) +/obj/machinery/atmospherics/components/unary/hide(var/intact) showpipe = !intact update_icon() @@ -51,7 +43,7 @@ Iconnery Housekeeping and pipe network stuff below */ -/obj/machinery/atmospherics/unary/Destroy() +/obj/machinery/atmospherics/components/unary/Destroy() if(node) node.disconnect(src) node = null @@ -59,7 +51,7 @@ Housekeeping and pipe network stuff below ..() -/obj/machinery/atmospherics/unary/atmosinit() +/obj/machinery/atmospherics/components/unary/atmosinit() for(var/obj/machinery/atmospherics/target in get_step(src, dir)) if(target.initialize_directions & get_dir(target,src)) node = target @@ -69,11 +61,11 @@ Housekeeping and pipe network stuff below update_icon() ..() -/obj/machinery/atmospherics/unary/construction() +/obj/machinery/atmospherics/components/unary/construction() ..() parent.update = 1 -/obj/machinery/atmospherics/unary/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W) +/obj/machinery/atmospherics/components/unary/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W) if(..()) initialize_directions = dir if(node) @@ -89,38 +81,38 @@ Housekeeping and pipe network stuff below build_network() . = 1 -/obj/machinery/atmospherics/unary/build_network() +/obj/machinery/atmospherics/components/unary/build_network() if(!parent) parent = new /datum/pipeline() parent.build_pipeline(src) -/obj/machinery/atmospherics/unary/disconnect(obj/machinery/atmospherics/reference) +/obj/machinery/atmospherics/components/unary/disconnect(obj/machinery/atmospherics/reference) if(reference == node) if(istype(node, /obj/machinery/atmospherics/pipe)) qdel(parent) node = null update_icon() -/obj/machinery/atmospherics/unary/nullifyPipenet() +/obj/machinery/atmospherics/components/unary/nullifyPipenet() ..() parent.other_airs -= air_contents parent = null -/obj/machinery/atmospherics/unary/returnPipenetAir() +/obj/machinery/atmospherics/components/unary/returnPipenetAir() return air_contents -/obj/machinery/atmospherics/unary/pipeline_expansion() +/obj/machinery/atmospherics/components/unary/pipeline_expansion() return list(node) -/obj/machinery/atmospherics/unary/setPipenet(datum/pipeline/P) +/obj/machinery/atmospherics/components/unary/setPipenet(datum/pipeline/P) parent = P -/obj/machinery/atmospherics/unary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) +/obj/machinery/atmospherics/components/unary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) if(Old == parent) parent = New -/obj/machinery/atmospherics/unary/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/components/unary/unsafe_pressure_release(var/mob/user,var/pressures) ..() var/turf/T = get_turf(src) diff --git a/icons/obj/atmospherics/trinary_devices.dmi b/icons/obj/atmospherics/trinary_devices.dmi index 7eabbd65d01999c9f350f2c0e46255cefef0cb83..6c96035c4a7e7e0ac6cb577f71a02e6ae0abbbd3 100644 GIT binary patch delta 19548 zcmbrl2V4|S*CyJ-0E1)%1j#`q2So%V4M9M1kSu~ANuo+lJtRdXiik+gNJgR(1`!02 z3=)L_1j#uM%*<{6@4MgK@a^v1yT2b4ba!=Ebyc17oaZ^!Yi&fi%|!86!0~{4W?riH z&+MK$dwMy0xC4M+T7Fy=dAK;kouvgKjxU;nBeCYM4B7UXuH395y{Sn#i4T5ZYdJ7t z)7kpjf9cp$SIiuCH)GCVS;>c-zx@Sm?%k(G@JQaTMVEF>QpfDXd&sh8Yj;JxCXAC_ z&?N@|zrtPXFe4T}=b~VF(TyBptO70{bapf(6Wuv^pbfv1PxwqW{E2ItB}TmMX*S z`;~Xs|Kef33hzQ4K3=?(eZyqpp1`FNkv9V0@7_d;)Kab9{$L>^MAztP#qCSh&VfEy z(-HEE>p^uZk^Sgd-{K5Z3_M()NbJd2=aiVp9J5gA%J>nKv9uQg{eowc{U%&wt;s4; zghh~-XN1SAlWEr1Bn-1p?CD^p>ynLii3Jd(q@O~T(7{Y?fe#pjS|8E0fhT3mXZSsO zo2M+tVMTRAIaIDxPOQ;PzG~(xP$S@y>(Gnu*x(US34YBJK zVaF$LopKwu9s|gQUP0BF_piEymVl2p=U)=@NR_D`_oL}B*1fND!)xPscmHJOoJL}P z`tu7C$d3z7X=g;IvGadvLqa5YXcR;J=9yZG${qp z8OdW;ucs0By*f|`a=FON_HIi@#i9Z~w3M$R|AjE-s`?=FRadGpfa-EdLJG!g7i9A6 zj)*M^bZKb4J|nUz#p^F)hKSPSDT3G#7~{}^COdH33MZNMH0REN^?Z-`JV61~g$`ky ziyXQwu)kJee*b85`t_GDUwTNWXFZxI-nYUw8IIS`FOF9T;oIp;-%S6&`{qzDX)#j2 zF3jiby^^XAMIQ#*DrptMJfk@EX3gY67t2`b%y;9xZpWa$2$i?bGzWSgXdj+GR%q>0 zEI2m5WtMWnj;bgopTpDw-vqWLJm?DT(QHJ7-(1^^@oZ|Q$qc~sla>Tu+z<;b62hM&rlMzm?Rw)HVsV~3e6AOxhmICQw&+eyDH`}L-2wZFh3uT_MSzCM}_|P3zG+d-5rp&mk z`e?!;qVDBd>3lZ5VaA^es_$MaiDzg;t#JyOI;>e2S`%VpsbvV^;o(uPZc57_LWq{Y z6MCH78Cn5IC&OF1L#;b`_g^Q?7l_jcy8yut#M=U=KG?w1ztl$4YVH&fg|<0l9- zio0Y%M*Z}%4+~%1I3VoDo85Y0RMfcsG#E?q23G;XH44Q29B6m!o@z|I^5K~^HA&7k^9qM&Rajl~cQV?ZUWqrTE^_H-UD=6NUt<#L!{K4y5eci-ix348@KMl6FOS z5?8N%%YPPZ{OA@Gm0b3ke@8Napb3u{F!#^tsy~^0H3u!qTh=muz+Fz; ztE_DA)KCHfnPD}gyc$a4|}e{hF9^b&u=nnBsFU8#n{UOLQmx}3){N_ zwP!R-oQwr-n&crrZi-6_j}jzQT5SyP`#M?@jNg9}N?iFE4Ffk|K*S-QRH2-RSuVBt zbn;3xIEvo(y!ztlie*-M$qc_&Kkah7>#&`a-<<=X7n-VjUt?d`8M`>Lbzu>+(} zMi|{Egg2XdSHxom>vkK5hPw3FZL*IkQ>(-&>=DbC#E#`VA=L5B=aT;Qfm&ZKAzqIY z7Hz&atTlR9Bbzbm?6H>5w4PAASRL-JmP^!K=P_9qc%J#y=}_-delIF;9FFhyhj0Q^ z3}(tc3K5&(D8!~+W-bFC!s1s_h{cI#DO=HkA}x4UTE%y?6?_lfdHFTI?Z}!uawY3J zE0>O*V)$cdN3VB<*8D^qKoLUthmrZiwzMo-+ljpbEV4dbE~CptpJPI*a;FW3bB+Zz z_WyW%rU2S!JAGi}#r>(MfL?@t&ncM7ynh2D7W;{3jf2VUg^56o_^{|xv^DdbeC}P9 znZ;go8qlXn`l224r;{EEGB$~lY+|@dSt<#0*|)2b`3z z#_JuLuo2qby_!Zrs)d;?Gm7b=!+bFBV`X_v|I4w(@BL|N16_$5uRnNwcqQWl>%_=9pxf?F6drd3&A15J;!-~vLXQdQ~z<1Gj(MMqz)g3|* zXQk9-rZt@Tqp&RV0}LtjHu!30E)pbu-oth)^T@#gVK(JqfRhTNgWHS_dofZk6J~K~ zfSK<}(sNm^CFd5ytww^_kc>AQpVVz{(~+;s4;uasN62Ima7WKX$E^JG=j1c1ZY$N!?ZCW~Kd|kI_>yrdo zTA?^|JvgvpbK{WrdT}rb91b6E9OF4<=N%vWJl(*2Y64z=jIZ6V=OXx=V%$$nvYj*G zw|xZnliiix99WM(GD8&I!(j#oLq9)T`kN;9F-cTn-SW=N*_Qr-(MQ5evy;WWkb^k- zn+0x754NH@8gg=oR8&-Uw~Pw3zkW0-RJ-|B;|lo<=e>B`!${mS*Gdmx{11hR`bmYx zJ?A%SI9UO3qCau>NdiIcaAf83)}hd~$IFDwMRU9)oJ)z8SSi|9Sgz?g7g-pWCW0JA ztVA2Zn+<3{7o;!#FAfc^Ei|gT*90z+x!u$Y6F6YKzES6K6w~0tNo-S3*r>Cz1bI+R|ROoAPv-O5lsncC{KzHTNQr1^w#pljO zf3g<-qekF~3zPWW5~ds*#)G4%wq8vG@hAQVeEW$wkX2@4wHTXKYA1ko5_R@Y1ZL~d7}*6;oaw6<7i zh~GW@s&|02k=Rpo9=b9zHWqiR4-Pz81XI`P|D=XxkXdUh-PjcvwK#;LK4l>j)RO<+ z#ulhY>60ik%LW)p&k7-r9mIGDr0sE6QAR}DS5Xo~@ozG6T;Jl3W`4?%jbCjk@NWiC zxGFg95K-%cA&r6fGcDLr^U>i_i&QuF>bqq^TjH$89yi)uqe(_F`W^pfvazQpaVuP*V=vo8Hsp5doi$6wBu*gcMZn- zDo4|=HS$Q_&yo^`smMJ1ddvbpICnL*)%$(jlA#8onuJKcethr@49`?O^CL>&jHo(G zp6~LVjx8InbjojADv#!Tb%5x6X`$;0=a3Tj4?F&F6ZW2erL<@BMjkU|az7>T z0ti>L2IaJvM=ejacyC>b{>^sV$5rh2^Vce!9zIc_ao&$x3}My>Uf0QV8G@;$5Pt1k zE2*N+n@_(<^(GI7!U1absn`4Hzhn_`aQNa5l?jLY13}WicV8hld|s~XHw;ugQ-5-p zM3%xtz-)F~fLnhEQ&v%Y7gPG*U+Cni>>8UyEv zlAlQzd<@g~boPGSUaX-PFTxAVCd@E`N6}Q zQ`reeQS{l8PUp z6}RzsJi4jk)ZjqJS2CM`3;BrT9WK(M`fzr;kY^997i!$q+CMs4t5fvd{9StXlgg4D zIYg3o4G4d;)~8WXJ#^|I88&o;ZF(SgaZUB?r&z1l7gO?(c-HXklK$65PYpY>31VAz zo4-GQ(FP?Yp(Y5YU?_S0_{Y!7L=i2%EXSIWS5D0e)$Qn`FCPazh>)%0!k=8&J|hLY8>L!0QTk2ii;x$Cqzi5YXPWdd|!PBy&~|76x(Q6&{Fz~0gy8! zvdfL8b!qS6(87e(;4fdkK7g7fihNL!q>+?3a{C`;({fsryMk$foy6cmh>7f)z5E z{p1Y)994+SdYA#2lO^7LEsg|42vKJL>${2999y8y4x5Wo&y89?()re*$A%#E`@-Fs z+Je(Hh0A$;FW}sNnm59-Gb67%?_QC?Kn6^A=Y`$S!dOs<*&p%~T~k`P z@fawrsDOx$Nhxv}aRliA~1;#fhsLV*JFnF;22zttJWe6c5!hy-v54Ywz7QG}Rihbkk_hV7zCEyPF{$)#qWa@Pn%5A?T@ z$#c6?fAnY(S@R%QH*l26!p~g=Q2M9+v;j}(m1U*0jB=p)hzm!{6X%gcn3U5VSXU8c zGYT#EeB<}aP(MykXZU(~-XRa;q4H>AQd@SX*&ZY#%za)rhlh22E2>xW^7hWIsxr9m zvfU8+OznB%e1IEgI2716w9ne65Cm@Fd+Bys=eM+)a#r z#6nBF9jEZzQ(AcJ^ICahU;ODd3oGl@#vz8STtygRJOD7X_k1g#_#*C zDbITJ=B1E^MqK*93sH^GQjC8FQz2KLK+%8*;R3$nisxfmX@62_Sz^kn11YacAKWLHij8Yh6@c_!|gAl7}SHL9WEmSv6xky344aYqvxM zKy7YrHk}NrNDmt?>Y(Q0{vAx5bz>=B_`2&U9JJIgh{^M|bYjFP8* zhA;N;oz6w|kR9T9ZP<^S^E=Y>I}r^JK6?w1A`mdZ+uQpK&8v;&<@h~CY3Zo0HUu5E z*C-0)y9gO*l$+HJsvsFM{BzlMF2Aogt!{aJgQazn+-vx%b7*66a8r&gExJ9KuktH_ z0I(tYIzrL@Fa7MA7|vG9iy%eVV{6JIcasyHaUl$H6QDco@l!Hp?XXOL3h^}MV_%VN zP!j39YHpmwe4awZ|o%H9bxhj6~LHnO4RllhURdI10 zbYFIec`A%;A*r1!MQvI!ggp@BuWkx|pG%XQ z5>nbB!JXk}=FH&>@wd3sqh~#Y$aNwTRb1KaO_428eVrlaSyxS0GANnQBF$?|zLL~U ztZYy7X{ArrTN0_G_Zm;d7`$m`Fk$QJLBB@%xALF;v={wj_fd1U~Z{Taeb~U=L!@w_O82CJf zx=(IP~~$-#3(D zVitCb+JJ_C4v{x3&yU)V7H5B$AJ@)wh%r)IPg*ZG{#nzHDNs z^~_IOqbV~B?W(pkj>&*s)zvp{eal6fGFNkx=&oQu-ghZa|2atB6r)!sPLPb_*{@cY z^Z;&gz;^m$?WS0bD%a6L)WGphZ|fg1D%P>>9|a7&+rpqC{A`0e!uOTSjci9Lu21t1 zJ3b6Ehdt0`i9eaCiN9=Bz?iG;OwOQUh#=4eFwd^n}nH1}c-Wtj5q;fB27Su`gRplYHZyl6GZpArhhtjOQNE;##f z2VQE6_>}!%Y2JV4>^1;|0o)?7&qIP=_>t{DXYBy3#)$S}J{~4q2+KatTYl-xua$<& zD&!U@?Q|b;C@~G zL%t+3u7P(yji(={vYWhJs1U)FqVcxUUkbR#6s+Fm)u zG=THuBbuz`+Vz><-}zpY|3Y_>Ywi+yKhZo&3N2sqAp#zYeT+1pTpH&igI|^eCUM$j zZ$94T6v4wL=Dr$DRH?LrCGojS&E+Dr8w z+*eKU`GckfXHTBa(*Mk?%B^fV=`Tco9WMhFYWhCr71kv4`NL<&S`H<9*Vx(F--EKg z?tLd=(7(?)Zm0IQ7%%h^4u1zxQ&QS&%`|_hKV`B9JAIrjeG6Ks&dJ~KD?5;_aF6hVg4Y1qzsw7b=zQ4AGiX^qiio<@=4P}0;%eXGAtevOg*pML9||$ za3G^#5@mq0?vYfix5#R1Yv1+ePdYc=tDHjQp_}7rKr-9)w~J(+etyjK*R)ZIV`Ay+ zaK5E)-zCvCCbkL_S zo)6C4!tL3GCW*BB2(uZf=7AT#>_)780m}Q{#-p{b9eY~si(lBehy1<#joqexulYem zOk; zB$rV&U2`7RadTUazd;2^4)VwHhe%PF0IWF%_XVx&`b=eWXLLa_xQWzC79~N21p!g97<$T_Yb+gwA?UQD=S~b@;%;A% zag;|4Ir1?l!(?S5zHbyg0NjtorqZGImpvFFy^tdc;w-iJk2bXQ0f8_8DyjyRapsk7 z@k87Qy9@Hz!15OCPd0=SZM<&boKGV+8PPS}G_u$~+xx?yUM|j+vn6t`8h@NW zQ9U?3_QF2|J?P&<@l#F+MM2G>s{X8coVBd zz<0h_L@>8GBah!ra0tY#0wY7F0<+)R z;iOoa4=@`0tDwitjbFjXql4NR;|$xqqD+6k+j@4|7K|G|bF^f=RUEce$w2&i5L0c} zNv-`}T)b4r{2l!b4U4gBE2#I`P_NZi`@3rfu}qpWqhRi!B_T%D11I&NL%n*hJxpKv(zmG) z#piGso3o3=@A3~UN+?;DJ1oG~)45+}lu;eqdGivhHu4uUd}sU-D_$&NT&){Eyh)lr zq@)_bY4^`WLcEVPSA#3Lj}nl`3?_6>ylZS9v}FEPaby+mLT@tTzr+skcOg&>Gg&=> z>RjX zurGBH8gQo(Y-6qgB_bRt{Cp0HAsYiL|PEIj|2cD+-GEBYC ze^V}|HKkOp(9|uMm z6rqcSzxSmmcn`!Fnz5`e-{FPHi00pxGP2qLT`n=Kj9*P3z=f3wIqu;$D!4-s8*rjP zTM`fgEZlK?&PWo^tryN8*k?EHZ|n-#rcyJn5)~~49w=kO_Yo^%cDtKKWx&l3c!!+* zuNWPna9NP9WKykcv2jYv zY(?+Phv#IH8kn13@aBEQ`0d-b_u>!3-1?QPCARX3&WGw}Rh0xt4*ApT4}$df_ka!8 zi1C`2n(=sIrME(N5J*{8?)oXJxK4PoOV3Utzh*wHj(!L;fu(Qv%UZtF z-lxW&q{*G44Tk-ZK54ZUs%nIZl4wB6xE}4F(CcNe$zNnu91T{fwCnCDE!e+rwCOR* z^0}!jnoI$`jYhs}Y`hps;0i`qdB!Ui_gx^&ahe4i%y4+|C7VJgL)D5tQBLa&kzJZf6W~yXn-mCPFsKYJ3?5d z+b8>tpOb+NsHOb-P4N2T;*!A!(=R&I9p}0Ra|@<~u5ymtGtCXY!+EJ*TI^r<*=HIU zS;gpxf%^{+ru+7kbi5@e`wt)Ps4gw0pI@=GUjDXuec5{3!0ADSshKwcmmA`~C(-}@ zFVJ{rJD^#4wz%X|xfSFzL`%wgzc@Un(d6EO&`6O5Dy(&}YZ*j1Pa6QJyv9NTu+2%k zdbpFK(!y*=q4j)cD_fx>s{K z##T@Ky%FLcQ0wV!ymXK75g(U~tq5dt3V(ZYp&3dmLd7^U<*R1ymmgLiH(Sf{KqI5i zq&y1X$ZY>6^@+pnGky>9L$G!Zdr;-4Ff+TSEDJRnF`|KzwYB!m6^mlIPVu`I^f3;L z(~ohflauivIq72ZBtk8BR59NGQ91<1=+WfNs#tie^RTM55L?$ zb`ZYin9+=0iEPQaC~+}Y66s(XcF6eIKfw9Wb$|b0&IpaU+4y+0h}`C1_*%W|?ge`! z9t@i`LM!rZtp|%($1vJwu-v1f-BSvGi7ojF?tgG%D6zf1Ey^@h^?rp){7+w9T^f)l zdg`#IXo2&n-~bN@CNZ~SR>2G`SQoU4E{8arI%hWPeEg{!nzN!{*l%j9GsA{4G8)bw>$;leSGJ?g|Niy=vp;YF; z`iOyl&6x^81fb@ST-6*r55I$T_eX)MNE4F_OM-&gyTQ2ze_v94mi>@=osFzZ{)W&f zikYe1R)!@0p&DSjZm^hs(0=&7RPkq`q4i(5J^WD;e)TrA#*?JN-|Gl6M`)3^q(Y?S zsiPX=p7T^Jwm(ep7nqQ+iZ-ddMLxAkP<^%v8l>8oUG=-zC2)q4c@1W2779wSH`rbO z44Y)8oWGGv#hb{vC|48E)!doWhBhd6bshZ7OWP&fr6n(3y+vWD_t|Sa3q6ETCxZD~ zwF}~sjNGX%-3no4wC6OONM6gj0~tvnR`J0qdK2KM313^2VA7ch&NBw2NW&Yd%cvv) zn=U-#Fj|0k7p~cu2prC;*wHzOUaSZhJ)uT5#&9e zc&9`8YmsfwKW`}tski0I-{!Zziam8!8ds!chisYtqoe>HU1{QeE!$|AB&l5C{3c zqafN4D|i*~VhxP=Q`!9aGHP$X5G$s9fDSqk;|Ct!!4%Zp^3q5lML~W>odKOnB7}lm zzGzbU^`(;ZhnGOf!J_-i6Isz_PQOwYA)gl-**rG|_5hpdfR5 z#LNSr6)Ie7^a+x0@F=t6X~9N^HM9ZmmdRTG&11TnV4Iuw2zQF`aTQo=PoU`_vL($$ ztT!VjqeUTT^@s^8Y3C4A4BV=%&CdNS^Yell6Owc-7-%gF0d;34PB$E%1xuQ|^?$4{ zi3EEPRM#%G>ImY-RCCQ3Ux)gBj*soo_CQ_st*c!m=JLKOZb^Ws5GJ~#a%{0p%I^Ba z)+hY0zpE9$fE0G(DN}u%SOebW_;KmD72%hCK+^~z3_iQr=(u>_5{mi%_I`+@u&oNC zVu8jT>S6j`2IPr|7HL!e?QB7@jQ49LRc&E{sd(VVxyS83ig{G4Nr?H%b?X#IRygc= zg3}-gmu^czpOmT5&c>=Gyc5I}n+X>#eWV^$+xZt3yq$s=zyqDaojOdM{8z3o*#m^4 z3s_Uf{R;JKWSCO2wgYiJLWjtr5uuk1iHgNm%t3ALJ~G9DrpYUY<%EFSStJPLqKVP1 zg-s{-@19&-M_r}w;STp{UoSEspF@3qC12cBoiWaFXQp@jO;1?y(}a{0e*iM$r&AHVhMSqNlX%G43lVe(^g{Sn!NBzx(^8bXlU%p0K77 zxWs7&^TAs!hy*wYhY0P}s4s@|hN7B8pQa2x&n`nhoy`8)_C2ml(v^}l)J#|wFwax` zd76mS-G-MATF*rBo}h5CA{cD1ZwEVl+9|tCYaS0{Rjn+T45l7ziu+>TZnysE%B*VnU@A2!-k+;51A> zI5YBpLIlJrAY$N<;095F_cSxX>s39HuR+&D{GrMLMjGdxPMq5gZGl_;)77)?KM_nG zc3WiCuB%iUU&IicB^TS{j1`KreOiitmD`Y3fHw9wojj)rWz_GJj;@omRxyh@{zu>| zk@k;>bRO4x{Uc9BJ$;^m_|Nw3f&Z(0eE;n(KYI-~x3bDdKQ3mMlxU4tJ`C5lv~-zx zc`5n+)0b{_S^`u)wuN|~$y>Ln&fWgN9l<2!8!5z{Pdpo^V|CyL`18P9naRDLl_L%j z#>JJSDRYZT6+BTnm&qr!`1fnAKS%cjf1<FRZ%po7$@+naJ&;9? zw4l?l>48UIOx#P=uxefrlRpb!lSCIHe~^ss(AE*ry4m-Fjy)?3o@ElANK?X+0|7*h z>CwZTL38P+`$a2Go0Nn+V(AxuGYMdU7$lO= zM{tQi%EJvwDhRn?fK!xO=%zc+3Wb!Y&kFj8tp8BKBxJW9<6t(qB>s-$A3QX~wF%>~Q`X)8&yD(acY(kQY_TilI-<+Y8DgQX0LeGA9bi7Ksd!x7Bm ze>xSLz`{^V+5ke-;JXd&rW3=*zYZt9q-!5je^EHXy2_j)jNSx$BgKiz64cLwX$F6Y zZ9GxkX*90{MrdQ^4Ob>P==aL+#AteW&-}a#HosUtFRJ3lvZ?*&j z?c~Ldnoc%0$mF>1mH__<0TMt86$osoqOYu0R@>kyE~>+J`xMvUup_wdyD?yAksM6A z;t_`jJa^kK0N+tkayYHwTATyRRS#tsK%nFtOvWzU?Fcd|h9s=kgCmtA^dd*p8 zWjS!f!U)(_y+1RTk9jpi+CbQT*z@ z5Q0`*TM9kw{X`nT&x8vF6W~aJ6-czH3_5uVF#j^ubDMnh3jc*@7FsL~3_~NFz|5ku z^d8as@yJ&H57}YDDDXG^+%avWC@ zf0SkdH!EPgQVLp2z3_lQ3j9nY1;})X4N!Xwyp8d^9ush#nGPU7pa;&4+O_xY&!Y~T z8oY2!z&?VU0^s!qH1B}T?5$RfK8wd1KhIxlaWDA#at4vkUEZ=e8``Ljh1q0sQrJh> zO}qWCVS-amRqEtz&+M)@iIB`acN(dQVeXd8&l^OfK9#*l*0pAvoC4a)CsWv7@3G@W z8gKt1A62VTPdbW4a!If|=inQSvGB{B{IXmD2jE&+{nLPtu9mfedw+!VOx*4Q0Qg?)K-DFukZn~ zs7UO`PsQB~xYyt$@wc$qMAYBO)XOe<-D=)(PdD_)+g!9Mk;01Iwfwgh3$zm%D_8XD zR@#e!Jk^Y+_UNf|`c(@5R7i%4KDQsTn))mR0<=tn8ECdE;Z%Nn(BN-0~MLmnzyq!NXpEc|qw6_@P zOh|FAX4os2d){*wJ2pB>?y7a03)IzH+4zwxaSr0!8y+BQ{j?A3;T9%tbkyYM9{A&G zGTC|^E%H9^8Kld)-(^WF2calnU|_(e1h3|-zyEMtJ(i=RJ~o4<`j(}W!Q&U~oH7CT zCO17=Xf&^H&FdODt|}7hrarL%dy9-fYg7GKXaHr>pm-vOEKLrlHXPSC%E=#d#+pD1QBDJ5-HZ^S$QAX* z@XF~ENR;eC(>Z5BxPM2VT;8U!QuY`)L_BQV^N`Aq2hW28owv#~j;BfczX6}Ua#N1j_q_#anAerzQ2gk8FD8j3yZDpgdq%R^ z!%>cPi`z8DNl9VGhbbGQ{Q;HxaxQKXrzbNKvh4Wt|77#?sH3UdvX*m1*E8PET%hiI;iC1+!pTa7Q z;7~q{4|kWalZW1P47B9ht$K% z`|H*b@1@sJ`R7AN$pEJIoAB@rNPyJCCgT6xA>@n#G<i0E9=~W1?va?0~ost$6PR zUPhFeutSZE4weSw{GP_@j&yV^EO3+9QxKv>T6>5Aty@QqIJtoq^U+q)IO)oxeIjg1~do>vZxMlwIYzJ5}Jw= z0@JNq-HL1f@?Fz4J(&P9-2=e$%MK(&<3p3-r|&Qc^$mI+yx|LEgZSIo?0xK$q7zV6ow7w*}Uw13%M;65kKh9V!CKl-QF zpAP;1(a4+=omVP{p>aK#Vcntv{xOd{v;oU93k-~P_`RM1JPUyg&M&uwA_UD@Wkv~= zW5N$2@#X9eDeqPkgP55lMcbgD?Y$z{5`>!$K3%x^VFTWHlMDCH%yR0T>-`&0y=U$X zFlf1a+JQcMO45)>YkfWqkplogV=@o+pt$%PVg?-~Wd>R<0|OHi0@k2iog)cR0Tvh# z1vII8BF9?pg+JEQe%_NPp$6(k5s@iRepNsE9dw*zRkohGMD5G zu?b1H>t+)TlM`?@1HvBU8!&zvg!NgAPyfEH$zi9s=_Ozm z>3SM(3C9l)Z&8R$L1*8(rKb4W!`_3?h@KJM_+SR*v#{`Ux&m;KN_O2)5sat6D&#mRX!=c>ngo6~frE}^;|Iv(}2k>@9e}vOT%#Ch&1jQ>&q3kU(p|0SaQ3ytjW{EzJ1 zawNgwei`Vp5DpIDC>9hVDOsQTXD~A+R`?}x^)-jHE%~=rKx3MB96Y$PPye#T z`uangWGgH<8lJzDfH#>ic?z*K2=Y9O3lTr2l;R>%xLI#2a9^^+4XWVc|p`mz35!PTXq6Y=;wMI<&3flC&%j=d*HQa_b`K#%OJ zExhIS#tn9Iumw@;xY7S->vUgKbMqd6_G%Bj`1P9el`E^m(!g(@4;^!3aCpsZyW`)w z;_jcf1c5zOaAkS>44cEt=&fv@pP!#zU!9m{ya-s1J@^%O={^rQ*k?BiUH`vXE`}c@ zke~n7asI(y>`aUtO$>dHH`Os+*t0A(dgcF>^W+}fDF$|8oR~jM_P1$t`g&dX3Z!cN z^~HwasIEufF%L!u&8EG2e*cN4QJC_d^5G_pLO}WmgA6>7Mu>BXHCmZm0EUYHv5-vVt@7m7gXtJ1Tf8f zz}2&6|GWixKR7n5-+p~d>xGF-4O4j;rGG`=WCRYAs4S296Plf%y6t8CiZ398l@aEshM{T?M3z$R~E?>UXVAb-rJ&Xx<7cM;j7SSn?()8*!VAJL5 z{}&e*vo1HC|90bx_}Exo5ut|VK67W4u0CAv0gA9)`7O(VwRJXnZS5GSesD!Ti}~j3 zlg|T3agJ3p1}r;Ulc^49NoyY2Rd`u}ynRRq&=8I~*u z?fS*hv|Y%pEaw)@1(`rEdHAscSccUcOWO%44lc0vLT7uFA*EX~q(Ipvp&z`!buLRV zmpY@wRJLzxG(q$3krz0?tK{lIjeF!NBjBpJpa>S-Ruhmro_bzn+#vFfSrf|TM6u$~ z#0zQ?Aj2kJ5YYe^qc%tXJwzUbi)aEh+z)YeS#hm}wx~n=`GF~^ec!z}VDtOZrh4O} zz_RDFT2#K(3k?&X;`Bw<3{sLcU7!|tMZwpsFY z5_hv3fGU#D@tQB#yg8V!-fm-rPu+f?WfwN9?EsF!ED6%warYf?s9@7N+n+~-ft>)* zcpAfl@4q+K$z|N{0S*COpDhdW)k2ZIoNOm}ofw`dd|kXXo0}`A(Se~!q2cikux`c! zkQ~aWp#9_5-#Xxkm^`o%Z$9k}C}8=Ld>8{HTl8}3b66&D2DP$nn`>Qu=qPorMLW1jvcHkotSS&=kJ|r?3MEUtLA#&nO33m{;?Ff zgEoh=ENoxI^uV+`95e)XRxknBl-F9l>cZvA!57M9ZL31AFPjOhCl-QQyX9%$fq5jr zyuMiN-;ZCftM>H)6H|f4uDoW0Ut%pu3x9)BMaRaVvhR#qmlKbi{Q*uUb3B0=BBto1 z>Y?rX|K{E)yPbPuf4zNFbhM#?K|-d=%C&1n{pMLH{*Q|c4Gob3r$39yi}()vEe%pF z6!`k*cHZH0vAaRTmfMyBE4d~O|7@Vw^0v>OchnsiEK^Luy-&m<5zol=jMJQ?fQhK% z(~>pU8N3yFf!=hfbOI-FV7h}OVwEkNpgr;hDkiL6ph%wdU!GY;V_?6s03gL0hfUN{tj)>Lry@$?;xz|1 zWVk~-t9iW>o$r5tQ?18ukvMQkT~O}>5xs!EI%7)rXF1jh*T`0jiC+Fp^~rDnZL5_~?eG~6YX46M7)`Tne`_Lxc=evMsiTDE$y_;q+oW&F*vHpT z_xy4#Mf|Du9yl~ln&usV{`}O4`54PE{63nRx@5j-QFQyXzs=d7Op-3OBeN98;ExIo z4du-{ah@XtCofpRUK$YK^MZJ#(Rd8W%M_rc9cGj5Gqk#-#FU%Z@pP)a+lCFA0LybvWBz5Ojw+hn_>?8mXI2*CM%yS}w0%6qJ?99*ET}GR? z@jq2|aDL{0SR4Z`21n*89_`_;cXL!8^UtquMS_*J2VK2w_?Qh6*P(! zvBZgf_M8bnuJ){Q&G2NR42I4~U%o~Y2V3rP+d|(WB3D^zwpV*Hj>NQhyuEvb7o`i9 z5LBKYAOjTV58T*uQQ-6?l0V1qWDyKcoYIiM{x};MHY+Q5Z#ftp-sYXw*04f5GZ_G~ z@Z?$Oouo_BsT?a1(HsvL|3qFNNLFsbG1NFXI}4SRmL}6lqR=~n`6=*h*X_wbx}QRL zi8F7lVE>OyA5ie?il3aHa7HB$I?T?%gK*wmv1w|+JhePa+dCITsaZW|)h@@X2P16U z*gSl8)?D*OGW2PHG|X}PbOr2g278Bqnah{A@g)pVpWB97RG8DSR`h4?w_E8t-tU#- zPM!0QHX7U|1c7E^s@Iq;G_3O?J!Y4gpfbI~dyyebJDi3xvWpb&qg)2yPUMgA+es!I z@|_(=V;v-SId@kD#*GbQb|w`waf(ug>BJdJIYNf1FqY>@kj8pp5Ueo&N zg1W`MWS6TUE>{WW^s}gaqPmBrQgMtu^x*Ha0uH_-TDr4fwwR7r4P{A;Dg?(}6upbb z7n86JdsX0)A&T8%Wri9W2JH=Zv+XWZdJ$FoCW)(@OJ!765O{T6(q2Mv3o?AN#Ooe3%Eww%0PHs{V_{& z!6ag}MVC?s^8>nl1G(2+klTjGM{@j><@~1MX9N7n47W{hNRIIS%%INWW4{VYaMT@N z`tz1aD}X8f9>^d^L{1S?>E6*xAj}N6avhti4(PmFSMUuT_+S@*caa3#zeymZP0%7M zB>ny82T5|KbkjD8AN)`tgF1F3>$VMdCl&6rjiA0cI82lYyLzuly_Sv z=ctZUE^nVoD8(0u3H4M4us5>bjYq3u@0#7}-t|#toCR&U2>R%l4y{hKZ^Jdtg5K|3 zri`R9IY~Tja(s#GoBruSAM7tqK;5ruapbhI!?1MvbChN~VQ+yZ>=L`UPd^O5A^1Va zJs6)S+m2N2JheR}aI-Gk8H!@RTF08^7l>51!9S#p>gqD)5o9=9i))lt0m9#eL~i+Zp;{SJRUY;I=-ZNcA-OJBK!T1s5X~3)H)@<1s(|ZAICE ztV4Ese-QX70+mE`3(z?}uNEJPwucL;Dl6tuqUNpc^23v2Aw z1sUiH?6Vzbo+GL5a=!l^QTEy9W11rKS~lX?`HJyv3{IxAOV~#35TN)1FIz6|jEtqw$kV@C2jsYX1rb0Go@Uq^u_oVA$tB!#HemNre)l12(!8BZ{u(jd!QT;kM(wwr*VJ?oOcKIP(i}S!13d4Hp9huy6?3Y<9deY^T9j9uZ>(TU@_ zl+^Fz2rIWr9rK6D7wuGL4kna${Lcow+vau%fYzfJ77{VpsBQb?{q#fY>PAX1NK|M5 z_Kt;({DQW{X!7cg)Em6?bbEgq?23-cQw(yr?ukdlvxCjskkg_+C)w44Y)?v4-^qC0eE8V+_j_a_+~L+NVcbZuG;pa?#6w*+HK1mv%E`{{i%63Q}c7V zry zxO5sbaE~*G9{)~pe*JWWT37(kjS|Y?Z+G0;`txUOsE7WKF&6wW$KWuxwmY^aQc86SIP-R!K$HKT^T>xtSmC-WtseGd_R}P>+93NPC>6eDvmWt%s0e-Ua6q|!s8)~$ z31|DnE!}ZZEe@HFi7xF#e^a8D{uLTBK4*1m`@$Bv2BSRdR(vnPbATy9KPW#{BC#z1 zjfh`vR3B~lPj}fAMw7X?xKKAcA3Zg9Qn>i$yRopOWYnyA@}GtT3*@5PV!)rQuD3fw z1!&S8ut6GIUhjN`VZ&YVG$m+yv@PKTPU(y*y-u%YL}nwwR_h@!~02~Yv011 z((V|n%}vK(mb#2_k{lgXas5k-H<{8?Q!RabOmMQkyVe1?lVvW(=sTQJl~jGbK?at1 zf(w7lSitw%hXeIPUhbZ~>}hc#gV4?7jW7&%X$&rR6(qzwD`%7rg@1{QWDYJ^g( zw}$Me2zHVXb~0i&6hetQ>;?z18nk2T;@_r9XDowgm`#5gDf(oAVQnIp zb`R_#ba;IjGjyIiG%wVy>X@366_1h@kJ@{>L^J;L*CG8&7pErb?r?&^KC*(y29bwd z>gG&8%V(qP>jFz97EA-FQRA!5b=Z*MJn;}FTXdpp<3nX}Z1;WUfvX!lV(Iq@Hz_hLq0C>sQ)(X> zEOgvWSX6)yA-u4?R$6KM$;sy|+}h>r-)?NL0Hi+fTqDQ}i>hGP zVm|ccx|9Ot)0s{M?Pw`nc;C;C$lh5mb2R>=~ZBs+riWZU_3fE*t;lZ9@ z0(vdD_0}BvQjRvB;2SH6Y{kgj(^Cdk5`m8FJZP8dXKr$Y$= z*_Tis_GxXJ|DaEuc9mKwcW#X@5r6Gol(#a|LT%MotB) zI~4t{jro+93b6!m&*Kj+oU@mUBtd6*%Cco94c_qxSlmd6;KexqK(z4g1-!~Ve7+MS zKh6HDxR&3XXaVY5(~&u9aUTEk&F5+Bj<{<;AE0qDhYdK!$;{`jT?8xBd0HHFB+sR$ zka+RF+OMIE+=<+V8-njjM>$%Uv)e2B)YMsr+i)bp%ftXq!qm`GoL%UxKS=rY1cs{g zB%X0Hep)%)dffC#@ED6raoDw^#Qat`Ig%W$9U%OD2DHw-A6*!x?)oytoF58TzmFm< zRD3|Hvqo*!P1$uHOz2ZvdKh>#7pa)fz~dPLT3t9ZW1XBd|15kJi8FgR-=qZx2)5L; zwmH+Q2eml^q(fSduqIgj>g6W;IVZ;lL6w{XEWI8*5^|DSWADdEQzV1$6)ref@d_)A zJg^^HP5jgTflU8Jeam4njmZwYwJjL^js`a;FC=9zcrqdbD)9U{Mf$_el9~V@IF%|| z%O(0A<}N3Rm_$c|Z5(~tUF>|r_A142we;=Cg@&=E2N@ODZ~3Jj*E=a&bX-9#wpN;6 z0Jk&7j<2ASuSbW*QdTuL%WW_+x!uEQYn4%RYoktg?*~7>rf5$(qhB1I`rccCrS@huEstw-M}FBzzXi8`fNEXkb(n8U!e17S03y4FevZDV zB^3V11-M93!>qi*z1M7?<-P@b)q5GTdO9eEh&@80lpei*kP|8=KYb-=i9 zz9Rd&bQ`HvW=AjV+UsNw?PM`;$)CAvT5GK^AQC)m_ALTGvyu?wic%LS(%77wF0$<1 z34h}y-RY7hIotvwgAP+kdg<^Ao9Y=`i}>zGkgx0Aq9^Ute9E=tSH&d$;j{B^VagqN#6vS3`y0|>t2o9Pu{|R3dzIKXY#!#N)_a1l~`rw zq+~`)IOs=pflhGDx}>Fr6^@_7Ur3SaQXQ~KZ$0`U6kM6|oPuRlTK)cf?(c}L1_feu zW*2QwNW9vFf3cjG+gL>+kqN;^v-edsRuKe{)&XE`^*8& zN7Zp6p^%m*N4Tb0PYvL+grfN67PXG?$7D0eM%uI4QIb3oI1(gz4UZ)wIwC-Xby$kc z`B0rjB5C}kDTx6X(43P=)EI0GkPsWZjXU)H*6(&EX~i=uxye^9A|AR9~+oF z1d=WB#WZ0ZG>8c~O8fOu6pskTDsXOU&ip3RxdyDLAbH~8^F9_X*&Yjf(U37#n zEoCwf!l=?bZoJg^&AWHJOI;ON18++e9iBb~6dk{%N}_h}&FA?MZ1&l2V@HeUk-t%U zy2rS!M~bqrxyq#Ek+XK0PK8=)WvS$1%HUmzSwiqAXj@{ecpm}%R*vljL|DcEn>-O7 z6B? zd22(U$=<2ll#}&Y&Z%XNOz1mEz|{IXMLXAa@90Y=%{?Gpv`+|(T?Ee zVL#j9MNB-4*y2_|fJf-4RrJ7+6C8NTm==OO0rUiaBhmvFQJHs*2mmnPnL-jH7v(m7 z4DjxvJEFSoAkc0$8@OG?vgw!aO>atka*>SI}t#!s4FCYYYprrHN_K$sr<8&av zm-QG**gWTg(GEh#;CDZEj`{D6lTp*ez`L_0Qxg3P7C*e+wYy6P>v5lf$JdTCZ5CXR zqX>j~Zq#-L$(dQhdA7U!7=^Na*{$~D(i}1S0gwYQ19)xz)}iJ{ZXrjUXAKD`lXjEk zV*1}dB`IHQ^CH#)wy`*=?a2V*GjF5dWRdYAN1YQVwr{2R5wQfGaHL zZi%jhGjLXVO;HTW`dp9(u(|c7RwS6^p$XudZ*6Y{8oALDR5aV>TAh4MG-e@>zx`uv zX<<&Ube1hZ^&w`^bsN2RAK`?RZ?{tj2bZp1?S2>h@dR=xYicE|WUR znP7MoyyAHlxFB0?rV$>oGQ{@yjFsjk=G2I!dAF^p844Zg&s~ zZf5|{%gMt}-WU;QU&TM$4MyK$uw6r3Ap%d2wupf{Z@#9i7Zw&8A-MObSLWv}`s{L- zyEsVfN&39|!C;VsC_o;OEk~TqM)aC=`&R$Yt*3PUoYBem#?TTXBS(boW&fBs@543l8+2Xevv(F-CDy`#hB)kb#0gJ4j;u`0?Yx;+t?MoD`sF@hy}DoWZdZ zG{}*VbEAeLTao@U0chVVn|=KSuhc>EmHv=>yQyaNNhjkW~8{#z#1PG=3OxQJZ~x{Q|Y53k?+a z1Hi}A$`{!_%6-}=zQvnzXas=39o$4rLw@gn$J{L{gj7!GaB$I`Kz~;)VfYgu%lM zMXP4c&EXXlg3Pi$!b{`hi>y8azDMn+}m!EQHyfd5oO{1m0B zu86sY5{iH-C~^fMlu^fhPJLRf#+d9 z_5FM(*$>;K%tV#Pkg>r$`1kb2c^t)4TushCsNN-otb>c zwe`k{9lX6Szoh*D--DU+7a{Gi19qfSg=8bi};n=GeTTeci&;;Ei z5Af3BqaEST^$6>`VvWu5ep-TBTi?=X8w!>TGP&V#RRysjWs`g0Oq*u{NQ$z$yH&H4Vlg}1GD*>zz3cX2t)7>@W(3_0Z#WDOTLG*j>RD~NSNWseJIh{0z#%`(| zxky=siCtnK_(!iB%LltRZxxt+s;T)3GW+3_8#+IW@v!3913=xA+ON9o}0?qX{@ZrlyS*6KSW zMeGGq3Xd$`O9Ehwk+6u&mr{@>K;nF?;p2v`_Mk4QZP5ft-Zu*$zJgU1Wii48?`42)B!`LHH&ho>V{if!7%`D8~&5d-u zwR#1oCLt+0XGVQD{Rz&RK!F<{F2a|n{^;xz#3?yifK{K^Q(cYj^0f0TQ=G6qIZp0T zH@{@uR~oWNwzue(tpkRflq?3g zqNR#&f|AX(!t5taq#WOxGI4u%`B!wQ%G%Pmb)VOySq`?Bt1Z zLC()Nd@E;kjDU#4k0|TUwwGOF55zUSg7h*LjltQxGV6k&-Fxh+3|D|oLXxkD_F~Q{ z_jzTYH5nbNEXfv0t$B6X{D3TKgp};L^-_`=3ZF{_P=7e0;oXc@?D}cZ?_pZ=70g|Z6M_TmB-9tJoS|MvMJhTs>OS3#xPcO&p4u-Eqbq(4 zcG!&x^O%3zq`5=+3yO*zxl3#ARvTb{%&pRKQXCF&F1?T}kxFn5T2wa}pckp#etsy` z$~yo{i{e)XPrLh3m85QO6fHX1OdD8!S+nsny=Ze?`K0=g!_4z!lD6C(`={tzL)42u z;9eiU?zI~qL}r5e81k57)AMCD8|<=x(0o{?KR0s)uP{hB9y67j{39e?^s@XgOt7+ij$gE6b1v z;u_By%gV?*Iy$%*`)sJxs;7kb`8!<1?45TB-~GJV)xz1bwlDm>1w2nV14~Dt%+076 z{q^wf1+)77$$lbB)_;Q77x7S1dR^lsipl8%Z0>aSXn1lmGA-?j8%iZQnAil0T4RMc zUyyX?n$EjO&U;8Nts6ze^icgxSs7g!$ZdH6)|QP3WMcobKutgVe0q6`#bZYR7H=tzr3O*WAFYNm0$=RLPwNB^q8x- zqw2zo92xIEP&-%FcPy?d?52q>kfAA4*~*`C-ofDW4i3V!GDNPe>l%dlnmhn6n#b0qfULF7W zy@N0Uk6k|w3mceqGnGswsz#bZ4Rm-VHcY&xaLL!w23C+PS*8sinKR{~*nh?2j|w}0 zE{i_fz5nUtcb3oIfP`k9nc6>Bo|2*vDL)=M5-^e`jp$*xVWt@?%RIH@MmoyR@4CK+ z^*PuCr6gT<3w}n@(5cTb2vB?iaAgw7y#wpCP%ICH$g*DANV^G*S+J^;Ul268h&9UFG5k%VxsIp`|4;h zELMQ>l5bxMFJW`Z!ES~q45({kAO1lBfGbZO5vbbseC{=}mC!b&vyBca{fYw?8QYhE zwwC~LMCfi^`Ss46R~0A`OAp3GT!DhH{607F6XCt(A-c8o^=khkCtyLU2-yC5m#vpF z{t-VvKO7i?;wvc74q+&LR9aG^`s{&?-*=xt2mbGc8dSh&s8Y60fH;{EY@7%TJ?3b>sC{9^7%aLeWf?jJIG#)21{uGK;cZ9usM5YVL|0I>s<~ZO%MjO-+UF z^;MvHzD`2?bxYl4p@Ezj@V+uf_7lg>2n*^;$5}_8m&L@PZbife?Nh_-;DjFR)~#DG zMJ;!b}V*Q75Whg$kF0ga9gY zAbzpReOaqEXRDjyWzsH)%#@*%!(vT-?Yz7)OQE-(WvJM|CKr7eK~#O~p*~#EjL>7? z)+7M+aJy|je`f7$YVlr-j6=>WCP2aKhw!!HTATX2WN*I1#!L9v(}mKPUnD+oQGKyBhKji(qn|I+CplQ7|+x$}6lkbX6)o4rL z>G@0!z{AU{Byi<^BU_v*4B&@m*%C9~IVt$jTHH{qoJ`pkF(C|VbRXTce}_8!^9>G2 z6$ZOSg?C{O-`xEw*p>4GJaD=R-L~na{&WX7#dL5en|G+GicBqoD19jVdCTK&w~BzH zKi`t|XC7py(3ap#8QE1=hWes&F*UN~(8Je@T~eUyfn~PN&$D0G&W)YJZhA9pvB~)v z;QV)g_0p%9CfT}d&nsQMNJ`S{~ymSmzVmd~Oe}XC~ zvUc90(}>inSB7?LXEBp%%|%~%u46@|)*Tb!VlU6ddX4SC#VN_4B3Ju*_RmnkLj!eX zW8>Dd%PUAcW-@z&hr8oj;)OT;VIZjsu)9s1<-+DbnBs6Y?rJQk_{6yDQNPF^22ooQ zQx=_cJ_-}UvBI|~xAK6$W9))}d{+@D2wf`pVNM1E(~|>80oIO>^_-%W=w}FMGMszZvE~1e5kjoOU@T)m4aA4Q~J;lm^_7 z8NB#{ZfR-h!_H@>oj(3bi;eGfQqQC(VxEXakBsQ`=Z4$b%v>NGnVW^?Bxtm-@1-?P z6e$yXF7Wen)K?#!o$M7&6O~n>F2K$YNub*`MTmm9GqI&r-i^cdHFXly?}1N#x+Ja* znaXPLkvw|-OqTg`=Eh(!DGt!WLh$7+hculYZDID+0zdM0RA-oGHIUm4}@p(_;81_u=n#4m%4m zLJLJ%PU@}^VRBXPFGhDSMs-=uOKQn)PimA^{8w+q_qF*0rq2UeY(vE3JZB`nXuZ2>}&nRoid`{Y!*S4|#}N->%_ zDPc)KW+UdC7j)&17vEo$>CUlS7OQff>1Oh{NDfWyTHb$hB^{dBt-AILAPoW8Nz9Zf z6aTCIe{CjB-V+W-^)IPUw>hWpsckTON92sQ4!YVwWcLSZnA;~p3jwT!nQWimY<_?7 z+45<%RXcOGr0uQFbko5o+9-&I~GhQjeTr z@X~_IEC)ugdRh$Lebx9-(DDbIDi+hcF(mugguvv+`SkH8V`Pro2E=8qDu#xAx41^~ zsTZ^`$+$O4&_`DR`Zvcg6%jEEU`9ASk6;SIZQOzGjWvs|}eHj*h2vI4}$^eqT zE^1-|hHaD?--^x?hlUuJ`@)Ns`79UZd$lwVSIR0;DONLZr&vG z{Jw?G;QpUI(k{E-@8X`4@`$o?34SxSBa!PF+jSudeLY}7{U|PODqsE58w-Xiar(|l zz@ua8gI!41I0HH7>~P{0ZkG7FQc{qR5tLtc#-J=8}TG zY24*2+@*bJX>B^U6N%R_vR~%7anC~5DrwEF-AZ4Q6pF@L2{HDygT5O#C$14&^t^xg z+aUE)d3u<#J$N}$_fmDAWc7sV*g7F_r`g<*glMVP;>~jj@pg{OEgP)b-)BN;7tOP0vY-+>pGuVXhg1(&Q>hQyF0@(4}PLHmy zRem|$Fn4xSiof??KcxmM$2L9i%o}m4 zm>aky>nqb5KoL*(C!5GCUZ!Kv-eUQKDAZWw-Sm}G41pk&$7{v+|FBl(e_J~9KbnyK z`ycK9zfIn1Y2akut#O3)G28PylKkyfm(Q{E-z0Djta6JLy)avmY>GEsFU`RR&+GTF zCO0i9wX$XH3wVL>%if>&`_yM30cqYm9R!)NWZbh_r5$9LJ}!MSAJ`lBnH6bV*5y!*rgn>Jg$!dgqZ~devqyu_`u~#??52V{(fz zm8byUb8aM7k+K+Y`4+K{L3E5k_>yWdY*iZrM~Twki5oajXmg#K9tK*2FbR>ndCBlEzXI3I z%)Sb$Fakxyp^~qT9ccyN6GVUg#hPqvDnzC50nX2f=WCe0>;9?K(}A1`YOR=L9HJaJDpk)Nn}KR8IaJ+XW`TG1@#E$D|i z-Kp+QULT6hp!g3!GbnD6_gIuu0mpxBLDQU}U{J@LzBg;6*0J(5O$ls5#wF7W>W{2AMs;-YFADNo^Idv zxXtY5KfT!I@EkD02Bn##WE7Y5 z^u>RT%nqa8PV)O(i~a`a!E+G4OwFZlQ%?7&uGPdewOs=z(l)DpL(jKW|MIO8o+ zO-xK8u9u_X?c@a@%CC8fn!GPYDfas86iMW-fChhA`xC8=vV;2a_$FC4KFcT^xBh{h zmd~qpQvR)V&6}zJT>VCfWpZPmt04rt>GxjD@m&+oa(Q+H`Xyg_e-5j1H`fHcoA@?W zHG=pT#|qU$FPT@$3I>JGMkrxQIk5W6IZyv$@!~&N?5TKtb!Y)6mI$pda^FvmEp)RX4#zFeuXsgTcZTCHf7U5|!)~y2}uP#RsY}MHv zd%63?H%$;+x@lcMj&x;yaC1%JIu#g4Atxp$8gp`<9wDzqk?__te*q~`<>#o4)L*|P)uYrDi!E%WbQfi6Do zJMMppp-_h^(eLlp^Vnimi|6s6rO4&<{?z)Nn-`zE7=?8?o@?lT1ho$1FeklS&o`KD zpUXF4elD$l3*_9;OWfLwPL+ux7JfF@>gDDV4!oy@He;cH<4NhC?&##h`=QYGhl7)# zPfxwEL+6o_`$+zvM#~DP{xdj+BG@e?(X7P_ zT8Q+Kn3ev(A42iZRRk8E93KB8fqGk_-e`M=kyd%;9ykJueXhX)I=be$x5(`Vb8nRs zo9dbie%bNUogE3S(To|Mo3zUev~4OZCf1DkQaA9&uBrGIb7rKX0zESV0MF%)gBcSO zjJ=#wn81@T5wzr&NT1yP504C7?_((I}a-&a;p@3ZUok1~))i-#&f z#AFr9rx_b!s0i7C7NUHn&!6Qk2~t9@~YotCU^amQjd+LL}|rnpNCCChA4Ztzo^iUr9q&@xIb=4P1OtBiG_P!}cTkBteOdKBaD&#>s^KcG6jzMHsF)Sv z2`7;W@$vDo_56MP;k|T^5MU%%0|ilI5q?x#?ppB;z(+PW<%sLqv<*dVelHAC06Y!S z3jY`p6+K`o5O`uXn!qHk`IY(Q3!N(^riO$br(fSZaekr*-G};2#zz|>-}z2mJ9@3N zr>KVqD2cB`D7)~91izU1_MK0LUC~2Pw-=@u-86fdI&>Au-v#D)OU_e;1H79W_-9b1 ze53fh3X$7uEqJrN%v=IfB4cs-??Fv|xM~Npyt|^nR@OTOVYd@BR9k;UbU?X&^yGRt zJITDH;1Y}CX9qx!FX%AH{t*k14~_T9M?RK==+bofHjl^f!dSQR^=VTkpt0x@kkYWP zcDrSjQ2>1K{?2B&gA(L#D1~N%_IX-G@+Py~K$Sga0CPq0w}DWelzy(au#pm%6BJL5OS&#bTP@)dKOAC2Nsd%l zjRmDz#t}nCb{*?4QylV^BKX_jKoAeD7r6`JpH;OZgTwg zKAQz_uW0Sjl4L8+rOI#=r2w4!lew??7jkT{^{g>e$=4ypV3dkC-V!f5Lmy0- z**DYHm&uRbvantr1?MIsccaPn_xFD>M?Cyj=S^btE0f#H3B~ubdd1!K8X?*0ks0t+ z#chjDZIT@cg-l#jja5S>jdWbUSyRHJ2b8LwdmF(#84O_6$2`lNFS&rEJuBPR-;52J ze^4n^9~3C8v;9SHgT9+XVMJ=zvELH2L^N!x3{#K50XIeU&-y0{(8B#e%W@tex)Qsg zGzHOOZ)gxfo1dNMd~WZFob~mobI=i&c>#Tdk}NDNFB_~_*9(iYsSBsA}}z94^swPng6PTavnT{@k{SFl={0* zVBeXA6Fq>wlZyMrnjLp@POXXa43B3OP3O|KZrW`*w%;EK0>+G5rjSY4a*_S*d1FSWdP``S4IsDUdva zp_}b;`#tKus<#PTq9e8(pC9>>XFNJEX1!}G1IdcSZ};%f63?H1GDLTmp@%zg+qdh> z`RfYK;OVr+=eK8RT6zl1SUC~pmCHqIP zRJot4mphiSl+XVySNu3-|GrlN`)6v7H%v;nlqW?BRFwNGEMC!+F1MD2{e~hrcE>M1 ztFWcp9Q%O%c{10|S+)s#KzeY#3u?SQ*CCcPMpQ7nQKp9rg$YA%a?tXtYye>S!)S*Ck$GiOIP|(k zHFON5PbMOR*-2iT@IED0lT%#pI6qk#ZQVZtEa3dx+xh=Fgrs$ZL$NfH&7LHMorDuq zFQaTV`R_`@@o|>r5vzrYZ(~60*NhrFO*z7D_31DYDBav2Rs?I{28@P}ZB-@xf0IMp z@nm&X3BnVILPYy(9h*KC65C~csiU}hOGnz$>&FucG8KIEuA622WX!aw-?rN*r~X1k z{g2&yRGEU}lj1db8@WIB=f+1uPs>N}Yph}{T-bs4<&@pbm2@{8{D*5rK?<=P!gGQ0 zFPQ-TqZ1%1vsLGul7gGOJNJ~yxB|S-2)dx8M19nL3f`Tt`2OS4In&)w6L?XHc3(+k zmb`I0#FWZ~RTIHw_E>dlA_-?VlnrBl>XKh`i8X;3dYuIN+%qccP+XS3QMAWNhm8|J zENX(~hp>^neQxZ*NWS&K+BgW!&bmnF@NNMk6&q9a6o3n)5`g^MH_yCQYwZD)l(`V* z6tf)~$K;NA)Xc2NLz{#yUXrMjo)2E^uAaxNfBpLP#n<`?qSm$XQkcb9?f2?uS=sf# z{Em;_Y(nj`^jpH2U-u*t8?#;tKA&6%{|9-+zCXIZz6JnG zH{>9-^b6DECj}f*MrmC$E|$L{@@?Wfux8>4_@F@SJ0(}#B+Qe*vZ5Bk4@3w zU3?Pu^yp1N0ixPO;4g>1VNig`LXpi4`vZEv2-Y(I6J92Z6;PJfl4BFG1$yr-F-D{# zgQRZ6i4;Px-v%=(&tn|Y7gtS$-?j*}G zrb71{2G~?Bb>~eXBCI##TXZ|vxK;@ELM!M}C+=JJuZccl8t?&;Y>+}89vw|K14InY zzA?9cqY**rA#P|j3ntuo{0JY*py>7wEAUmmReSKPWTI6=b#(5n6j111_nufd38&6o z$bAl!DarWyF}#V>(%ci(5q!|doFvwJtrG0*P3Cr|bcAXGgwV47EJFn|@=@AgC^v4d zWhdfy&$2YK7=n7zsrY!xFJ{%0Z1<8|Pb58WoNwR#UcWv9^w`npT&I|o@=%*-RokCX zFdn*Md+eu)W8imt8+gprdPb?@3;nS)xc+rPrOh9)N7h6 zwIIz{W?X*Xz_G0}!ZvI89_a2^+VN^8);S#Kcu9KIIsTcaWJ=af`EcGdWg%Pao*N26 z8iMI0AgUwT6k^T{2xwo`*I&7xF4zUVZ1iWUpE;)M{{lk&youG<_er&n5$^;Kd+cM-tNWzrALb^ob?^N1lo?$1pM=B2{_lePz{?-9Om0Ea~h&)C8OqPuqOZ@p?$wOe+HL(Jk-KR3Yj@7IwrzBp@i=S|LB7b3QjU4h^|Aw*u zpqPndS#3Gx-FpAUW&(CBO!B|E3-I6e!Y;)=1A-LS z2S3~(F%f_5ep=7u95lQr-+Z;VfFiqd$VkR5-UA12=R<(_xb0x_&6_v3#aYS1^$6_m za8@~aLv;hRF76b3VuMZqNrKU7N7eY+XT*Sqheyxk%MB^>%2)P)^&p^55gP_U;JJAO zKdmSf8RoAk0=?wIX>$Xr{oh$noYPkRJo?5c%2@ZzhG=ShBzXrPdpQk8zgBDf)Z)tj z>g7tKn#j^<#UKd~mbPU_2sk6s%CHFvBeKc9t3X&JC`3WUpgkg>SYg)#2nbP76p%&E z2nG~G)3Su6B@Ai6u!c;_E<1<~BB7JatI*or=k(0a$&WgxDmgE&-mCk4_ulutDw~I| zjLpNUv*dh1L8bu5CTj58Cm|yeguuP*Vd`X)lw%Z0X^HHYvm%^{W7pk2f&EddSm2{t zF05`D6q3+uO_fTk!Zu639=wOIT+(!eH$4UU4q65eV$JwUlDGV-Y^5iuI;CMtAFdDqz96_`xBYNKeNjfo0nZm!gw!k3-_@scF&mIAz zhwXoHR`rxgk_%mNu)l+zp7zQRjl|0vC`VTo1q=ZSnIF9yeBQ$#gJ0^(ENL>O_andB z!?y+a2JlW2+qFG}42(78Su{Ve7i4XK2e}Pv_XP0VYg>>g=kFt4S#d2lmQCyn>Qq{r7Smi8`urJIoX&^BB}|p@ z5hpII(Mwd^0-o{=ZN9N=oD5K_opX059JrClj5P|nifk^Arnw}(IjYZYq=Koj>>IT_ zt9@8q*1AXz9N$$EQsTN|?egwwZoy7Nk2h_Mi4x^=fRsj2LdRdVPj^VnG6ad7%?+>< zhk-W`KTopsUZ+1dT@^O8bOkv;~`fa)1%)0JAj!l7-`g7BsIyRxWQB6!~&> zQaIX@Ozoo%BDAqaDHwG`ZL6oxKjvC#PcpA>8*KJ}|qXV@wO(1Rz zQTl3h3H%J@av@flVf|*LTn5VYt5v8FC;~ib^X6&SWUHEJ-Bq`GvJ5GC%5hitKUP2@ z42{VaR!KJc@-ikNNjo?}1p>zZ=O$(g<^tB(MEGa0k9&dhVdUOGf5$R_%S0`?{uE)d z8(>f;MIq;;;ByMh)0e)zK-fK?^-hxeNj`Y43BOtW6d$ zS_ffu_HRz5IKudU-7x)MoJ#nAe?4@k{t?!l;O^x`_3-ykEp@&({(h`AG%T!nbhJ>% zeurHgsSR=XL=X$#9B|FJKrD7=rc#{@3VKv0g)iJ{jfU^PoUA|9V6(3J-OZ$Vgi!D`{` zxQO5POMLT?2CEdeo+ohZa(Iq{1zbu{Fp&n zJ7Z-cY#kBCx5K$OsT3**d(233{XuATfC9Fh4=K9Z6c&3O0e=^tMa4h8j+k$8U2ai_ z)f25X!4aWQ=!csJglE8*mMOpt(BO9!7fnH;YQOVWXYkqyHM75@cy?wM4xsZZ`xsbm zT^X#E#h5O*A!$kEOT<^{-Jgb#R<~fA60iXp-e~lc*H?|4Uk2;upDnCQfWY5}uL6?) zM~?4G-wy3!t0_So6R8RKi&5qzU32J4rOY8k{>uZO&H=(@14C@dK~@#FGH z#+^Gm+D=ykr%#zidR~cZowQA*G&bhLS2@o~-yZ_)Z5&#=-cyXqJa4AcYvMorwU||? zrXGfwEHL!4{z8DI^!q@2Z)4^wYXT*?K6hvR_HdmrAgylME->(2#Ld+xhT!hk%yjc)Q;SaWo9SuZF3(=5oW!W(Y?nfXm%Waid65id9bcw-{zb08EY81^L1a+c$ z-x6MM8f%`p(JPIYs8p);5gE%m=t*%g8i^hDY^}`e`QIzp^%9-Ymd;@PgJaC}f#dND zsemijNC*8Aj^3*PFdy>DeiI08CiO8FQ;tjVda%;oYxn*%(2^Lq}o}t)g)fYKH!QZSt4y1UM_>*48?(yB&$1{I;`vMY70Qc3$oRLp5 z#1IfZjG#4FJMs~FUydn5M2UZpGG!dD{&qP5S#U_hFj4PrJ-nvT2l{^cFwzxK36LK2 vb6Zy{`GA;{Tw9Pd&KrUttmr*)qe9HiZr{A%2g91+8suo}cJ!HbQ2c)Y)fvem From 48282f6485c2806a1f7c6a2af8844c1330454690 Mon Sep 17 00:00:00 2001 From: duncathan Date: Tue, 30 Jun 2015 17:13:31 -0600 Subject: [PATCH 22/52] 2nd pass OOP everything's broken right now, but hey, whatever --- code/ATMOSPHERICS/atmospherics.dm | 4 +- .../binary_devices/binary_atmos_base.dm | 182 +++++---------- .../components/components_base.dm | 185 ++++++++++++++- .../trinary_devices/trinary_base.dm | 216 ++++++------------ .../components/unary_devices/unary_base.dm | 124 +++++----- 5 files changed, 363 insertions(+), 348 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 49fb54d5094..74e24aafcd8 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -256,6 +256,4 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/can_crawl_through() - return 1 - - + return 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index c964de9a2c3..edd6dbc1beb 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -3,6 +3,7 @@ dir = SOUTH initialize_directions = SOUTH|NORTH use_power = 1 + nodes = 2 var/datum/gas_mixture/air1 var/datum/gas_mixture/air2 @@ -14,13 +15,8 @@ var/datum/pipeline/parent2 /obj/machinery/atmospherics/components/binary/New() - ..() - - air1 = new - air2 = new - - air1.volume = 200 - air2.volume = 200 + var/airs[] = ..() + set_airs(airs) /obj/machinery/atmospherics/components/binary/SetInitDirections() switch(dir) @@ -32,147 +28,95 @@ initialize_directions = EAST|WEST if(WEST) initialize_directions = EAST|WEST - -/obj/machinery/atmospherics/components/binary/update_icon() - nodes = list(node1, node2) - ..() -/* /obj/machinery/atmospherics/components/binary/update_icon() - update_icon_nopipes() - - underlays.Cut() - if(!showpipe) - return - var/connected = 0 - - //Add intact pieces - if(node1) - connected = icon_addintact(node1, connected) - - if(node2) - connected = icon_addintact(node2, connected) - - //Add broken pieces - icon_addbroken(connected) */ - +/* +Iconnery +*/ /obj/machinery/atmospherics/components/binary/hide(var/intact) showpipe = !intact update_icon() ..(intact) +/* +Helpers +*/ -// Housekeeping and pipe network stuff below -/obj/machinery/atmospherics/components/binary/Destroy() - if(node1) - node1.disconnect(src) - node1 = null - nullifyPipenet(parent1) - if(node2) - node2.disconnect(src) - node2 = null - nullifyPipenet(parent2) - ..() +/obj/machinery/atmospherics/components/trinary/get_airs() + return list(air1, air2) + +/obj/machinery/atmospherics/components/trinary/get_nodes() + return list(node1, node2) + +/obj/machinery/atmospherics/components/trinary/get_parents() + return list(parent1, parent2) + +/obj/machinery/atmospherics/components/trinary/set_airs(var/list/L) + var/datum/gas_mixture/a1 = L[1] + var/datum/gas_mixture/a2 = L[2] + + air1 = a1 + air2 = a2 + +/obj/machinery/atmospherics/components/trinary/set_nodes(var/list/L) + var/obj/machinery/atmospherics/n1 = L[1] + var/obj/machinery/atmospherics/n2 = L[2] + + node1 = n1 + node2 = n2 + +/obj/machinery/atmospherics/components/trinary/set_parents(var/list/L) + var/datum/pipeline/p1 = L[1] + var/datum/pipeline/p2 = L[2] + + parent1 = p1 + parent2 = p2 + +/* +Housekeeping and pipe network stuff +*/ /obj/machinery/atmospherics/components/binary/atmosinit() var/node2_connect = dir var/node1_connect = turn(dir, 180) + //var/node_connects[] = list(node1_connect, node2_connect) for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect)) if(target.initialize_directions & get_dir(target,src)) - node1 = target + nodes[node1] = target break - for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect)) if(target.initialize_directions & get_dir(target,src)) - node2 = target + nodes[node2] = target break - - if(level == 2) - showpipe = 1 - - update_icon() - ..() + ..(/*node_connects*/) /obj/machinery/atmospherics/components/binary/construction() - ..() - parent1.update = 1 - parent2.update = 1 + var/parents[] = ..() + set_parents(parents) /obj/machinery/atmospherics/components/binary/build_network() - if(!parent1) - parent1 = new /datum/pipeline() - parent1.build_pipeline(src) - - if(!parent2) - parent2 = new /datum/pipeline() - parent2.build_pipeline(src) + var/parents[] = ..() + set_parents(parents) /obj/machinery/atmospherics/components/binary/disconnect(obj/machinery/atmospherics/reference) - if(reference == node1) - if(istype(node1, /obj/machinery/atmospherics/pipe)) - qdel(parent1) - node1 = null - else if(reference == node2) - if(istype(node2, /obj/machinery/atmospherics/pipe)) - qdel(parent2) - node2 = null - update_icon() + var/parents[] = ..(reference) + set_parents(parents) /obj/machinery/atmospherics/components/binary/nullifyPipenet(datum/pipeline/P) - ..() - if(P == parent1) - parent1.other_airs -= air1 - parent1 = null - else if(P == parent2) - parent2.other_airs -= air2 - parent2 = null - -/obj/machinery/atmospherics/components/binary/returnPipenetAir(datum/pipeline/P) - if(P == parent1) - return air1 - else if(P == parent2) - return air2 - -/obj/machinery/atmospherics/components/binary/pipeline_expansion(datum/pipeline/P) - if(P) - if(parent1 == P) - return list(node1) - else if(parent2 == P) - return list(node2) - else - return list(node1, node2) + var/parents[] = ..(P) + set_parents(parents) /obj/machinery/atmospherics/components/binary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) - if(A == node1) - parent1 = P - else if(A == node2) - parent2 = P - -/obj/machinery/atmospherics/components/binary/returnPipenet(obj/machinery/atmospherics/A) - if(A == node1) - return parent1 - else if(A == node2) - return parent2 + var/parents[] = ..(P, A) + set_parents(parents) /obj/machinery/atmospherics/components/binary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) - if(Old == parent1) - parent1 = New - else if(Old == parent2) - parent2 = New + var/parents[] = ..(Old, New) + set_parents(parents) +/obj/machinery/atmospherics/components/binary/unsafe_pressure_release(var/mob/user, var/pressures) + var/airs[] = ..(user, pressures) + set_airs(airs) -/obj/machinery/atmospherics/components/binary/unsafe_pressure_release(var/mob/user,var/pressures) - ..() - - var/turf/T = get_turf(src) - if(T) - //Remove the gas from air1+air2 and assume it - var/datum/gas_mixture/environment = T.return_air() - var/lost = pressures*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION) - lost += pressures*environment.volume/(air2.temperature * R_IDEAL_GAS_EQUATION) - var/shared_loss = lost/2 - - var/datum/gas_mixture/to_release = air1.remove(shared_loss) - to_release.merge(air2.remove(shared_loss)) - T.assume_air(to_release) - air_update_turf(1) \ No newline at end of file +//This sure looks like a lot of copypaste... It's already WAY better though, so it works for now +//TODO: make it even more OOP - duncathan \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm index abe14cb61d2..c9159a0b164 100644 --- a/code/ATMOSPHERICS/components/components_base.dm +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -2,11 +2,20 @@ So much of atmospherics.dm was used solely by components, so separating this makes things all a lot cleaner. On top of that, now people can add component-speciic procs/vars if they want! */ +/obj/machinery/atmospherics/components/ + var/welded = 0 //Used on pumps and scrubbers + var/showpipe = 0 + var/nodes = 0 -var/welded = 0 //Used on pumps and scrubbers -var/showpipe = 0 -var/nodes = list() +/obj/machinery/atmospherics/components/New(var/new_airs[] = get_airs()) //doesn't work properly + ..() + for(var/A in new_airs) + var/datum/gas_mixture/air = A + air = new + air.volume = 200 + new_airs[A] = air + return new_airs /* Iconnery */ @@ -26,7 +35,7 @@ Iconnery /obj/machinery/atmospherics/components/proc/update_icon_nopipes() return -/obj/machinery/atmospherics/components/update_icon(var/update_nodes[] = nodes) +/obj/machinery/atmospherics/components/update_icon(var/update_nodes[] = nodes) //works update_icon_nopipes() underlays.Cut() @@ -35,13 +44,160 @@ Iconnery var/connected = 0 - for(var/N in nodes) //adds intact pieces + for(var/N in update_nodes) //adds intact pieces var/obj/machinery/atmospherics/node = N if(node) connected = icon_addintact(node, connected) icon_addbroken(connected) //adds broken pieces +/* +Pipenet stuff; housekeeping +*/ +/obj/machinery/atmospherics/components/Destroy(var/dest_nodes[] = get_nodes(), var/dest_parents[] = get_parents()) //works somewhat + for(var/N in dest_nodes) + var/obj/machinery/atmospherics/node = N + var/datum/pipeline/parent = dest_parents[N] + + if(node) + node.disconnect(src) + node = null + nullifyPipenet(parent) + dest_nodes[N] = node + dest_parents[N] = parent + ..() + return list(nodes = dest_nodes, parents = dest_parents) + +/obj/machinery/atmospherics/components/atmosinit(var/node_connects[], var/init_nodes[] = get_nodes()) //doesn't work for another reason + /*for(var/N in nodes) + var/obj/machinery/atmospherics/node = N + var/dir/node_connect = node_connects[N] + + for(var/obj/machinery/atmospherics/target in get_step(src,node_connect)) + if(target.initialize_directions & get_dir(target,src)) + node = target + break*/ + if(level == 2) + showpipe = 1 + update_icon() + return + +/obj/machinery/atmospherics/components/construction(var/constr_parents[] = get_parents()) //doesn't work + ..() + for(var/P in constr_parents) + var/datum/pipeline/parent = P + parent.update = 1 + constr_parents[P] = parent + return constr_parents + +/obj/machinery/atmospherics/components/build_network(var/build_parents[] = get_parents()) //doesn't work + for(var/P in build_parents) + var/datum/pipeline/parent = P + + if(parent) + return + parent = new /datum/pipeline() + parent.build_pipeline(src) + build_parents[P] = parent + return build_parents + +/obj/machinery/atmospherics/components/disconnect(obj/machinery/atmospherics/reference, var/disc_nodes[] = get_nodes(), var/disc_parents[] = get_parents()) //works + for(var/N in disc_nodes) + var/obj/machinery/atmospherics/node = N + var/datum/pipeline/parent = disc_parents[N] + + if(reference == node) + if(istype(node, /obj/machinery/atmospherics/pipe)) + qdel(parent) + parent = null + disc_parents[N] = parent + update_icon() + return disc_parents + +/obj/machinery/atmospherics/components/nullifyPipenet(datum/pipeline/pipeline, var/null_parents[] = get_parents(), var/null_airs[] = get_airs()) //untestable + ..() + for(var/P in null_parents) + var/datum/pipeline/parent = P + var/datum/gas_mixture/air = null_airs[P] + + if(pipeline == parent) + parent.other_airs -= air + parent = null + null_parents[P] = parent + return null_parents + +/obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/pipeline, var/return_parents[] = get_parents(), var/return_airs[] = get_airs()) //untestable; should work + for(var/P in return_parents) + var/datum/pipeline/parent = P + var/datum/gas_mixture/air = return_airs[P] + + if(pipeline == parent) + return air + +/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/pipeline, var/expand_parents[] = get_parents(), var/expand_nodes[] = get_nodes()) //TODO: dong + if(!pipeline) + return expand_nodes //works + for(var/N in expand_nodes) + var/obj/machinery/atmospherics/node = N + var/datum/pipeline/parent = expand_parents[N] + + if(parent == pipeline) + return list(node) //untestable; should work + +/obj/machinery/atmospherics/components/setPipenet(datum/pipeline/pipeline, obj/machinery/atmospherics/A, var/set_parents[] = get_parents(), var/set_nodes[] = get_nodes()) + for(var/N in set_nodes) + var/obj/machinery/atmospherics/node = N + var/datum/pipeline/parent = set_parents[N] + + if(A == node) + parent = pipeline + set_parents[N] = parent + return set_parents + +/obj/machinery/atmospherics/components/returnPipenet(obj/machinery/atmospherics/A, var/return_parents[] = get_parents(), var/return_nodes = get_nodes()) + for(var/N in return_nodes) + var/obj/machinery/atmospherics/node = N + var/datum/pipeline/parent = return_parents[N] + + if(A == node) + return parent //probably works + +/obj/machinery/atmospherics/components/replacePipenet(datum/pipeline/Old, datum/pipeline/New, var/replace_parents[] = get_parents()) + for(var/P in replace_parents) + var/datum/pipeline/parent = P + + if(Old == parent) + parent = New + replace_parents[P] = parent + return replace_parents + +/obj/machinery/atmospherics/components/unsafe_pressure_release(var/mob/user, var/pressures, var/unsafe_airs[] = get_airs()) //untestable; I'll fix this last + ..() + + var/turf/T = get_turf(src) + if(T) + //Remove the gas from airs and assume it + var/datum/gas_mixture/environment = T.return_air() + var/lost = null + var/times_lost = 0 + for(var/A in unsafe_airs) + var/datum/gas_mixture/air = A + lost += pressures*environment.volume/(air.temperature * R_IDEAL_GAS_EQUATION) + times_lost++ + var/shared_loss = lost/times_lost + + var/datum/gas_mixture/to_release + for(var/A in unsafe_airs) + var/datum/gas_mixture/air = A + if(!to_release) + to_release = air.remove(shared_loss) + continue + to_release.merge(air.remove(shared_loss)) + unsafe_airs[A] = air + T.assume_air(to_release) + air_update_turf(1) + return unsafe_airs + /* I think this is NanoUI? */ @@ -50,4 +206,21 @@ I think this is NanoUI? var/new_value = input(usr,text,title,default_set) as num if(usr.canUseTopic(src)) return new_value - return default_set \ No newline at end of file + return default_set + +/* +Helpers +*/ +/obj/machinery/atmospherics/components/proc/get_airs() + return +/obj/machinery/atmospherics/components/proc/get_nodes() + return +/obj/machinery/atmospherics/components/proc/get_parents() + return + +/obj/machinery/atmospherics/components/proc/set_airs() + return +/obj/machinery/atmospherics/components/proc/set_nodes() + return +/obj/machinery/atmospherics/components/proc/set_parents() + return \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 3961aaf50ba..3c79a14c512 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -3,10 +3,7 @@ dir = SOUTH initialize_directions = SOUTH|NORTH|WEST use_power = 1 - - var/datum/gas_mixture/air1 - var/datum/gas_mixture/air2 - var/datum/gas_mixture/air3 + nodes = 3 var/obj/machinery/atmospherics/node1 var/obj/machinery/atmospherics/node2 @@ -16,18 +13,15 @@ var/datum/pipeline/parent2 var/datum/pipeline/parent3 + var/datum/gas_mixture/air1 + var/datum/gas_mixture/air2 + var/datum/gas_mixture/air3 + var/flipped = 0 /obj/machinery/atmospherics/components/trinary/New() - ..() - - air1 = new - air2 = new - air3 = new - - air1.volume = 200 - air2.volume = 200 - air3.volume = 200 + var/airs[] = ..() + set_airs(airs) /obj/machinery/atmospherics/components/trinary/SetInitDirections() switch(dir) @@ -39,49 +33,56 @@ initialize_directions = EAST|WEST|SOUTH if(WEST) initialize_directions = WEST|NORTH|EAST + /* -Iconnery +Helpers //these all look kinda copypaste-y, but I'm not entirely certain how to get around that -duncathan */ -/obj/machinery/atmospherics/components/trinary/update_icon() - nodes = list(node1, node2, node3) - ..() -/* /obj/machinery/atmospherics/components/trinary/update_icon() - update_icon_nopipes() +/obj/machinery/atmospherics/components/trinary/get_airs() + return list(air1, air2, air3) - var/connected = 0 - underlays.Cut() +/obj/machinery/atmospherics/components/trinary/get_nodes() + return list(node1, node2, node3) - //Add non-broken pieces - if(node1) - connected = icon_addintact(node1, connected) +/obj/machinery/atmospherics/components/trinary/get_parents() + return list(parent1, parent2, parent3) - if(node2) - connected = icon_addintact(node2, connected) +/obj/machinery/atmospherics/components/trinary/set_airs(var/list/L) + var/datum/gas_mixture/a1 = L[1] + var/datum/gas_mixture/a2 = L[2] + var/datum/gas_mixture/a3 = L[3] - if(node3) - connected = icon_addintact(node3, connected) + air1 = a1 + air2 = a2 + air3 = a3 - //Add broken pieces - icon_addbroken(connected) */ +/obj/machinery/atmospherics/components/trinary/set_nodes(var/list/L) + var/obj/machinery/atmospherics/n1 = L[1] + var/obj/machinery/atmospherics/n2 = L[2] + var/obj/machinery/atmospherics/n3 = L[3] + + node1 = n1 + node2 = n2 + node3 = n3 + +/obj/machinery/atmospherics/components/trinary/set_parents(var/list/L) + var/datum/pipeline/p1 = L[1] + var/datum/pipeline/p2 = L[2] + var/datum/pipeline/p3 = L[3] + + parent1 = p1 + parent2 = p2 + parent3 = p3 /* -Housekeeping and pipe network stuff below +Housekeeping and pipe network stuff +//WOW this got cut down thank you based OOP - duncathan */ /obj/machinery/atmospherics/components/trinary/Destroy() - if(node1) - node1.disconnect(src) - node1 = null - nullifyPipenet(parent1) - if(node2) - node2.disconnect(src) - node2 = null - nullifyPipenet(parent2) - if(node3) - node3.disconnect(src) - node3 = null - nullifyPipenet(parent3) - ..() + var/returns[] = ..() + + set_nodes(returns[1]) + set_parents(returns[2]) /obj/machinery/atmospherics/components/trinary/atmosinit() @@ -104,130 +105,49 @@ Housekeeping and pipe network stuff below node1_connect = turn(node1_connect, 180) node3_connect = turn(node3_connect, 180) + //var/node_connects[] = list(nodes[node1]_connect, nodes[node2]_connect, nodes[node3]_connect) + for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect)) if(target.initialize_directions & get_dir(target,src)) - node1 = target + nodes[node1] = target break - for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect)) if(target.initialize_directions & get_dir(target,src)) - node2 = target + nodes[node2] = target break - for(var/obj/machinery/atmospherics/target in get_step(src,node3_connect)) if(target.initialize_directions & get_dir(target,src)) - node3 = target + nodes[node3] = target break - - if(level == 2) - showpipe = 1 - - update_icon() - ..() + ..(/*node_connects*/) /obj/machinery/atmospherics/components/trinary/construction() - ..() - parent1.update = 1 - parent2.update = 1 - parent3.update = 1 + var/parents[] = ..() + set_parents(parents) /obj/machinery/atmospherics/components/trinary/build_network() - if(!parent1) - parent1 = new /datum/pipeline() - parent1.build_pipeline(src) - - if(!parent2) - parent2 = new /datum/pipeline() - parent2.build_pipeline(src) - - if(!parent3) - parent3 = new /datum/pipeline() - parent3.build_pipeline(src) + var/parents[] = ..() + set_parents(parents) /obj/machinery/atmospherics/components/trinary/disconnect(obj/machinery/atmospherics/reference) - if(reference == node1) - if(istype(node1, /obj/machinery/atmospherics/pipe)) - qdel(parent1) - node1 = null - else if(reference == node2) - if(istype(node2, /obj/machinery/atmospherics/pipe)) - qdel(parent2) - node2 = null - else if(reference == node3) - if(istype(node3, /obj/machinery/atmospherics/pipe)) - qdel(parent3) - node3 = null - update_icon() + var/parents[] = ..(reference) + set_parents(parents) /obj/machinery/atmospherics/components/trinary/nullifyPipenet(datum/pipeline/P) - ..() - if(P == parent1) - parent1.other_airs -= air1 - parent1 = null - else if(P == parent2) - parent2.other_airs -= air2 - parent2 = null - else if(P == parent3) - parent3.other_airs -= air3 - parent3 = null - -/obj/machinery/atmospherics/components/trinary/returnPipenetAir(datum/pipeline/P) - if(P == parent1) - return air1 - else if(P == parent2) - return air2 - else if(P == parent3) - return air3 - -/obj/machinery/atmospherics/components/trinary/pipeline_expansion(datum/pipeline/P) - if(P) - if(parent1 == P) - return list(node1) - else if(parent2 == P) - return list(node2) - else if(parent3 == P) - return list(node3) - return list(node1, node2, node3) + var/parents[] = ..(P) + set_parents(parents) /obj/machinery/atmospherics/components/trinary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) - if(A == node1) - parent1 = P - else if(A == node2) - parent2 = P - else if(A == node3) - parent3 = P - -/obj/machinery/atmospherics/components/trinary/returnPipenet(obj/machinery/atmospherics/A) - if(A == node1) - return parent1 - else if(A == node2) - return parent2 - else if(A == node3) - return parent3 + var/parents[] = ..(P, A) + set_parents(parents) /obj/machinery/atmospherics/components/trinary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) - if(Old == parent1) - parent1 = New - else if(Old == parent2) - parent2 = New - else if(Old == parent3) - parent3 = New + var/parents[] = ..(Old, New) + set_parents(parents) +/obj/machinery/atmospherics/components/trinary/unsafe_pressure_release(var/mob/user, var/pressures) + var/airs[] = ..(user, pressures) + set_airs(airs) -/obj/machinery/atmospherics/components/trinary/unsafe_pressure_release(var/mob/user,var/pressures) - ..() - - var/turf/T = get_turf(src) - if(T) - //Remove the gas from air1+air2+air3 and assume it - var/datum/gas_mixture/environment = T.return_air() - var/lost = pressures*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION) - lost += pressures*environment.volume/(air2.temperature * R_IDEAL_GAS_EQUATION) - lost += pressures*environment.volume/(air3.temperature * R_IDEAL_GAS_EQUATION) - var/shared_loss = lost/3 - - var/datum/gas_mixture/to_release = air1.remove(shared_loss) - to_release.merge(air2.remove(shared_loss)) - to_release.merge(air3.remove(shared_loss)) - T.assume_air(to_release) - air_update_turf(1) +//This sure looks like a lot of copypaste... It's already way better though, so it works for now +//TODO: make it even more OOP - duncathan \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index fe21b9109ba..c50052ab82c 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -3,14 +3,14 @@ dir = SOUTH initialize_directions = SOUTH layer = TURF_LAYER+0.1 + nodes = 1 + var/datum/gas_mixture/air_contents var/obj/machinery/atmospherics/node /obj/machinery/atmospherics/components/unary/New() - ..() - air_contents = new - air_contents.volume = 200 - + var/airs[] = ..() + set_airs(airs) /obj/machinery/atmospherics/components/unary/SetInitDirections() initialize_directions = dir @@ -18,52 +18,47 @@ Iconnery */ -/obj/machinery/atmospherics/components/unary/update_icon() - nodes = list(node) - ..() -/* /obj/machinery/atmospherics/components/unary/update_icon() - update_icon_nopipes() - - underlays.Cut() - - if(!showpipe) - return //no need to continue if we're not showing pipes - if(node) - icon_addintact(node) - return - icon_addbroken() */ - /obj/machinery/atmospherics/components/unary/hide(var/intact) showpipe = !intact update_icon() ..(intact) +/* +Helpers +*/ + +/obj/machinery/atmospherics/components/unary/get_airs() + return list(air_contents) + +/obj/machinery/atmospherics/components/unary/get_nodes() + return list(node) + +/obj/machinery/atmospherics/components/unary/get_parents() + return list(parent) + +/obj/machinery/atmospherics/components/unary/set_airs(var/list/L) + var/datum/gas_mixture/a1 = L[1] + air_contents = a1 + +/obj/machinery/atmospherics/components/unary/set_nodes(var/list/L) + var/obj/machinery/atmospherics/n1 = L[1] + node = n1 + +/obj/machinery/atmospherics/components/unary/set_parents(var/list/L) + var/datum/pipeline/p1 = L[1] + parent = p1 /* Housekeeping and pipe network stuff below */ -/obj/machinery/atmospherics/components/unary/Destroy() - if(node) - node.disconnect(src) - node = null - nullifyPipenet(parent) - ..() - - /obj/machinery/atmospherics/components/unary/atmosinit() - for(var/obj/machinery/atmospherics/target in get_step(src, dir)) + //var/node_connects = list(dir) + for(var/obj/machinery/atmospherics/target in get_step(src,dir)) if(target.initialize_directions & get_dir(target,src)) node = target break - if(level == 2) - showpipe = 1 - update_icon() - ..() - -/obj/machinery/atmospherics/components/unary/construction() - ..() - parent.update = 1 + ..(/*node_connects*/) /obj/machinery/atmospherics/components/unary/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W) if(..()) @@ -81,48 +76,33 @@ Housekeeping and pipe network stuff below build_network() . = 1 +/obj/machinery/atmospherics/components/unary/construction() + var/parents[] = ..() + set_parents(parents) + /obj/machinery/atmospherics/components/unary/build_network() - if(!parent) - parent = new /datum/pipeline() - parent.build_pipeline(src) + var/parents[] = ..() + set_parents(parents) /obj/machinery/atmospherics/components/unary/disconnect(obj/machinery/atmospherics/reference) - if(reference == node) - if(istype(node, /obj/machinery/atmospherics/pipe)) - qdel(parent) - node = null - update_icon() + var/parents[] = ..(reference) + set_parents(parents) -/obj/machinery/atmospherics/components/unary/nullifyPipenet() - ..() - parent.other_airs -= air_contents - parent = null +/obj/machinery/atmospherics/components/unary/nullifyPipenet(datum/pipeline/P) + var/parents[] = ..(P) + set_parents(parents) -/obj/machinery/atmospherics/components/unary/returnPipenetAir() - return air_contents - -/obj/machinery/atmospherics/components/unary/pipeline_expansion() - return list(node) - -/obj/machinery/atmospherics/components/unary/setPipenet(datum/pipeline/P) - parent = P +/obj/machinery/atmospherics/components/unary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) + var/parents[] = ..(P, A) + set_parents(parents) /obj/machinery/atmospherics/components/unary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) - if(Old == parent) - parent = New - - -/obj/machinery/atmospherics/components/unary/unsafe_pressure_release(var/mob/user,var/pressures) - ..() - - var/turf/T = get_turf(src) - if(T) - //Remove the gas from air_contents and assume it - var/datum/gas_mixture/environment = T.return_air() - var/lost = pressures*environment.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION) - - var/datum/gas_mixture/to_release = air_contents.remove(lost) - T.assume_air(to_release) - air_update_turf(1) + var/parents[] = ..(Old, New) + set_parents(parents) +/obj/machinery/atmospherics/components/unary/unsafe_pressure_release(var/mob/user, var/pressures) + var/airs[] = ..(user, pressures) + set_airs(airs) +//This sure looks like a lot of copypaste... It's already way better though, so it works for now +//TODO: make it even more OOP - duncathan \ No newline at end of file From 140bbd3972476bbb2db84e1fc22e9a18390b7b83 Mon Sep 17 00:00:00 2001 From: duncathan Date: Wed, 1 Jul 2015 16:14:17 -0600 Subject: [PATCH 23/52] 3rd pass OOP now we've got lists for parents, nodes, and air mixtures (they're all broken) moves tank.dm, cryo.dm, Freezer.dm to components/unary_devices/ --- .../binary_devices/binary_atmos_base.dm | 89 ++---------- .../components/binary_devices/circulator.dm | 6 +- .../components/binary_devices/dp_vent_pump.dm | 14 +- .../components/binary_devices/passive_gate.dm | 8 +- .../components/binary_devices/pump.dm | 9 +- .../components/binary_devices/valve.dm | 6 +- .../components/binary_devices/volume_pump.dm | 9 +- .../components/components_base.dm | 133 +++++++++--------- .../components/trinary_devices/filter.dm | 13 +- .../components/trinary_devices/mixer.dm | 19 ++- .../trinary_devices/trinary_base.dm | 100 ++----------- .../components/unary_devices}/Freezer.dm | 3 + .../components/unary_devices/cold_sink.dm | 8 +- .../components/unary_devices}/cryo.dm | 19 ++- .../unary_devices/generator_input.dm | 4 +- .../unary_devices/heat_exchanger.dm | 23 +-- .../components/unary_devices/heat_source.dm | 8 +- .../unary_devices/outlet_injector.dm | 13 +- .../unary_devices/oxygen_generator.dm | 11 +- .../unary_devices/portables_connector.dm | 27 +--- .../unary_devices}/tank.dm | 52 +++---- .../components/unary_devices/unary_base.dm | 101 ++++--------- .../components/unary_devices/vent_pump.dm | 13 +- .../components/unary_devices/vent_scrubber.dm | 11 +- code/ATMOSPHERICS/datum_pipeline.dm | 4 +- code/modules/mob/living/living.dm | 5 +- code/modules/power/generator.dm | 20 ++- tgstation.dme | 6 +- 28 files changed, 294 insertions(+), 440 deletions(-) rename code/{game/machinery => ATMOSPHERICS/components/unary_devices}/Freezer.dm (96%) rename code/{game/machinery => ATMOSPHERICS/components/unary_devices}/cryo.dm (93%) rename code/ATMOSPHERICS/{pipes => components/unary_devices}/tank.dm (58%) diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index edd6dbc1beb..16cebb0ac1a 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -3,20 +3,7 @@ dir = SOUTH initialize_directions = SOUTH|NORTH use_power = 1 - nodes = 2 - - var/datum/gas_mixture/air1 - var/datum/gas_mixture/air2 - - var/obj/machinery/atmospherics/node1 - var/obj/machinery/atmospherics/node2 - - var/datum/pipeline/parent1 - var/datum/pipeline/parent2 - -/obj/machinery/atmospherics/components/binary/New() - var/airs[] = ..() - set_airs(airs) + node_amount = 2 /obj/machinery/atmospherics/components/binary/SetInitDirections() switch(dir) @@ -40,35 +27,8 @@ Iconnery Helpers */ -/obj/machinery/atmospherics/components/trinary/get_airs() - return list(air1, air2) - -/obj/machinery/atmospherics/components/trinary/get_nodes() - return list(node1, node2) - -/obj/machinery/atmospherics/components/trinary/get_parents() - return list(parent1, parent2) - -/obj/machinery/atmospherics/components/trinary/set_airs(var/list/L) - var/datum/gas_mixture/a1 = L[1] - var/datum/gas_mixture/a2 = L[2] - - air1 = a1 - air2 = a2 - -/obj/machinery/atmospherics/components/trinary/set_nodes(var/list/L) - var/obj/machinery/atmospherics/n1 = L[1] - var/obj/machinery/atmospherics/n2 = L[2] - - node1 = n1 - node2 = n2 - -/obj/machinery/atmospherics/components/trinary/set_parents(var/list/L) - var/datum/pipeline/p1 = L[1] - var/datum/pipeline/p2 = L[2] - - parent1 = p1 - parent2 = p2 +/obj/machinery/atmospherics/components/trinary/update_airs(var/a1, var/a2) + ..(list(1 = a1, 2 = a2)) /* Housekeeping and pipe network stuff @@ -79,44 +39,13 @@ Housekeeping and pipe network stuff var/node2_connect = dir var/node1_connect = turn(dir, 180) - //var/node_connects[] = list(node1_connect, node2_connect) - for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect)) + var/node_connects[] = list(1 = node1_connect, 2 = node2_connect) + /* for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect)) if(target.initialize_directions & get_dir(target,src)) - nodes[node1] = target + nodes[1] = target break for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect)) if(target.initialize_directions & get_dir(target,src)) - nodes[node2] = target - break - ..(/*node_connects*/) - -/obj/machinery/atmospherics/components/binary/construction() - var/parents[] = ..() - set_parents(parents) - -/obj/machinery/atmospherics/components/binary/build_network() - var/parents[] = ..() - set_parents(parents) - -/obj/machinery/atmospherics/components/binary/disconnect(obj/machinery/atmospherics/reference) - var/parents[] = ..(reference) - set_parents(parents) - -/obj/machinery/atmospherics/components/binary/nullifyPipenet(datum/pipeline/P) - var/parents[] = ..(P) - set_parents(parents) - -/obj/machinery/atmospherics/components/binary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) - var/parents[] = ..(P, A) - set_parents(parents) - -/obj/machinery/atmospherics/components/binary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) - var/parents[] = ..(Old, New) - set_parents(parents) - -/obj/machinery/atmospherics/components/binary/unsafe_pressure_release(var/mob/user, var/pressures) - var/airs[] = ..(user, pressures) - set_airs(airs) - -//This sure looks like a lot of copypaste... It's already WAY better though, so it works for now -//TODO: make it even more OOP - duncathan \ No newline at end of file + nodes[2] = target + break */ + ..(node_connects) \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index e35bd758f6d..1a19a8f3d1a 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -18,6 +18,8 @@ /obj/machinery/atmospherics/binary/circulator/proc/return_transfer_air() + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] var/output_starting_pressure = air1.return_pressure() var/input_starting_pressure = air2.return_pressure() @@ -40,9 +42,9 @@ //Actually transfer the gas var/datum/gas_mixture/removed = air2.remove(transfer_moles) - parent1.update = 1 + update_airs(air1, air2) - parent2.update = 1 + update_parents() return removed diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 703edd0df9d..296e02b20d3 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -42,9 +42,9 @@ Acts like a normal vent, but has an input AND output. /obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/New() ..() - - air1.volume = 1000 - air2.volume = 1000 + var/datum/gas_mixture/air1 = airs[1] ; air1.volume = 1000 + var/datum/gas_mixture/air2 = airs[2] ; air2.volume = 1000 + update_airs(air1, air2) /obj/machinery/atmospherics/binary/dp_vent_pump/update_icon_nopipes() overlays.Cut() @@ -65,6 +65,8 @@ Acts like a normal vent, but has an input AND output. if(!on) return 0 + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] var/datum/gas_mixture/environment = loc.return_air() var/environment_pressure = environment.return_pressure() @@ -86,7 +88,7 @@ Acts like a normal vent, but has an input AND output. loc.assume_air(removed) air_update_turf() - parent1.update = 1 + update_parents(list(1 = parents[1])) //this looks disgusting, but it works else //external -> output var/pressure_delta = 10000 @@ -105,7 +107,9 @@ Acts like a normal vent, but has an input AND output. air2.merge(removed) air_update_turf() - parent2.update = 1 + update_parents(list(2 = parents[2])) + + update_airs(air1, air2) return 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 3ac13f56b51..130f0bf2e44 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -40,6 +40,9 @@ Passive gate is similar to the regular pump except: if(!on) return 0 + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] + var/output_starting_pressure = air2.return_pressure() var/input_starting_pressure = air1.return_pressure() @@ -59,9 +62,8 @@ Passive gate is similar to the regular pump except: var/datum/gas_mixture/removed = air1.remove(transfer_moles) air2.merge(removed) - parent1.update = 1 - - parent2.update = 1 + update_airs(air1, air2) + update_parents() //Radio remote control diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 8f25e7d242b..36bc3e5242d 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -48,6 +48,9 @@ Thus, the two variables affect pump operation are set in New(): if(!on) return 0 + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] + var/output_starting_pressure = air2.return_pressure() if( (target_pressure - output_starting_pressure) < 0.01) @@ -63,10 +66,8 @@ Thus, the two variables affect pump operation are set in New(): var/datum/gas_mixture/removed = air1.remove(transfer_moles) air2.merge(removed) - parent1.update = 1 - - - parent2.update = 1 + update_airs(air1, air2) + update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index 2ad2a547930..d441c659da8 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -27,9 +27,9 @@ It's like a regular ol' straight pipe, but you can turn it on and off. /obj/machinery/atmospherics/binary/valve/proc/open() open = 1 update_icon_nopipes() - parent1.update = 0 - parent2.update = 0 - parent1.reconcile_air() + update_parents() + var/datum/pipeline/parent1 = parents[1] ; parent1.reconcile_air() + parents[1] = parent1 investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", "atmos") /obj/machinery/atmospherics/binary/valve/proc/close() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 4b920407ce8..58abf65eddc 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -48,6 +48,9 @@ Thus, the two variables affect pump operation are set in New(): if(!on) return 0 + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] + // Pump mechanism just won't do anything if the pressure is too high/too low var/input_starting_pressure = air1.return_pressure() @@ -62,9 +65,8 @@ Thus, the two variables affect pump operation are set in New(): air2.merge(removed) - parent1.update = 1 - - parent2.update = 1 + update_airs(air1, air2) + update_parents() return 1 @@ -124,6 +126,7 @@ Thus, the two variables affect pump operation are set in New(): on = !on if("set_transfer_rate" in signal.data) + var/datum/gas_mixture/air1 = airs[1] transfer_rate = Clamp( text2num(signal.data["set_transfer_rate"]), 0, diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm index c9159a0b164..2c0a9e2cc5e 100644 --- a/code/ATMOSPHERICS/components/components_base.dm +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -5,17 +5,19 @@ On top of that, now people can add component-speciic procs/vars if they want! /obj/machinery/atmospherics/components/ var/welded = 0 //Used on pumps and scrubbers var/showpipe = 0 - var/nodes = 0 + var/list/nodes + var/list/parents + var/list/airs + var/node_amount -/obj/machinery/atmospherics/components/New(var/new_airs[] = get_airs()) //doesn't work properly +/obj/machinery/atmospherics/components/New() //doesn't work properly ..() - for(var/A in new_airs) + for(var/A = 1; A <= node_amount; A++) var/datum/gas_mixture/air = A air = new air.volume = 200 - new_airs[A] = air - return new_airs + airs[A] = air /* Iconnery */ @@ -35,7 +37,7 @@ Iconnery /obj/machinery/atmospherics/components/proc/update_icon_nopipes() return -/obj/machinery/atmospherics/components/update_icon(var/update_nodes[] = nodes) //works +/obj/machinery/atmospherics/components/update_icon() //works update_icon_nopipes() underlays.Cut() @@ -44,7 +46,7 @@ Iconnery var/connected = 0 - for(var/N in update_nodes) //adds intact pieces + for(var/N in nodes) //adds intact pieces var/obj/machinery/atmospherics/node = N if(node) connected = icon_addintact(node, connected) @@ -54,124 +56,113 @@ Iconnery /* Pipenet stuff; housekeeping */ -/obj/machinery/atmospherics/components/Destroy(var/dest_nodes[] = get_nodes(), var/dest_parents[] = get_parents()) //works somewhat - for(var/N in dest_nodes) +/obj/machinery/atmospherics/components/Destroy() //works somewhat + for(var/N in nodes) var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = dest_parents[N] + var/datum/pipeline/parent = parents[N] if(node) node.disconnect(src) node = null nullifyPipenet(parent) - dest_nodes[N] = node - dest_parents[N] = parent + nodes[N] = node + parents[N] = parent ..() - return list(nodes = dest_nodes, parents = dest_parents) -/obj/machinery/atmospherics/components/atmosinit(var/node_connects[], var/init_nodes[] = get_nodes()) //doesn't work for another reason - /*for(var/N in nodes) - var/obj/machinery/atmospherics/node = N - var/dir/node_connect = node_connects[N] - - for(var/obj/machinery/atmospherics/target in get_step(src,node_connect)) +/obj/machinery/atmospherics/components/atmosinit(var/list/node_connects) //doesn't work for another reason + for(var/N = 1; N <= node_amount; N++) + for(var/obj/machinery/atmospherics/target in get_step(src,node_connects[N])) if(target.initialize_directions & get_dir(target,src)) - node = target - break*/ + nodes[N] = target if(level == 2) showpipe = 1 update_icon() return -/obj/machinery/atmospherics/components/construction(var/constr_parents[] = get_parents()) //doesn't work +/obj/machinery/atmospherics/components/construction() //doesn't work ..() - for(var/P in constr_parents) + for(var/P in parents) var/datum/pipeline/parent = P parent.update = 1 - constr_parents[P] = parent - return constr_parents + parents[P] = parent -/obj/machinery/atmospherics/components/build_network(var/build_parents[] = get_parents()) //doesn't work - for(var/P in build_parents) +/obj/machinery/atmospherics/components/build_network() //doesn't work + for(var/P in parents) var/datum/pipeline/parent = P if(parent) return parent = new /datum/pipeline() parent.build_pipeline(src) - build_parents[P] = parent - return build_parents + parents[P] = parent -/obj/machinery/atmospherics/components/disconnect(obj/machinery/atmospherics/reference, var/disc_nodes[] = get_nodes(), var/disc_parents[] = get_parents()) //works - for(var/N in disc_nodes) +/obj/machinery/atmospherics/components/disconnect(obj/machinery/atmospherics/reference) //works + for(var/N in nodes) var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = disc_parents[N] + var/datum/pipeline/parent = parents[N] if(reference == node) if(istype(node, /obj/machinery/atmospherics/pipe)) qdel(parent) parent = null - disc_parents[N] = parent + parents[N] = parent update_icon() - return disc_parents -/obj/machinery/atmospherics/components/nullifyPipenet(datum/pipeline/pipeline, var/null_parents[] = get_parents(), var/null_airs[] = get_airs()) //untestable +/obj/machinery/atmospherics/components/nullifyPipenet(datum/pipeline/pipeline) //untestable ..() - for(var/P in null_parents) + for(var/P in parents) var/datum/pipeline/parent = P - var/datum/gas_mixture/air = null_airs[P] + var/datum/gas_mixture/air = airs[P] if(pipeline == parent) parent.other_airs -= air parent = null - null_parents[P] = parent - return null_parents + parents[P] = parent -/obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/pipeline, var/return_parents[] = get_parents(), var/return_airs[] = get_airs()) //untestable; should work - for(var/P in return_parents) +/obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/pipeline) //untestable; should work + for(var/P in parents) var/datum/pipeline/parent = P - var/datum/gas_mixture/air = return_airs[P] + var/datum/gas_mixture/air = airs[P] if(pipeline == parent) return air -/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/pipeline, var/expand_parents[] = get_parents(), var/expand_nodes[] = get_nodes()) //TODO: dong +/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/pipeline) if(!pipeline) - return expand_nodes //works - for(var/N in expand_nodes) + return nodes //works + for(var/N in nodes) var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = expand_parents[N] + var/datum/pipeline/parent = parents[N] if(parent == pipeline) return list(node) //untestable; should work -/obj/machinery/atmospherics/components/setPipenet(datum/pipeline/pipeline, obj/machinery/atmospherics/A, var/set_parents[] = get_parents(), var/set_nodes[] = get_nodes()) - for(var/N in set_nodes) +/obj/machinery/atmospherics/components/setPipenet(datum/pipeline/pipeline, obj/machinery/atmospherics/A) + for(var/N in nodes) var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = set_parents[N] + var/datum/pipeline/parent = parents[N] if(A == node) parent = pipeline - set_parents[N] = parent - return set_parents + parents[N] = parent -/obj/machinery/atmospherics/components/returnPipenet(obj/machinery/atmospherics/A, var/return_parents[] = get_parents(), var/return_nodes = get_nodes()) - for(var/N in return_nodes) +/obj/machinery/atmospherics/components/returnPipenet(obj/machinery/atmospherics/A) + for(var/N in nodes) var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = return_parents[N] + var/datum/pipeline/parent = parents[N] if(A == node) return parent //probably works -/obj/machinery/atmospherics/components/replacePipenet(datum/pipeline/Old, datum/pipeline/New, var/replace_parents[] = get_parents()) - for(var/P in replace_parents) +/obj/machinery/atmospherics/components/replacePipenet(datum/pipeline/Old, datum/pipeline/New) + for(var/P in parents) var/datum/pipeline/parent = P if(Old == parent) parent = New - replace_parents[P] = parent - return replace_parents + parents[P] = parent -/obj/machinery/atmospherics/components/unsafe_pressure_release(var/mob/user, var/pressures, var/unsafe_airs[] = get_airs()) //untestable; I'll fix this last +/obj/machinery/atmospherics/components/unsafe_pressure_release(var/mob/user, var/pressures) //untestable; I'll fix this last ..() var/turf/T = get_turf(src) @@ -180,23 +171,22 @@ Pipenet stuff; housekeeping var/datum/gas_mixture/environment = T.return_air() var/lost = null var/times_lost = 0 - for(var/A in unsafe_airs) + for(var/A in airs) var/datum/gas_mixture/air = A lost += pressures*environment.volume/(air.temperature * R_IDEAL_GAS_EQUATION) times_lost++ var/shared_loss = lost/times_lost var/datum/gas_mixture/to_release - for(var/A in unsafe_airs) + for(var/A in airs) var/datum/gas_mixture/air = A if(!to_release) to_release = air.remove(shared_loss) continue to_release.merge(air.remove(shared_loss)) - unsafe_airs[A] = air + airs[A] = air T.assume_air(to_release) air_update_turf(1) - return unsafe_airs /* I think this is NanoUI? @@ -218,9 +208,14 @@ Helpers /obj/machinery/atmospherics/components/proc/get_parents() return -/obj/machinery/atmospherics/components/proc/set_airs() - return -/obj/machinery/atmospherics/components/proc/set_nodes() - return -/obj/machinery/atmospherics/components/proc/set_parents() - return \ No newline at end of file +/obj/machinery/atmospherics/components/proc/update_airs(var/list/L) + for(var/N in L) + var/datum/gas_mixture/air = L[N] + airs[N] = air + +/obj/machinery/atmospherics/components/proc/update_parents(var/list/L = parents) + for(var/N in L) + if(!N) + continue + var/datum/pipeline/parent = N ; parent.update = 1 + parents[N] = parent \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 7121909054c..5841c279c02 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -67,7 +67,7 @@ Filter types: /obj/machinery/atmospherics/trinary/filter/update_icon_nopipes() - if(!(stat & NOPOWER) && on && node1 && node2 && node3) + if(!(stat & NOPOWER) && on && nodes[1] && nodes[2] && nodes[3]) icon_state = "filter_on[flipped?"_f":""]" return @@ -86,6 +86,10 @@ Filter types: if(!on) return 0 + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] + var/datum/gas_mixture/air3 = airs[3] + var/output_starting_pressure = air3.return_pressure() if(output_starting_pressure >= target_pressure) @@ -147,11 +151,8 @@ Filter types: air2.merge(filtered_out) air3.merge(removed) - parent2.update = 1 - - parent3.update = 1 - - parent1.update = 1 + update_airs(air1, air2, air3) + update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index f486cf066ad..54f9995ccdb 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -36,8 +36,13 @@ overlays.Cut() ..() +<<<<<<< HEAD /obj/machinery/atmospherics/trinary/mixer/update_icon_nopipes() if(!(stat & NOPOWER) && on && node1 && node2 && node3) +======= +/obj/machinery/atmospherics/components/trinary/mixer/update_icon_nopipes() + if(!(stat & NOPOWER) && on && nodes[1] && nodes[2] && nodes[3]) +>>>>>>> 3ee8754... 3rd pass OOP icon_state = "mixer_on[flipped?"_f":""]" return @@ -53,13 +58,18 @@ /obj/machinery/atmospherics/trinary/mixer/New() ..() - air3.volume = 300 + var/datum/gas_mixture/air3 = airs[3] ; air3.volume = 300 + airs[3] = air3 /obj/machinery/atmospherics/trinary/mixer/process_atmos() ..() if(!on) return 0 + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] + var/datum/gas_mixture/air3 = airs[3] + var/output_starting_pressure = air3.return_pressure() if(output_starting_pressure >= target_pressure) @@ -104,12 +114,13 @@ air3.merge(removed2) if(transfer_moles1) - parent1.update = 1 + update_parents(list(1 = parents[1])) if(transfer_moles2) - parent2.update = 1 + update_parents(list(2 = parents[2])) - parent3.update = 1 + update_airs(air1, air2, air3) + update_parents(list(3 = parents[3])) return 1 diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 3c79a14c512..cf548dd43b0 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -3,26 +3,10 @@ dir = SOUTH initialize_directions = SOUTH|NORTH|WEST use_power = 1 - nodes = 3 - - var/obj/machinery/atmospherics/node1 - var/obj/machinery/atmospherics/node2 - var/obj/machinery/atmospherics/node3 - - var/datum/pipeline/parent1 - var/datum/pipeline/parent2 - var/datum/pipeline/parent3 - - var/datum/gas_mixture/air1 - var/datum/gas_mixture/air2 - var/datum/gas_mixture/air3 + node_amount = 3 var/flipped = 0 -/obj/machinery/atmospherics/components/trinary/New() - var/airs[] = ..() - set_airs(airs) - /obj/machinery/atmospherics/components/trinary/SetInitDirections() switch(dir) if(NORTH) @@ -35,27 +19,12 @@ initialize_directions = WEST|NORTH|EAST /* -Helpers //these all look kinda copypaste-y, but I'm not entirely certain how to get around that -duncathan +Helpers */ -/obj/machinery/atmospherics/components/trinary/get_airs() - return list(air1, air2, air3) - -/obj/machinery/atmospherics/components/trinary/get_nodes() - return list(node1, node2, node3) - -/obj/machinery/atmospherics/components/trinary/get_parents() - return list(parent1, parent2, parent3) - -/obj/machinery/atmospherics/components/trinary/set_airs(var/list/L) - var/datum/gas_mixture/a1 = L[1] - var/datum/gas_mixture/a2 = L[2] - var/datum/gas_mixture/a3 = L[3] - - air1 = a1 - air2 = a2 - air3 = a3 - +/obj/machinery/atmospherics/components/trinary/update_airs(var/a1, var/a2, var/a3) + ..(list(1 = a1, 2 = a2, 3 = a3)) +/* /obj/machinery/atmospherics/components/trinary/set_nodes(var/list/L) var/obj/machinery/atmospherics/n1 = L[1] var/obj/machinery/atmospherics/n2 = L[2] @@ -64,25 +33,13 @@ Helpers //these all look kinda copypaste-y, but I'm not entirely certain how to node1 = n1 node2 = n2 node3 = n3 +*/ -/obj/machinery/atmospherics/components/trinary/set_parents(var/list/L) - var/datum/pipeline/p1 = L[1] - var/datum/pipeline/p2 = L[2] - var/datum/pipeline/p3 = L[3] - - parent1 = p1 - parent2 = p2 - parent3 = p3 /* Housekeeping and pipe network stuff //WOW this got cut down thank you based OOP - duncathan */ -/obj/machinery/atmospherics/components/trinary/Destroy() - var/returns[] = ..() - - set_nodes(returns[1]) - set_parents(returns[2]) /obj/machinery/atmospherics/components/trinary/atmosinit() @@ -105,49 +62,18 @@ Housekeeping and pipe network stuff node1_connect = turn(node1_connect, 180) node3_connect = turn(node3_connect, 180) - //var/node_connects[] = list(nodes[node1]_connect, nodes[node2]_connect, nodes[node3]_connect) + var/node_connects[] = list(1 = node1_connect, 2 = node2_connect, 3 = node3_connect) - for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect)) + /* for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect)) if(target.initialize_directions & get_dir(target,src)) - nodes[node1] = target + nodes[1] = target break for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect)) if(target.initialize_directions & get_dir(target,src)) - nodes[node2] = target + nodes[2] = target break for(var/obj/machinery/atmospherics/target in get_step(src,node3_connect)) if(target.initialize_directions & get_dir(target,src)) - nodes[node3] = target - break - ..(/*node_connects*/) - -/obj/machinery/atmospherics/components/trinary/construction() - var/parents[] = ..() - set_parents(parents) - -/obj/machinery/atmospherics/components/trinary/build_network() - var/parents[] = ..() - set_parents(parents) - -/obj/machinery/atmospherics/components/trinary/disconnect(obj/machinery/atmospherics/reference) - var/parents[] = ..(reference) - set_parents(parents) - -/obj/machinery/atmospherics/components/trinary/nullifyPipenet(datum/pipeline/P) - var/parents[] = ..(P) - set_parents(parents) - -/obj/machinery/atmospherics/components/trinary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) - var/parents[] = ..(P, A) - set_parents(parents) - -/obj/machinery/atmospherics/components/trinary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) - var/parents[] = ..(Old, New) - set_parents(parents) - -/obj/machinery/atmospherics/components/trinary/unsafe_pressure_release(var/mob/user, var/pressures) - var/airs[] = ..(user, pressures) - set_airs(airs) - -//This sure looks like a lot of copypaste... It's already way better though, so it works for now -//TODO: make it even more OOP - duncathan \ No newline at end of file + nodes[3] = target + break */ + ..(node_connects) \ No newline at end of file diff --git a/code/game/machinery/Freezer.dm b/code/ATMOSPHERICS/components/unary_devices/Freezer.dm similarity index 96% rename from code/game/machinery/Freezer.dm rename to code/ATMOSPHERICS/components/unary_devices/Freezer.dm index 16b8d76da62..bf3b888b1f3 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/ATMOSPHERICS/components/unary_devices/Freezer.dm @@ -69,6 +69,7 @@ /obj/machinery/atmospherics/unary/cold_sink/freezer/interact(mob/user) if(stat & (NOPOWER|BROKEN)) return + var/datum/gas_mixture/air_contents = airs[1] user.set_machine(src) var/temp_text = "" if(air_contents.temperature > (T0C - 20)) @@ -193,6 +194,8 @@ return interact(user) /obj/machinery/atmospherics/unary/heat_reservoir/heater/interact(mob/user) + var/datum/gas_mixture/air_contents = airs[1] + if(stat & (NOPOWER|BROKEN)) return user.set_machine(src) diff --git a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm index cc473803997..5f1254d37cd 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm @@ -16,7 +16,7 @@ if(showpipe) overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now - if(!node || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "cold_off" return @@ -27,6 +27,8 @@ ..() if(!on) return 0 + var/datum/gas_mixture/air_contents = airs[1] + var/air_heat_capacity = air_contents.heat_capacity() var/combined_heat_capacity = current_heat_capacity + air_heat_capacity var/old_temperature = air_contents.temperature @@ -36,7 +38,7 @@ air_contents.temperature = combined_energy/combined_heat_capacity //todo: have current temperature affected. require power to bring down current temperature again - + update_airs(air_contents) if(abs(old_temperature-air_contents.temperature) > 1) - parent.update = 1 + update_parents() return 1 diff --git a/code/game/machinery/cryo.dm b/code/ATMOSPHERICS/components/unary_devices/cryo.dm similarity index 93% rename from code/game/machinery/cryo.dm rename to code/ATMOSPHERICS/components/unary_devices/cryo.dm index a0c17f6a556..54b920c8e21 100644 --- a/code/game/machinery/cryo.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cryo.dm @@ -47,11 +47,13 @@ ..() /obj/machinery/atmospherics/unary/cryo_cell/process_atmos() ..() + var/datum/gas_mixture/air_contents = airs[1] + if(air_contents) temperature_archived = air_contents.temperature heat_gas_contents() if(abs(temperature_archived-air_contents.temperature) > 1) - parent.update = 1 + update_parents() /obj/machinery/atmospherics/unary/cryo_cell/process() ..() @@ -60,14 +62,14 @@ on = 0 open_machine() playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) - if(!node || !is_operational()) + if(!nodes[1] || !is_operational()) return if(!on) updateDialog() return - if(air_contents) + if(airs[1]) if (occupant) process_occupant() expel_gas() @@ -144,6 +146,8 @@ /obj/machinery/atmospherics/unary/cryo_cell/get_ui_data() // this is the data which will be sent to the ui + var/datum/gas_mixture/air_contents = airs[1] + var/data = list() data["isOperating"] = on data["hasOccupant"] = occupant ? 1 : 0 @@ -286,6 +290,7 @@ update_icon() /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() + var/datum/gas_mixture/air_contents = airs[1] if(air_contents.total_moles() < 10) return if(occupant) @@ -293,7 +298,7 @@ occupant.bodytemperature = T0C return occupant.bodytemperature += 2*(air_contents.temperature - occupant.bodytemperature) * current_heat_capacity / (current_heat_capacity + air_contents.heat_capacity()) - occupant.bodytemperature = max(occupant.bodytemperature, air_contents.temperature) // this is so ugly i'm sorry for doing it i'll fix it later i promise + occupant.bodytemperature = max(occupant.bodytemperature, air_contents.temperature) // this is so ugly i'm sorry for doing it i'll fix it later i promise //TODO: fix someone else's broken promise - duncathan if(occupant.bodytemperature < T0C) // occupant.sleeping = max(5/efficiency, (1 / occupant.bodytemperature)*2000/efficiency) // occupant.Paralyse(max(5/efficiency, (1 / occupant.bodytemperature)*3000/efficiency)) @@ -317,6 +322,8 @@ /obj/machinery/atmospherics/unary/cryo_cell/proc/heat_gas_contents() + var/datum/gas_mixture/air_contents = airs[1] + if(air_contents.total_moles() < 1) return var/air_heat_capacity = air_contents.heat_capacity() @@ -324,9 +331,12 @@ if(combined_heat_capacity > 0) var/combined_energy = T20C * current_heat_capacity + air_heat_capacity * air_contents.temperature air_contents.temperature = combined_energy/combined_heat_capacity + update_airs(air_contents) /obj/machinery/atmospherics/unary/cryo_cell/proc/expel_gas() + var/datum/gas_mixture/air_contents = airs[1] + if(air_contents.total_moles() < 1) return var/datum/gas_mixture/expel_gas = new @@ -335,3 +345,4 @@ expel_gas.temperature = T20C //Lets expel hot gas and see if that helps people not die as they are removed loc.assume_air(expel_gas) air_update_turf() + update_airs(air_contents) diff --git a/code/ATMOSPHERICS/components/unary_devices/generator_input.dm b/code/ATMOSPHERICS/components/unary_devices/generator_input.dm index 437626ec6cc..4ada963f9ee 100644 --- a/code/ATMOSPHERICS/components/unary_devices/generator_input.dm +++ b/code/ATMOSPHERICS/components/unary_devices/generator_input.dm @@ -9,7 +9,7 @@ var/update_cycle /obj/machinery/atmospherics/unary/generator_input/update_icon() - if(node) + if(nodes[1]) icon_state = "intact" else icon_state = "exposed" @@ -17,4 +17,4 @@ return /obj/machinery/atmospherics/unary/generator_input/proc/return_exchange_air() - return air_contents + return airs[1] diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm index 7e3d2e79b84..adfbf6760cb 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm @@ -11,8 +11,9 @@ var/update_cycle /obj/machinery/atmospherics/unary/heat_exchanger/update_icon() - if(node) + if(nodes[1]) icon_state = "he_intact" + var/obj/machinery/atmospherics/node = nodes[1] color = node.color else icon_state = "he_exposed" @@ -42,24 +43,30 @@ update_cycle = SSair.times_fired partner.update_cycle = SSair.times_fired + var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/partner_air_contents = partner.airs[1] + var/air_heat_capacity = air_contents.heat_capacity() - var/other_air_heat_capacity = partner.air_contents.heat_capacity() + var/other_air_heat_capacity = partner_air_contents.heat_capacity() var/combined_heat_capacity = other_air_heat_capacity + air_heat_capacity var/old_temperature = air_contents.temperature - var/other_old_temperature = partner.air_contents.temperature + var/other_old_temperature = partner_air_contents.temperature if(combined_heat_capacity > 0) - var/combined_energy = partner.air_contents.temperature*other_air_heat_capacity + air_heat_capacity*air_contents.temperature + var/combined_energy = partner_air_contents.temperature*other_air_heat_capacity + air_heat_capacity*air_contents.temperature var/new_temperature = combined_energy/combined_heat_capacity air_contents.temperature = new_temperature - partner.air_contents.temperature = new_temperature + partner_air_contents.temperature = new_temperature if(abs(old_temperature-air_contents.temperature) > 1) - parent.update = 1 + update_parents() - if(abs(other_old_temperature-partner.air_contents.temperature) > 1) - partner.parent.update = 1 + if(abs(other_old_temperature-partner_air_contents.temperature) > 1) + partner.update_parents() + + update_airs(air_contents) + partner.update_airs(partner_air_contents) return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm index f2bebe794ae..838b8b6589d 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm @@ -17,7 +17,7 @@ if(showpipe) overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now - if(!node || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "cold_off" return @@ -28,6 +28,9 @@ ..() if(!on) return 0 + + var/datum/gas_mixture/air_contents = airs[1] + var/air_heat_capacity = air_contents.heat_capacity() var/combined_heat_capacity = current_heat_capacity + air_heat_capacity var/old_temperature = air_contents.temperature @@ -39,5 +42,6 @@ //todo: have current temperature affected. require power to bring up current temperature again if(abs(old_temperature-air_contents.temperature) > 1) - parent.update = 1 + update_parents() + update_airs(air_contents) return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index b3784f71829..d7976f8a1b8 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -25,7 +25,7 @@ on = 1 /obj/machinery/atmospherics/unary/outlet_injector/update_icon_nopipes() - if(!node || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "inje_off" return @@ -45,6 +45,8 @@ if(!on || stat & NOPOWER) return 0 + var/datum/gas_mixture/air_contents = airs[1] + if(air_contents.temperature > 0) var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION) @@ -53,7 +55,8 @@ loc.assume_air(removed) air_update_turf() - parent.update = 1 + update_airs(air_contents) + update_parents() return 1 @@ -61,6 +64,8 @@ if(on || injecting) return 0 + var/datum/gas_mixture/air_contents = airs[1] + injecting = 1 if(air_contents.temperature > 0) @@ -70,7 +75,8 @@ loc.assume_air(removed) - parent.update = 1 + update_airs(air_contents) + update_parents() flick("inje_inject", src) @@ -126,6 +132,7 @@ if("set_volume_rate" in signal.data) var/number = text2num(signal.data["set_volume_rate"]) + var/datum/gas_mixture/air_contents = airs[1] volume_rate = Clamp(number, 0, air_contents.volume) if("status" in signal.data) diff --git a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm index 42b52ece903..66a06d337d9 100644 --- a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm +++ b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm @@ -18,7 +18,7 @@ if(showpipe) overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) //it works for now - if(!node || !on || stat & BROKEN) + if(!nodes[1] || !on || stat & BROKEN) icon_state = "o2gen_off" return @@ -27,14 +27,16 @@ /obj/machinery/atmospherics/unary/oxygen_generator/New() ..() - - air_contents.volume = 50 + var/datum/gas_mixture/air_contents = airs[1] ; air_contents.volume = 50 + airs[1] = air_contents /obj/machinery/atmospherics/unary/oxygen_generator/process_atmos() ..() if(!on) return 0 + var/datum/gas_mixture/air_contents = airs[1] + var/total_moles = air_contents.total_moles() if(total_moles < oxygen_content) @@ -45,6 +47,7 @@ air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen) air_contents.oxygen += added_oxygen - parent.update = 1 + update_airs(air_contents) + update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm index 95372d07d04..558e798c49d 100644 --- a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/portables_connector +/obj/machinery/atmospherics/components/unary/portables_connector name = "connector port" desc = "For connecting portables devices related to atmospherics control." icon = 'icons/obj/atmospherics/unary_devices.dmi' @@ -8,40 +8,27 @@ use_power = 0 level = 0 -/obj/machinery/atmospherics/unary/portables_connector/visible +/obj/machinery/atmospherics/components/unary/portables_connector/visible level = 2 -/obj/machinery/atmospherics/unary/portables_connector/update_icon() - icon_state = "connector" - underlays.Cut() - if(showpipe) - var/state - var/col - if(node) - state = "pipe_intact" - col = node.pipe_color - else - state = "pipe_exposed" - underlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', state, initialize_directions, col) - -/obj/machinery/atmospherics/unary/portables_connector/process_atmos() +/obj/machinery/atmospherics/components/unary/portables_connector/process_atmos() if(!connected_device) return - parent.update = 1 + update_parents() -/obj/machinery/atmospherics/unary/portables_connector/Destroy() +/obj/machinery/atmospherics/components/unary/portables_connector/Destroy() if(connected_device) connected_device.disconnect() ..() -/obj/machinery/atmospherics/unary/portables_connector/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/atmospherics/components/unary/portables_connector/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) if(connected_device) user << "You cannot unwrench this [src], dettach [connected_device] first!" return 1 return ..() -/obj/machinery/atmospherics/unary/portables_connector/portableConnectorReturnAir() +/obj/machinery/atmospherics/components/unary/portables_connector/portableConnectorReturnAir() return connected_device.portableConnectorReturnAir() /obj/proc/portableConnectorReturnAir() diff --git a/code/ATMOSPHERICS/pipes/tank.dm b/code/ATMOSPHERICS/components/unary_devices/tank.dm similarity index 58% rename from code/ATMOSPHERICS/pipes/tank.dm rename to code/ATMOSPHERICS/components/unary_devices/tank.dm index e47a510432f..7c3b4e61e1b 100644 --- a/code/ATMOSPHERICS/pipes/tank.dm +++ b/code/ATMOSPHERICS/components/unary_devices/tank.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/tank +/obj/machinery/atmospherics/components/unary/tank icon = 'icons/obj/atmospherics/pipes/pressure_tank.dmi' icon_state = "generic" name = "pressure tank" @@ -6,76 +6,76 @@ var/volume = 10000 //in liters, 1 meters by 1 meters by 2 meters density = 1 -/obj/machinery/atmospherics/unary/tank/update_icon() - underlays.Cut() - if(showpipe) - var/state - var/col - if(node) - state = "pipe_intact" - col = node.pipe_color - else - state = "pipe_exposed" - underlays += getpipeimage('icons/obj/atmospherics/pipes/pressure_tank.dmi', state, initialize_directions, col) - -/obj/machinery/atmospherics/unary/tank/carbon_dioxide +/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide name = "pressure tank (Carbon Dioxide)" -/obj/machinery/atmospherics/unary/tank/carbon_dioxide/New() +/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide/New() ..() + var/datum/gas_mixture/air_contents = airs[1] air_contents.volume = volume air_contents.temperature = T20C air_contents.carbon_dioxide = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) + update_airs(air_contents) -/obj/machinery/atmospherics/unary/tank/toxins +/obj/machinery/atmospherics/components/unary/tank/toxins icon_state = "orange" name = "pressure tank (Plasma)" -/obj/machinery/atmospherics/unary/tank/toxins/New() +/obj/machinery/atmospherics/components/unary/tank/toxins/New() ..() + var/datum/gas_mixture/air_contents = airs[1] air_contents.volume = volume air_contents.temperature = T20C air_contents.toxins = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) + update_airs(air_contents) -/obj/machinery/atmospherics/unary/tank/oxygen_agent_b +/obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b icon_state = "orange_2" name = "pressure tank (Oxygen + Plasma)" -/obj/machinery/atmospherics/unary/tank/oxygen_agent_b/New() +/obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b/New() ..() + var/datum/gas_mixture/air_contents = airs[1] air_contents.volume = volume air_contents.temperature = T0C var/datum/gas/oxygen_agent_b/trace_gas = new trace_gas.moles = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) air_contents.trace_gases += trace_gas + update_airs(air_contents) -/obj/machinery/atmospherics/unary/tank/oxygen +/obj/machinery/atmospherics/components/unary/tank/oxygen icon_state = "blue" name = "pressure tank (Oxygen)" -/obj/machinery/atmospherics/unary/tank/oxygen/New() +/obj/machinery/atmospherics/components/unary/tank/oxygen/New() ..() + var/datum/gas_mixture/air_contents = airs[1] air_contents.volume = volume air_contents.temperature = T20C air_contents.oxygen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) + update_airs(air_contents) -/obj/machinery/atmospherics/unary/tank/nitrogen +/obj/machinery/atmospherics/components/unary/tank/nitrogen icon_state = "red" name = "pressure tank (Nitrogen)" -/obj/machinery/atmospherics/unary/tank/nitrogen/New() +/obj/machinery/atmospherics/components/unary/tank/nitrogen/New() ..() + var/datum/gas_mixture/air_contents = airs[1] air_contents.volume = volume air_contents.temperature = T20C air_contents.nitrogen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) + update_airs(air_contents) -/obj/machinery/atmospherics/unary/tank/air +/obj/machinery/atmospherics/components/unary/tank/air icon_state = "grey" name = "pressure tank (Air)" -/obj/machinery/atmospherics/unary/tank/air/New() +/obj/machinery/atmospherics/components/unary/tank/air/New() ..() + var/datum/gas_mixture/air_contents = airs[1] air_contents.volume = volume air_contents.temperature = T20C air_contents.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) - air_contents.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) \ No newline at end of file + air_contents.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) + update_airs(air_contents) \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index c50052ab82c..e4a2198f120 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -3,14 +3,7 @@ dir = SOUTH initialize_directions = SOUTH layer = TURF_LAYER+0.1 - nodes = 1 - - var/datum/gas_mixture/air_contents - var/obj/machinery/atmospherics/node - -/obj/machinery/atmospherics/components/unary/New() - var/airs[] = ..() - set_airs(airs) + node_amount = 1 /obj/machinery/atmospherics/components/unary/SetInitDirections() initialize_directions = dir @@ -27,82 +20,36 @@ Iconnery Helpers */ -/obj/machinery/atmospherics/components/unary/get_airs() - return list(air_contents) - -/obj/machinery/atmospherics/components/unary/get_nodes() - return list(node) - -/obj/machinery/atmospherics/components/unary/get_parents() - return list(parent) - -/obj/machinery/atmospherics/components/unary/set_airs(var/list/L) - var/datum/gas_mixture/a1 = L[1] - air_contents = a1 - -/obj/machinery/atmospherics/components/unary/set_nodes(var/list/L) - var/obj/machinery/atmospherics/n1 = L[1] - node = n1 - -/obj/machinery/atmospherics/components/unary/set_parents(var/list/L) - var/datum/pipeline/p1 = L[1] - parent = p1 +/obj/machinery/atmospherics/components/unary/update_airs(var/a1) + ..(list(1 = a1)) /* Housekeeping and pipe network stuff below */ /obj/machinery/atmospherics/components/unary/atmosinit() - //var/node_connects = list(dir) - for(var/obj/machinery/atmospherics/target in get_step(src,dir)) + var/node_connects = list(1 = dir) + /*for(var/obj/machinery/atmospherics/target in get_step(src,dir)) if(target.initialize_directions & get_dir(target,src)) - node = target - break - ..(/*node_connects*/) + nodes[1] = target + break*/ + ..(node_connects) /obj/machinery/atmospherics/components/unary/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W) if(..()) - initialize_directions = dir - if(node) - node.disconnect(src) - node = null - nullifyPipenet(parent) - atmosinit() - initialize() - if(node) - node.atmosinit() - node.initialize() - node.addMember(src) - build_network() - . = 1 - -/obj/machinery/atmospherics/components/unary/construction() - var/parents[] = ..() - set_parents(parents) - -/obj/machinery/atmospherics/components/unary/build_network() - var/parents[] = ..() - set_parents(parents) - -/obj/machinery/atmospherics/components/unary/disconnect(obj/machinery/atmospherics/reference) - var/parents[] = ..(reference) - set_parents(parents) - -/obj/machinery/atmospherics/components/unary/nullifyPipenet(datum/pipeline/P) - var/parents[] = ..(P) - set_parents(parents) - -/obj/machinery/atmospherics/components/unary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A) - var/parents[] = ..(P, A) - set_parents(parents) - -/obj/machinery/atmospherics/components/unary/replacePipenet(datum/pipeline/Old, datum/pipeline/New) - var/parents[] = ..(Old, New) - set_parents(parents) - -/obj/machinery/atmospherics/components/unary/unsafe_pressure_release(var/mob/user, var/pressures) - var/airs[] = ..(user, pressures) - set_airs(airs) - -//This sure looks like a lot of copypaste... It's already way better though, so it works for now -//TODO: make it even more OOP - duncathan \ No newline at end of file + return 0 + initialize_directions = dir + var/obj/machinery/atmospherics/node = nodes[1] + if(node) + node.disconnect(src) + node = null + nullifyPipenet(parent) + atmosinit() + initialize() + if(node) + node.atmosinit() + node.initialize() + node.addMember(src) + build_network() + . = 1 + nodes[1] = node \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 459bf870c66..29ef8b1d7c1 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -65,7 +65,9 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/New() ..() + var/datum/gas_mixture/air_contents = airs[1] air_contents.volume = 1000 + update_airs(air_contents) /obj/machinery/atmospherics/unary/vent_pump/update_icon_nopipes() overlays.Cut() @@ -76,7 +78,7 @@ icon_state = "vent_welded" return - if(!node || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "vent_off" return @@ -89,7 +91,7 @@ ..() if(stat & (NOPOWER|BROKEN)) return - if (!node) + if (!nodes[1]) on = 0 //broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0 if(!on) @@ -98,6 +100,7 @@ if(welded) return 0 + var/datum/gas_mixture/air_contents = airs[1] var/datum/gas_mixture/environment = loc.return_air() var/environment_pressure = environment.return_pressure() @@ -118,8 +121,6 @@ loc.assume_air(removed) air_update_turf() - parent.update = 1 - else //external -> internal var/pressure_delta = 10000 if(pressure_checks&1) @@ -137,8 +138,8 @@ air_contents.merge(removed) air_update_turf() - - parent.update = 1 + update_airs(air_contents) + update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 9588baa7ee7..a63fadf0c84 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -56,7 +56,7 @@ icon_state = "scrub_welded" return - if(!node || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "scrub_off" return @@ -114,13 +114,13 @@ ..() if(stat & (NOPOWER|BROKEN)) return - if (!node) + if (!nodes[1]) on = 0 //broadcast_status() if(!on || welded) return 0 - + var/datum/gas_mixture/air_contents = airs[1] var/datum/gas_mixture/environment = loc.return_air() if(scrubbing) @@ -158,8 +158,6 @@ loc.assume_air(removed) air_update_turf() - parent.update = 1 - else //Just siphoning all air if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE) return @@ -171,7 +169,8 @@ air_contents.merge(removed) air_update_turf() - parent.update = 1 + update_airs(air_contents) + update_parents() return 1 diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index 1ca353d8945..6d3a308ed1c 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -207,8 +207,8 @@ var/pipenetwarnings = 10 GL += P.other_airs for(var/obj/machinery/atmospherics/binary/valve/V in P.other_atmosmch) if(V.open) - PL |= V.parent1 - PL |= V.parent2 + PL |= V.parents[1] + PL |= V.parents[2] for(var/obj/machinery/atmospherics/unary/portables_connector/C in P.other_atmosmch) if(C.connected_device) GL += C.portableConnectorReturnAir() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 7975b9a7789..a91cda31fbe 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -824,11 +824,12 @@ Sorry Giacom. Please don't be mad :( else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) var/obj/machinery/atmospherics/unary/cryo_cell/C = loc + var/datum/gas_mixture/C_air_contents = C.airs[1] - if(C.air_contents.total_moles() < 10) + if(C_air_contents.total_moles() < 10) loc_temp = environment.temperature else - loc_temp = C.air_contents.temperature + loc_temp = C_air_contents.temperature else loc_temp = environment.temperature diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 6b73a53aa86..f103978dd5c 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -106,10 +106,14 @@ // update icon overlays only if displayed level has changed if(hot_air) - circ2.air1.merge(hot_air) + var/datum/gas_mixture/circ2_air1 = circ2.airs[1] + circ2_air1.merge(hot_air) + circ2.update_airs(circ2_air1) if(cold_air) - circ1.air1.merge(cold_air) + var/datum/gas_mixture/circ1_air1 = circ1.airs[1] + circ1_air1.merge(cold_air) + circ1.update_airs(circ1_air1) var/genlev = max(0, min( round(11*lastgen / 100000), 11)) var/circ = "[circ1 && circ1.last_pressure_delta > 0 ? "1" : "0"][circ2 && circ2.last_pressure_delta > 0 ? "1" : "0"]" @@ -131,6 +135,10 @@ if(!powernet) t += "Unable to connect to the power network!" else if(circ1 && circ2) + var/datum/gas_mixture/circ1_air1 = circ1.airs[1] + var/datum/gas_mixture/circ1_air2 = circ1.airs[2] + var/datum/gas_mixture/circ2_air1 = circ2.airs[1] + var/datum/gas_mixture/circ2_air2 = circ2.airs[2] t += "
" @@ -139,12 +147,12 @@ t += "
" t += "Cold loop
" - t += "Temperature Inlet: [round(circ1.air2.temperature, 0.1)] K / Outlet: [round(circ1.air1.temperature, 0.1)] K
" - t += "Pressure Inlet: [round(circ1.air2.return_pressure(), 0.1)] kPa / Outlet: [round(circ1.air1.return_pressure(), 0.1)] kPa
" + t += "Temperature Inlet: [round(circ1_air2.temperature, 0.1)] K / Outlet: [round(circ1_air1.temperature, 0.1)] K
" + t += "Pressure Inlet: [round(circ1_air2.return_pressure(), 0.1)] kPa / Outlet: [round(circ1_air1.return_pressure(), 0.1)] kPa
" t += "Hot loop
" - t += "Temperature Inlet: [round(circ2.air2.temperature, 0.1)] K / Outlet: [round(circ2.air1.temperature, 0.1)] K
" - t += "Pressure Inlet: [round(circ2.air2.return_pressure(), 0.1)] kPa / Outlet: [round(circ2.air1.return_pressure(), 0.1)] kPa
" + t += "Temperature Inlet: [round(circ2_air2.temperature, 0.1)] K / Outlet: [round(circ2_air1.temperature, 0.1)] K
" + t += "Pressure Inlet: [round(circ2_air2.return_pressure(), 0.1)] kPa / Outlet: [round(circ2_air1.return_pressure(), 0.1)] kPa
" t += "
" else diff --git a/tgstation.dme b/tgstation.dme index ca68b0b100e..2e54b9e4c10 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -105,12 +105,15 @@ #include "code\ATMOSPHERICS\components\trinary_devices\mixer.dm" #include "code\ATMOSPHERICS\components\trinary_devices\trinary_base.dm" #include "code\ATMOSPHERICS\components\unary_devices\cold_sink.dm" +#include "code\ATMOSPHERICS\components\unary_devices\cryo.dm" +#include "code\ATMOSPHERICS\components\unary_devices\Freezer.dm" #include "code\ATMOSPHERICS\components\unary_devices\generator_input.dm" #include "code\ATMOSPHERICS\components\unary_devices\heat_exchanger.dm" #include "code\ATMOSPHERICS\components\unary_devices\heat_source.dm" #include "code\ATMOSPHERICS\components\unary_devices\outlet_injector.dm" #include "code\ATMOSPHERICS\components\unary_devices\oxygen_generator.dm" #include "code\ATMOSPHERICS\components\unary_devices\portables_connector.dm" +#include "code\ATMOSPHERICS\components\unary_devices\tank.dm" #include "code\ATMOSPHERICS\components\unary_devices\unary_base.dm" #include "code\ATMOSPHERICS\components\unary_devices\vent_pump.dm" #include "code\ATMOSPHERICS\components\unary_devices\vent_scrubber.dm" @@ -119,7 +122,6 @@ #include "code\ATMOSPHERICS\pipes\manifold4w.dm" #include "code\ATMOSPHERICS\pipes\pipes.dm" #include "code\ATMOSPHERICS\pipes\simple.dm" -#include "code\ATMOSPHERICS\pipes\tank.dm" #include "code\controllers\configuration.dm" #include "code\controllers\failsafe.dm" #include "code\controllers\master_controller.dm" @@ -384,13 +386,11 @@ #include "code\game\machinery\cell_charger.dm" #include "code\game\machinery\cloning.dm" #include "code\game\machinery\constructable_frame.dm" -#include "code\game\machinery\cryo.dm" #include "code\game\machinery\deployable.dm" #include "code\game\machinery\door_control.dm" #include "code\game\machinery\doppler_array.dm" #include "code\game\machinery\droneDispenser.dm" #include "code\game\machinery\flasher.dm" -#include "code\game\machinery\Freezer.dm" #include "code\game\machinery\hologram.dm" #include "code\game\machinery\igniter.dm" #include "code\game\machinery\iv_drip.dm" From e63771c9f492ece94720962bff0070f2f642ab7a Mon Sep 17 00:00:00 2001 From: duncathan Date: Sun, 5 Jul 2015 03:09:58 -0600 Subject: [PATCH 24/52] finally gets airs, nodes and parents working... sorta nodes is working fine as far as I can tell airs seems fine but it's somewhat untestable until I fix parents parents is initializing, but not updating properly also adds my ckey to admins.txt --- .../binary_devices/binary_atmos_base.dm | 18 +- .../components/binary_devices/circulator.dm | 4 +- .../components/binary_devices/dp_vent_pump.dm | 12 +- .../components/binary_devices/passive_gate.dm | 4 +- .../components/binary_devices/pump.dm | 4 +- .../components/binary_devices/valve.dm | 4 +- .../components/binary_devices/volume_pump.dm | 6 +- .../components/components_base.dm | 232 +++++++++--------- .../components/trinary_devices/filter.dm | 53 ++-- .../components/trinary_devices/mixer.dm | 62 ++--- .../trinary_devices/trinary_base.dm | 34 +-- .../components/unary_devices/Freezer.dm | 60 ++--- .../components/unary_devices/cold_sink.dm | 4 +- .../components/unary_devices/cryo.dm | 62 ++--- .../unary_devices/generator_input.dm | 4 +- .../unary_devices/heat_exchanger.dm | 8 +- .../components/unary_devices/heat_source.dm | 4 +- .../unary_devices/outlet_injector.dm | 8 +- .../unary_devices/oxygen_generator.dm | 8 +- .../components/unary_devices/tank.dm | 12 +- .../components/unary_devices/unary_base.dm | 26 +- .../components/unary_devices/vent_pump.dm | 10 +- .../components/unary_devices/vent_scrubber.dm | 6 +- code/ATMOSPHERICS/datum_pipeline.dm | 4 +- code/modules/events/vent_clog.dm | 5 +- config/admins.txt | 3 +- 26 files changed, 304 insertions(+), 353 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index 16cebb0ac1a..a63f0147b77 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -3,7 +3,7 @@ dir = SOUTH initialize_directions = SOUTH|NORTH use_power = 1 - node_amount = 2 + device_type = BINARY /obj/machinery/atmospherics/components/binary/SetInitDirections() switch(dir) @@ -27,9 +27,8 @@ Iconnery Helpers */ -/obj/machinery/atmospherics/components/trinary/update_airs(var/a1, var/a2) - ..(list(1 = a1, 2 = a2)) - +/obj/machinery/atmospherics/components/binary/update_airs(var/a1, var/a2) + ..(list("a1" = a1, "a2" = a2)) /* Housekeeping and pipe network stuff */ @@ -39,13 +38,6 @@ Housekeeping and pipe network stuff var/node2_connect = dir var/node1_connect = turn(dir, 180) - var/node_connects[] = list(1 = node1_connect, 2 = node2_connect) - /* for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect)) - if(target.initialize_directions & get_dir(target,src)) - nodes[1] = target - break - for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect)) - if(target.initialize_directions & get_dir(target,src)) - nodes[2] = target - break */ + var/list/node_connects = new/list() + node_connects.Add(node1_connect, node2_connect) ..(node_connects) \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 1a19a8f3d1a..67b2420fbf5 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -18,8 +18,8 @@ /obj/machinery/atmospherics/binary/circulator/proc/return_transfer_air() - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] + var/datum/gas_mixture/air1 = airs["a1"] + var/datum/gas_mixture/air2 = airs["a2"] var/output_starting_pressure = air1.return_pressure() var/input_starting_pressure = air2.return_pressure() diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 296e02b20d3..975a3067855 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -42,8 +42,8 @@ Acts like a normal vent, but has an input AND output. /obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/New() ..() - var/datum/gas_mixture/air1 = airs[1] ; air1.volume = 1000 - var/datum/gas_mixture/air2 = airs[2] ; air2.volume = 1000 + var/datum/gas_mixture/air1 = airs["a1"] ; air1.volume = 1000 + var/datum/gas_mixture/air2 = airs["a2"] ; air2.volume = 1000 update_airs(air1, air2) /obj/machinery/atmospherics/binary/dp_vent_pump/update_icon_nopipes() @@ -65,8 +65,8 @@ Acts like a normal vent, but has an input AND output. if(!on) return 0 - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] + var/datum/gas_mixture/air1 = airs["a1"] + var/datum/gas_mixture/air2 = airs["a2"] var/datum/gas_mixture/environment = loc.return_air() var/environment_pressure = environment.return_pressure() @@ -88,7 +88,7 @@ Acts like a normal vent, but has an input AND output. loc.assume_air(removed) air_update_turf() - update_parents(list(1 = parents[1])) //this looks disgusting, but it works + update_parents(list("p1" = parents["p1"])) //this looks disgusting, but it works else //external -> output var/pressure_delta = 10000 @@ -107,7 +107,7 @@ Acts like a normal vent, but has an input AND output. air2.merge(removed) air_update_turf() - update_parents(list(2 = parents[2])) + update_parents(list("p2" = parents["p2"])) update_airs(air1, air2) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 130f0bf2e44..058dd3d088f 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -40,8 +40,8 @@ Passive gate is similar to the regular pump except: if(!on) return 0 - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] + var/datum/gas_mixture/air1 = airs["a1"] + var/datum/gas_mixture/air2 = airs["a2"] var/output_starting_pressure = air2.return_pressure() var/input_starting_pressure = air1.return_pressure() diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 36bc3e5242d..8f391d9cd33 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -48,8 +48,8 @@ Thus, the two variables affect pump operation are set in New(): if(!on) return 0 - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] + var/datum/gas_mixture/air1 = airs["a1"] + var/datum/gas_mixture/air2 = airs["a2"] var/output_starting_pressure = air2.return_pressure() diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index d441c659da8..61749cd2bf3 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -28,8 +28,8 @@ It's like a regular ol' straight pipe, but you can turn it on and off. open = 1 update_icon_nopipes() update_parents() - var/datum/pipeline/parent1 = parents[1] ; parent1.reconcile_air() - parents[1] = parent1 + var/datum/pipeline/parent1 = parents["p1"] ; parent1.reconcile_air() + parents["p1"] = parent1 investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", "atmos") /obj/machinery/atmospherics/binary/valve/proc/close() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 58abf65eddc..a5ace7d427c 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -48,8 +48,8 @@ Thus, the two variables affect pump operation are set in New(): if(!on) return 0 - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] + var/datum/gas_mixture/air1 = airs["a1"] + var/datum/gas_mixture/air2 = airs["a2"] // Pump mechanism just won't do anything if the pressure is too high/too low @@ -126,7 +126,7 @@ Thus, the two variables affect pump operation are set in New(): on = !on if("set_transfer_rate" in signal.data) - var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air1 = airs["a1"] transfer_rate = Clamp( text2num(signal.data["set_transfer_rate"]), 0, diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm index 2c0a9e2cc5e..1278760777d 100644 --- a/code/ATMOSPHERICS/components/components_base.dm +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -2,31 +2,40 @@ So much of atmospherics.dm was used solely by components, so separating this makes things all a lot cleaner. On top of that, now people can add component-speciic procs/vars if they want! */ + +#define UNARY 1 +#define BINARY 2 +#define TRINARY 3 + /obj/machinery/atmospherics/components/ var/welded = 0 //Used on pumps and scrubbers var/showpipe = 0 - var/list/nodes - var/list/parents - var/list/airs - var/node_amount -/obj/machinery/atmospherics/components/New() //doesn't work properly + var/list/nodes = new/list() + var/list/parents = new/list() + var/list/airs = new/list() + + var/device_type //used for initialization stuff + //UNARY = 1 + //BINARY = 2 + //TRINARY = 3 + +/obj/machinery/atmospherics/components/New() //it's workiiiing ..() - for(var/A = 1; A <= node_amount; A++) - var/datum/gas_mixture/air = A - - air = new - air.volume = 200 - airs[A] = air + for(var/I = 1; I <= device_type; I++) + var/datum/gas_mixture/A + A = new + A.volume = 200 + airs["a[I]"] = A /* Iconnery */ -/obj/machinery/atmospherics/components/proc/icon_addintact(var/obj/machinery/atmospherics/node, var/connected = 0) +/obj/machinery/atmospherics/components/proc/icon_addintact(var/obj/machinery/atmospherics/node) var/image/img = getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color) underlays += img - return connected | img.dir + return img.dir /obj/machinery/atmospherics/components/proc/icon_addbroken(var/connected = 0) var/unconnected = (~connected) & initialize_directions @@ -46,10 +55,9 @@ Iconnery var/connected = 0 - for(var/N in nodes) //adds intact pieces - var/obj/machinery/atmospherics/node = N - if(node) - connected = icon_addintact(node, connected) + for(var/obj/machinery/atmospherics/N in nodes) //adds intact pieces + if(N) + connected |= icon_addintact(N) icon_addbroken(connected) //adds broken pieces @@ -57,110 +65,102 @@ Iconnery Pipenet stuff; housekeeping */ /obj/machinery/atmospherics/components/Destroy() //works somewhat - for(var/N in nodes) - var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = parents[N] - - if(node) - node.disconnect(src) - node = null - nullifyPipenet(parent) - nodes[N] = node - parents[N] = parent + var/I = 1 + for(var/obj/machinery/atmospherics/N in nodes) + if(N) + N.disconnect(src) + N = null + nullifyPipenet(parents["p[I]"]) + nodes["n[I]"] = N + I++ ..() -/obj/machinery/atmospherics/components/atmosinit(var/list/node_connects) //doesn't work for another reason - for(var/N = 1; N <= node_amount; N++) - for(var/obj/machinery/atmospherics/target in get_step(src,node_connects[N])) +/obj/machinery/atmospherics/components/atmosinit(var/list/node_connects) //doesn't get called properly + var/I = 1 + for(var/N in node_connects) + for(var/obj/machinery/atmospherics/target in get_step(src,N)) if(target.initialize_directions & get_dir(target,src)) - nodes[N] = target + nodes["n[I]"] = target + break + I++ if(level == 2) showpipe = 1 update_icon() - return -/obj/machinery/atmospherics/components/construction() //doesn't work +/obj/machinery/atmospherics/components/construction() ..() - for(var/P in parents) - var/datum/pipeline/parent = P - parent.update = 1 - parents[P] = parent + for(var/I = 1; I <= device_type; I++) + var/datum/pipeline/P = new + P.update = 1 + parents["p[I]"] = P + I++ /obj/machinery/atmospherics/components/build_network() //doesn't work - for(var/P in parents) - var/datum/pipeline/parent = P - - if(parent) + for(var/I = 1; I <= device_type; I++) + var/datum/pipeline/P = parents["p[I]"] + if(P) return - parent = new /datum/pipeline() - parent.build_pipeline(src) - parents[P] = parent + P = new /datum/pipeline() + P.build_pipeline(src) + parents["p[I]"] = P /obj/machinery/atmospherics/components/disconnect(obj/machinery/atmospherics/reference) //works - for(var/N in nodes) - var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = parents[N] - - if(reference == node) - if(istype(node, /obj/machinery/atmospherics/pipe)) - qdel(parent) - parent = null - parents[N] = parent + var/I = 1 + for(var/obj/machinery/atmospherics/N in nodes) + if(reference == N) + if(istype(N, /obj/machinery/atmospherics/pipe)) + qdel(parents["p[I]"]) + parents["p[I]"] = null + I++ update_icon() -/obj/machinery/atmospherics/components/nullifyPipenet(datum/pipeline/pipeline) //untestable +/obj/machinery/atmospherics/components/nullifyPipenet(datum/pipeline/reference) //untestable ..() - for(var/P in parents) - var/datum/pipeline/parent = P - var/datum/gas_mixture/air = airs[P] + var/I = 1 + for(var/datum/pipeline/P in parents) + if(reference == P) + P.other_airs -= airs[I] + P = null + parents["p[I]"] = P + I++ - if(pipeline == parent) - parent.other_airs -= air - parent = null - parents[P] = parent +/obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/reference) //untestable; should work + var/I = 1 + for(var/datum/pipeline/P in parents) + if(reference == parent) + return airs["a[I]"] + I++ -/obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/pipeline) //untestable; should work - for(var/P in parents) - var/datum/pipeline/parent = P - var/datum/gas_mixture/air = airs[P] - - if(pipeline == parent) - return air - -/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/pipeline) - if(!pipeline) - return nodes //works - for(var/N in nodes) - var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = parents[N] - - if(parent == pipeline) - return list(node) //untestable; should work +/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) + if(!reference) + return nodes + var/I = 1 + for(var/obj/machinery/atmospherics/N in nodes) + if(parents["p[I]"] == reference) + return list(N) //untestable; should work + I++ /obj/machinery/atmospherics/components/setPipenet(datum/pipeline/pipeline, obj/machinery/atmospherics/A) - for(var/N in nodes) - var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = parents[N] - - if(A == node) - parent = pipeline - parents[N] = parent + var/I = 1 + for(var/obj/machinery/atmospherics/N in nodes) + if(A == N) + parents["p[I]"] = pipeline + I++ /obj/machinery/atmospherics/components/returnPipenet(obj/machinery/atmospherics/A) - for(var/N in nodes) - var/obj/machinery/atmospherics/node = N - var/datum/pipeline/parent = parents[N] - - if(A == node) - return parent //probably works + var/I = 1 + for(var/obj/machinery/atmospherics/N in nodes) + if(A == N) + return parents["p[I]"] //probably works + I++ /obj/machinery/atmospherics/components/replacePipenet(datum/pipeline/Old, datum/pipeline/New) - for(var/P in parents) - var/datum/pipeline/parent = P - - if(Old == parent) - parent = New - parents[P] = parent + var/I + for(var/datum/pipeline/P in parents) + if(Old == P) + P = New + parents["p[I]"] = P + I++ /obj/machinery/atmospherics/components/unsafe_pressure_release(var/mob/user, var/pressures) //untestable; I'll fix this last ..() @@ -171,15 +171,15 @@ Pipenet stuff; housekeeping var/datum/gas_mixture/environment = T.return_air() var/lost = null var/times_lost = 0 - for(var/A in airs) - var/datum/gas_mixture/air = A + for(var/A = 1; A <= device_type; A++) + var/datum/gas_mixture/air = airs[A] lost += pressures*environment.volume/(air.temperature * R_IDEAL_GAS_EQUATION) times_lost++ var/shared_loss = lost/times_lost var/datum/gas_mixture/to_release - for(var/A in airs) - var/datum/gas_mixture/air = A + for(var/A = 1; A <= device_type; A++) + var/datum/gas_mixture/air = airs[A] if(!to_release) to_release = air.remove(shared_loss) continue @@ -201,21 +201,23 @@ I think this is NanoUI? /* Helpers */ -/obj/machinery/atmospherics/components/proc/get_airs() - return -/obj/machinery/atmospherics/components/proc/get_nodes() - return -/obj/machinery/atmospherics/components/proc/get_parents() - return - /obj/machinery/atmospherics/components/proc/update_airs(var/list/L) - for(var/N in L) - var/datum/gas_mixture/air = L[N] - airs[N] = air + var/I = 1 + for(var/datum/gas_mixture/air in L) + airs["a[I]"] = air + I++ /obj/machinery/atmospherics/components/proc/update_parents(var/list/L = parents) - for(var/N in L) - if(!N) + var/I = 1 + for(var/datum/pipeline/parent in L) + if(!parent) continue - var/datum/pipeline/parent = N ; parent.update = 1 - parents[N] = parent \ No newline at end of file + parent.update = 1 + parents["p[I]"] = parent + I++ +/obj/machinery/atmospherics/components/proc/init_airs() + return +/obj/machinery/atmospherics/components/proc/init_nodes() + return +/obj/machinery/atmospherics/components/proc/init_parents() + return \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 5841c279c02..0047cb3d359 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -5,7 +5,7 @@ #define FILTER_CARBONDIOXIDE 3 #define FILTER_NITROUSOXIDE 4 -/obj/machinery/atmospherics/trinary/filter +/obj/machinery/atmospherics/components/trinary/filter icon_state = "filter_off" density = 0 @@ -34,46 +34,41 @@ Filter types: var/frequency = 0 var/datum/radio_frequency/radio_connection -/obj/machinery/atmospherics/trinary/filter/flipped +/obj/machinery/atmospherics/components/trinary/filter/flipped icon_state = "filter_off_f" flipped = 1 -/obj/machinery/atmospherics/trinary/filter/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/components/trinary/filter/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency if(frequency) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) -/obj/machinery/atmospherics/trinary/filter/Destroy() +/obj/machinery/atmospherics/components/trinary/filter/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() -/obj/machinery/atmospherics/trinary/filter/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) - var/image/img = getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", get_dir(src,node), node.pipe_color) - overlays += img - return ..() - -/obj/machinery/atmospherics/trinary/filter/icon_addbroken(var/connected) - var/unconnected = (~connected) & initialize_directions - for(var/direction in cardinal) - if(unconnected & direction) - underlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_exposed", direction) - overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) - -/obj/machinery/atmospherics/trinary/filter/update_icon() +/obj/machinery/atmospherics/components/trinary/filter/update_icon() overlays.Cut() + for(var/direction in cardinal) + if(direction & initialize_directions) + var/obj/machinery/atmospherics/node = findConnecting(direction) + if(node) + overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction, node.pipe_color) + continue + overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) ..() -/obj/machinery/atmospherics/trinary/filter/update_icon_nopipes() +/obj/machinery/atmospherics/components/trinary/filter/update_icon_nopipes() - if(!(stat & NOPOWER) && on && nodes[1] && nodes[2] && nodes[3]) + if(!(stat & NOPOWER) && on && nodes["n1"] && nodes["n2"] && nodes["n3"]) icon_state = "filter_on[flipped?"_f":""]" return icon_state = "filter_off[flipped?"_f":""]" -/obj/machinery/atmospherics/trinary/filter/power_change() +/obj/machinery/atmospherics/components/trinary/filter/power_change() var/old_stat = stat ..() if(stat & NOPOWER) @@ -81,14 +76,14 @@ Filter types: if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/trinary/filter/process_atmos() +/obj/machinery/atmospherics/components/trinary/filter/process_atmos() ..() if(!on) return 0 - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] - var/datum/gas_mixture/air3 = airs[3] + var/datum/gas_mixture/air1 = airs["a1"] + var/datum/gas_mixture/air2 = airs["a2"] + var/datum/gas_mixture/air3 = airs["a3"] var/output_starting_pressure = air3.return_pressure() @@ -156,11 +151,11 @@ Filter types: return 1 -/obj/machinery/atmospherics/trinary/filter/atmosinit() +/obj/machinery/atmospherics/components/trinary/filter/atmosinit() set_frequency(frequency) return ..() -/obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) +/obj/machinery/atmospherics/components/trinary/filter/attack_hand(user as mob) if(..()) return @@ -170,13 +165,13 @@ Filter types: ui_interact(user) -/obj/machinery/atmospherics/trinary/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_filter.tmpl", name, 400, 320, 0) -/obj/machinery/atmospherics/trinary/filter/get_ui_data() +/obj/machinery/atmospherics/components/trinary/filter/get_ui_data() var/data = list() data["on"] = on data["pressure_set"] = round(target_pressure*100) //Nano UI can't handle rounded non-integers, apparently. @@ -184,7 +179,7 @@ Filter types: data["filter_type"] = filter_type return data -/obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) +/obj/machinery/atmospherics/components/trinary/filter/Topic(href, href_list) if(..()) return usr.set_machine(src) diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 54f9995ccdb..1a05dac6625 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/trinary/mixer +/obj/machinery/atmospherics/components/trinary/mixer icon_state = "mixer_off" density = 0 @@ -16,39 +16,27 @@ //node 3 is the outlet, nodes 1 & 2 are intakes -/obj/machinery/atmospherics/trinary/mixer/flipped +/obj/machinery/atmospherics/components/trinary/mixer/flipped icon_state = "mixer_off_f" flipped = 1 -/obj/machinery/atmospherics/trinary/mixer/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) - var/image/img = getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", get_dir(src,node), node.pipe_color) - overlays += img - return ..() - -/obj/machinery/atmospherics/trinary/mixer/icon_addbroken(var/connected) - var/unconnected = (~connected) & initialize_directions - for(var/direction in cardinal) - if(unconnected & direction) - underlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_exposed", direction) - overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) - -/obj/machinery/atmospherics/trinary/mixer/update_icon() +/obj/machinery/atmospherics/components/trinary/mixer/update_icon() overlays.Cut() - ..() + for(var/direction in cardinal) + if(direction & (get_dir(src,nodes["n1"]) || get_dir(src,nodes["n2"]) || get_dir(src,nodes["n3"]))) + var/obj/machinery/atmospherics/node = findConnecting(direction) + overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction, node.pipe_color) + continue + overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) -<<<<<<< HEAD -/obj/machinery/atmospherics/trinary/mixer/update_icon_nopipes() - if(!(stat & NOPOWER) && on && node1 && node2 && node3) -======= /obj/machinery/atmospherics/components/trinary/mixer/update_icon_nopipes() - if(!(stat & NOPOWER) && on && nodes[1] && nodes[2] && nodes[3]) ->>>>>>> 3ee8754... 3rd pass OOP + if(!(stat & NOPOWER) && on && nodes["n1"] && nodes["n2"] && nodes["n3"]) icon_state = "mixer_on[flipped?"_f":""]" return icon_state = "mixer_off[flipped?"_f":""]" -/obj/machinery/atmospherics/trinary/mixer/power_change() +/obj/machinery/atmospherics/components/trinary/mixer/power_change() var/old_stat = stat ..() if(stat & NOPOWER) @@ -56,19 +44,19 @@ if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/trinary/mixer/New() +/obj/machinery/atmospherics/components/trinary/mixer/New() ..() - var/datum/gas_mixture/air3 = airs[3] ; air3.volume = 300 - airs[3] = air3 + var/datum/gas_mixture/air3 = airs["a3"] ; air3.volume = 300 + airs["a3"] = air3 -/obj/machinery/atmospherics/trinary/mixer/process_atmos() +/obj/machinery/atmospherics/components/trinary/mixer/process_atmos() ..() if(!on) return 0 - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] - var/datum/gas_mixture/air3 = airs[3] + var/datum/gas_mixture/air1 = airs["a1"] + var/datum/gas_mixture/air2 = airs["a2"] + var/datum/gas_mixture/air3 = airs["a3"] var/output_starting_pressure = air3.return_pressure() @@ -114,17 +102,17 @@ air3.merge(removed2) if(transfer_moles1) - update_parents(list(1 = parents[1])) + update_parents(list("p1" = parents["p1"])) if(transfer_moles2) - update_parents(list(2 = parents[2])) + update_parents(list("p2" = parents["p2"])) update_airs(air1, air2, air3) - update_parents(list(3 = parents[3])) + update_parents(list("p3" = parents["p3"])) return 1 -/obj/machinery/atmospherics/trinary/mixer/attack_hand(user as mob) +/obj/machinery/atmospherics/components/trinary/mixer/attack_hand(user as mob) if(..()) return @@ -134,13 +122,13 @@ ui_interact(user) -/obj/machinery/atmospherics/trinary/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_mixer.tmpl", name, 400, 320, 0) -/obj/machinery/atmospherics/trinary/mixer/get_ui_data() +/obj/machinery/atmospherics/components/trinary/mixer/get_ui_data() var/data = list() data["on"] = on data["pressure_set"] = round(target_pressure*100) //Nano UI can't handle rounded non-integers, apparently. @@ -149,7 +137,7 @@ data["node2_concentration"] = round(node2_concentration*100) return data -/obj/machinery/atmospherics/trinary/mixer/Topic(href,href_list) +/obj/machinery/atmospherics/components/trinary/mixer/Topic(href,href_list) if(..()) return if(href_list["power"]) on = !on diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index cf548dd43b0..dda2ea802f1 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -3,7 +3,7 @@ dir = SOUTH initialize_directions = SOUTH|NORTH|WEST use_power = 1 - node_amount = 3 + device_type = TRINARY var/flipped = 0 @@ -21,24 +21,10 @@ /* Helpers */ - /obj/machinery/atmospherics/components/trinary/update_airs(var/a1, var/a2, var/a3) - ..(list(1 = a1, 2 = a2, 3 = a3)) -/* -/obj/machinery/atmospherics/components/trinary/set_nodes(var/list/L) - var/obj/machinery/atmospherics/n1 = L[1] - var/obj/machinery/atmospherics/n2 = L[2] - var/obj/machinery/atmospherics/n3 = L[3] - - node1 = n1 - node2 = n2 - node3 = n3 -*/ - - + ..(list("a1" = a1, "a2" = a2, "a3" = a3)) /* Housekeeping and pipe network stuff -//WOW this got cut down thank you based OOP - duncathan */ /obj/machinery/atmospherics/components/trinary/atmosinit() @@ -62,18 +48,6 @@ Housekeeping and pipe network stuff node1_connect = turn(node1_connect, 180) node3_connect = turn(node3_connect, 180) - var/node_connects[] = list(1 = node1_connect, 2 = node2_connect, 3 = node3_connect) - - /* for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect)) - if(target.initialize_directions & get_dir(target,src)) - nodes[1] = target - break - for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect)) - if(target.initialize_directions & get_dir(target,src)) - nodes[2] = target - break - for(var/obj/machinery/atmospherics/target in get_step(src,node3_connect)) - if(target.initialize_directions & get_dir(target,src)) - nodes[3] = target - break */ + var/list/node_connects = new/list() + node_connects.Add(node1_connect, node2_connect, node3_connect) ..(node_connects) \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/unary_devices/Freezer.dm b/code/ATMOSPHERICS/components/unary_devices/Freezer.dm index bf3b888b1f3..025e5418735 100644 --- a/code/ATMOSPHERICS/components/unary_devices/Freezer.dm +++ b/code/ATMOSPHERICS/components/unary_devices/Freezer.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/cold_sink/freezer +/obj/machinery/atmospherics/components/unary/cold_sink/freezer name = "freezer" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "freezer" @@ -8,7 +8,7 @@ use_power = 1 current_heat_capacity = 1000 -/obj/machinery/atmospherics/unary/cold_sink/freezer/New() +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/New() ..() initialize_directions = dir component_parts = list() @@ -21,20 +21,20 @@ component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() -/obj/machinery/atmospherics/unary/cold_sink/freezer/construction() +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/construction() ..(dir,dir) -/obj/machinery/atmospherics/unary/cold_sink/freezer/RefreshParts() +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/RefreshParts() var/H var/T for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) H += M.rating for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) T += M.rating - min_temperature = max(T0C - (170 + (T*15)), 1) + min_temperature = T0C - (170 + (T*15)) current_heat_capacity = 1000 * ((H - 1) ** 2) -/obj/machinery/atmospherics/unary/cold_sink/freezer/attackby(obj/item/I, mob/user, params) +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "freezer-o", "freezer", I)) on = 0 update_icon() @@ -48,7 +48,7 @@ if(default_change_direction_wrench(user, I)) return -/obj/machinery/atmospherics/unary/cold_sink/freezer/update_icon() +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/update_icon() if(panel_open) icon_state = "freezer-o" else if(src.on) @@ -57,19 +57,19 @@ icon_state = "freezer" return -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ai(mob/user as mob) +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/attack_ai(mob/user as mob) return interact(user) -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_paw(mob/user as mob) +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/attack_paw(mob/user as mob) return interact(user) -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob) +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/attack_hand(mob/user as mob) return interact(user) -/obj/machinery/atmospherics/unary/cold_sink/freezer/interact(mob/user) +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/interact(mob/user) if(stat & (NOPOWER|BROKEN)) return - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] user.set_machine(src) var/temp_text = "" if(air_contents.temperature > (T0C - 20)) @@ -93,7 +93,7 @@ popup.set_content(dat) popup.open() -/obj/machinery/atmospherics/unary/cold_sink/freezer/Topic(href, href_list) +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/Topic(href, href_list) if(..()) return usr.set_machine(src) @@ -110,19 +110,19 @@ active_power_usage = (current_heat_capacity * (T20C - current_temperature) / 100) + idle_power_usage src.updateUsrDialog() -/obj/machinery/atmospherics/unary/cold_sink/freezer/process() +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/process() ..() src.updateUsrDialog() -/obj/machinery/atmospherics/unary/cold_sink/freezer/power_change() +/obj/machinery/atmospherics/components/unary/cold_sink/freezer/power_change() ..() if(stat & NOPOWER) on = 0 update_icon() -/obj/machinery/atmospherics/unary/heat_reservoir/heater/ +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/ name = "heater" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "heater" @@ -132,11 +132,11 @@ current_heat_capacity = 1000 -/obj/machinery/atmospherics/unary/heat_reservoir/heater/New() +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/New() ..() initialize_directions = dir var/obj/item/weapon/circuitboard/thermomachine/H = new /obj/item/weapon/circuitboard/thermomachine(null) - H.build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater + H.build_path = /obj/machinery/atmospherics/components/unary/heat_reservoir/heater H.name = "circuit board (Heater)" component_parts = list() component_parts += H @@ -148,10 +148,10 @@ component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() -/obj/machinery/atmospherics/unary/heat_reservoir/heater/construction() +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/construction() ..(dir,dir) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/RefreshParts() +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/RefreshParts() var/H var/T for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) @@ -161,7 +161,7 @@ max_temperature = T20C + (140 * T) current_heat_capacity = 1000 * ((H - 1) ** 2) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attackby(obj/item/I, mob/user, params) +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "heater-o", "heater", I)) on = 0 update_icon() @@ -175,7 +175,7 @@ if(default_change_direction_wrench(user, I)) return -/obj/machinery/atmospherics/unary/heat_reservoir/heater/update_icon() +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/update_icon() if(panel_open) icon_state = "heater-o" else if(src.on) @@ -184,17 +184,17 @@ icon_state = "heater" return -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user as mob) +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_paw(mob/user as mob) +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/attack_paw(mob/user as mob) return src.attack_hand(user) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/attack_hand(mob/user as mob) return interact(user) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/interact(mob/user) - var/datum/gas_mixture/air_contents = airs[1] +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/interact(mob/user) + var/datum/gas_mixture/air_contents = airs["a1"] if(stat & (NOPOWER|BROKEN)) return @@ -222,7 +222,7 @@ popup.set_content(dat) popup.open() -/obj/machinery/atmospherics/unary/heat_reservoir/heater/Topic(href, href_list) +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/Topic(href, href_list) if(..()) return usr.set_machine(src) @@ -241,11 +241,11 @@ src.add_fingerprint(usr) return -/obj/machinery/atmospherics/unary/heat_reservoir/heater/process() +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/process() ..() src.updateUsrDialog() -/obj/machinery/atmospherics/unary/heat_reservoir/heater/power_change() +/obj/machinery/atmospherics/components/unary/heat_reservoir/heater/power_change() ..() if(stat & NOPOWER) on = 0 diff --git a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm index 5f1254d37cd..15ddc423edd 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm @@ -16,7 +16,7 @@ if(showpipe) overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now - if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) icon_state = "cold_off" return @@ -27,7 +27,7 @@ ..() if(!on) return 0 - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] var/air_heat_capacity = air_contents.heat_capacity() var/combined_heat_capacity = current_heat_capacity + air_heat_capacity diff --git a/code/ATMOSPHERICS/components/unary_devices/cryo.dm b/code/ATMOSPHERICS/components/unary_devices/cryo.dm index 54b920c8e21..522826535b7 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cryo.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cryo.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/cryo_cell +/obj/machinery/atmospherics/components/unary/cryo_cell name = "cryo cell" icon = 'icons/obj/cryogenics.dmi' icon_state = "cell-off" @@ -14,7 +14,7 @@ state_open = 0 var/efficiency -/obj/machinery/atmospherics/unary/cryo_cell/New() +/obj/machinery/atmospherics/components/unary/cryo_cell/New() ..() initialize_directions = dir component_parts = list() @@ -27,17 +27,17 @@ component_parts += new /obj/item/stack/cable_coil(null, 1) -/obj/machinery/atmospherics/unary/cryo_cell/construction() +/obj/machinery/atmospherics/components/unary/cryo_cell/construction() ..(dir,dir) -/obj/machinery/atmospherics/unary/cryo_cell/RefreshParts() +/obj/machinery/atmospherics/components/unary/cryo_cell/RefreshParts() var/C for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) C += M.rating current_heat_capacity = 50 * C efficiency = C -/obj/machinery/atmospherics/unary/cryo_cell/Destroy() +/obj/machinery/atmospherics/components/unary/cryo_cell/Destroy() var/turf/T = loc T.contents += contents @@ -45,9 +45,9 @@ beaker.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube beaker = null ..() -/obj/machinery/atmospherics/unary/cryo_cell/process_atmos() +/obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos() ..() - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] if(air_contents) temperature_archived = air_contents.temperature @@ -55,21 +55,21 @@ if(abs(temperature_archived-air_contents.temperature) > 1) update_parents() -/obj/machinery/atmospherics/unary/cryo_cell/process() +/obj/machinery/atmospherics/components/unary/cryo_cell/process() ..() if(occupant) if(occupant.health >= 100) on = 0 open_machine() playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) - if(!nodes[1] || !is_operational()) + if(!nodes["n1"] || !is_operational()) return if(!on) updateDialog() return - if(airs[1]) + if(airs["a1"]) if (occupant) process_occupant() expel_gas() @@ -77,19 +77,19 @@ updateDialog() return 1 -/obj/machinery/atmospherics/unary/cryo_cell/MouseDrop_T(mob/target, mob/user) +/obj/machinery/atmospherics/components/unary/cryo_cell/MouseDrop_T(mob/target, mob/user) if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !iscarbon(target)) return close_machine(target) -/obj/machinery/atmospherics/unary/cryo_cell/relaymove(var/mob/user) +/obj/machinery/atmospherics/components/unary/cryo_cell/relaymove(var/mob/user) open_machine() -/obj/machinery/atmospherics/unary/cryo_cell/container_resist() +/obj/machinery/atmospherics/components/unary/cryo_cell/container_resist() open_machine() return -/obj/machinery/atmospherics/unary/cryo_cell/verb/move_eject() +/obj/machinery/atmospherics/components/unary/cryo_cell/verb/move_eject() set name = "Eject Cryo Cell" set desc = "Begin the release sequence inside the cryo tube." set category = "Object" @@ -109,7 +109,7 @@ return open_machine() -/obj/machinery/atmospherics/unary/cryo_cell/examine(mob/user) +/obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) ..() var/list/otherstuff = contents - beaker @@ -120,7 +120,7 @@ else user << "Seems empty." -/obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user) +/obj/machinery/atmospherics/components/unary/cryo_cell/attack_hand(mob/user) if(..()) return @@ -137,16 +137,16 @@ * * @return nothing */ -/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/components/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) if(user == occupant || user.stat || panel_open) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "cryo.tmpl", "Cryo Cell Control System", 520, 410, 1) //user.set_machine(src) -/obj/machinery/atmospherics/unary/cryo_cell/get_ui_data() +/obj/machinery/atmospherics/components/unary/cryo_cell/get_ui_data() // this is the data which will be sent to the ui - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] var/data = list() data["isOperating"] = on @@ -193,7 +193,7 @@ data["beakerContents"] = beakerContents return data -/obj/machinery/atmospherics/unary/cryo_cell/Topic(href, href_list) +/obj/machinery/atmospherics/components/unary/cryo_cell/Topic(href, href_list) if(usr == occupant || panel_open) return 0 // don't update UIs attached to this object @@ -224,7 +224,7 @@ add_fingerprint(usr) return 1 // update UIs attached to this object -/obj/machinery/atmospherics/unary/cryo_cell/attackby(obj/item/I, mob/user, params) +/obj/machinery/atmospherics/components/unary/cryo_cell/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(isrobot(user)) return @@ -254,7 +254,7 @@ default_deconstruction_crowbar(I) -/obj/machinery/atmospherics/unary/cryo_cell/open_machine() +/obj/machinery/atmospherics/components/unary/cryo_cell/open_machine() if(!state_open && !panel_open) on = 0 layer = 3 @@ -264,13 +264,13 @@ if(beaker) beaker.loc = src -/obj/machinery/atmospherics/unary/cryo_cell/close_machine(mob/living/carbon/M) +/obj/machinery/atmospherics/components/unary/cryo_cell/close_machine(mob/living/carbon/M) if(state_open && !panel_open) layer = 4 ..(M) return occupant -/obj/machinery/atmospherics/unary/cryo_cell/update_icon() +/obj/machinery/atmospherics/components/unary/cryo_cell/update_icon() if(panel_open) icon_state = "cell-o" return @@ -285,12 +285,12 @@ else icon_state = "cell-off" -/obj/machinery/atmospherics/unary/cryo_cell/power_change() +/obj/machinery/atmospherics/components/unary/cryo_cell/power_change() ..() update_icon() -/obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() - var/datum/gas_mixture/air_contents = airs[1] +/obj/machinery/atmospherics/components/unary/cryo_cell/proc/process_occupant() + var/datum/gas_mixture/air_contents = airs["a1"] if(air_contents.total_moles() < 10) return if(occupant) @@ -321,8 +321,8 @@ next_trans = 0 -/obj/machinery/atmospherics/unary/cryo_cell/proc/heat_gas_contents() - var/datum/gas_mixture/air_contents = airs[1] +/obj/machinery/atmospherics/components/unary/cryo_cell/proc/heat_gas_contents() + var/datum/gas_mixture/air_contents = airs["a1"] if(air_contents.total_moles() < 1) return @@ -334,8 +334,8 @@ update_airs(air_contents) -/obj/machinery/atmospherics/unary/cryo_cell/proc/expel_gas() - var/datum/gas_mixture/air_contents = airs[1] +/obj/machinery/atmospherics/components/unary/cryo_cell/proc/expel_gas() + var/datum/gas_mixture/air_contents = airs["a1"] if(air_contents.total_moles() < 1) return diff --git a/code/ATMOSPHERICS/components/unary_devices/generator_input.dm b/code/ATMOSPHERICS/components/unary_devices/generator_input.dm index 4ada963f9ee..e5c64ef8cab 100644 --- a/code/ATMOSPHERICS/components/unary_devices/generator_input.dm +++ b/code/ATMOSPHERICS/components/unary_devices/generator_input.dm @@ -9,7 +9,7 @@ var/update_cycle /obj/machinery/atmospherics/unary/generator_input/update_icon() - if(nodes[1]) + if(nodes["n1"]) icon_state = "intact" else icon_state = "exposed" @@ -17,4 +17,4 @@ return /obj/machinery/atmospherics/unary/generator_input/proc/return_exchange_air() - return airs[1] + return airs["a1"] diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm index adfbf6760cb..69c975f68ed 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm @@ -11,9 +11,9 @@ var/update_cycle /obj/machinery/atmospherics/unary/heat_exchanger/update_icon() - if(nodes[1]) + if(nodes["n1"]) icon_state = "he_intact" - var/obj/machinery/atmospherics/node = nodes[1] + var/obj/machinery/atmospherics/node = nodes["n1"] color = node.color else icon_state = "he_exposed" @@ -43,8 +43,8 @@ update_cycle = SSair.times_fired partner.update_cycle = SSair.times_fired - var/datum/gas_mixture/air_contents = airs[1] - var/datum/gas_mixture/partner_air_contents = partner.airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/partner_air_contents = partner.airs["a1"] var/air_heat_capacity = air_contents.heat_capacity() var/other_air_heat_capacity = partner_air_contents.heat_capacity() diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm index 838b8b6589d..8a8a1daa322 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm @@ -17,7 +17,7 @@ if(showpipe) overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now - if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) icon_state = "cold_off" return @@ -29,7 +29,7 @@ if(!on) return 0 - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] var/air_heat_capacity = air_contents.heat_capacity() var/combined_heat_capacity = current_heat_capacity + air_heat_capacity diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index d7976f8a1b8..3e558451c36 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -25,7 +25,7 @@ on = 1 /obj/machinery/atmospherics/unary/outlet_injector/update_icon_nopipes() - if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) icon_state = "inje_off" return @@ -45,7 +45,7 @@ if(!on || stat & NOPOWER) return 0 - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] if(air_contents.temperature > 0) var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION) @@ -64,7 +64,7 @@ if(on || injecting) return 0 - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] injecting = 1 @@ -132,7 +132,7 @@ if("set_volume_rate" in signal.data) var/number = text2num(signal.data["set_volume_rate"]) - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] volume_rate = Clamp(number, 0, air_contents.volume) if("status" in signal.data) diff --git a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm index 66a06d337d9..8b588a3e1f3 100644 --- a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm +++ b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm @@ -18,7 +18,7 @@ if(showpipe) overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) //it works for now - if(!nodes[1] || !on || stat & BROKEN) + if(!nodes["n1"] || !on || stat & BROKEN) icon_state = "o2gen_off" return @@ -27,15 +27,15 @@ /obj/machinery/atmospherics/unary/oxygen_generator/New() ..() - var/datum/gas_mixture/air_contents = airs[1] ; air_contents.volume = 50 - airs[1] = air_contents + var/datum/gas_mixture/air_contents = airs["a1"] ; air_contents.volume = 50 + airs["a1"] = air_contents /obj/machinery/atmospherics/unary/oxygen_generator/process_atmos() ..() if(!on) return 0 - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] var/total_moles = air_contents.total_moles() diff --git a/code/ATMOSPHERICS/components/unary_devices/tank.dm b/code/ATMOSPHERICS/components/unary_devices/tank.dm index 7c3b4e61e1b..922703853a9 100644 --- a/code/ATMOSPHERICS/components/unary_devices/tank.dm +++ b/code/ATMOSPHERICS/components/unary_devices/tank.dm @@ -11,7 +11,7 @@ /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide/New() ..() - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] air_contents.volume = volume air_contents.temperature = T20C air_contents.carbon_dioxide = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) @@ -23,7 +23,7 @@ /obj/machinery/atmospherics/components/unary/tank/toxins/New() ..() - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] air_contents.volume = volume air_contents.temperature = T20C air_contents.toxins = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) @@ -35,7 +35,7 @@ /obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b/New() ..() - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] air_contents.volume = volume air_contents.temperature = T0C var/datum/gas/oxygen_agent_b/trace_gas = new @@ -49,7 +49,7 @@ /obj/machinery/atmospherics/components/unary/tank/oxygen/New() ..() - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] air_contents.volume = volume air_contents.temperature = T20C air_contents.oxygen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) @@ -61,7 +61,7 @@ /obj/machinery/atmospherics/components/unary/tank/nitrogen/New() ..() - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] air_contents.volume = volume air_contents.temperature = T20C air_contents.nitrogen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) @@ -73,7 +73,7 @@ /obj/machinery/atmospherics/components/unary/tank/air/New() ..() - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] air_contents.volume = volume air_contents.temperature = T20C air_contents.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index e4a2198f120..d67ab08686a 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -3,10 +3,17 @@ dir = SOUTH initialize_directions = SOUTH layer = TURF_LAYER+0.1 - node_amount = 1 + device_type = UNARY /obj/machinery/atmospherics/components/unary/SetInitDirections() initialize_directions = dir + +/* +Helpers +*/ + +/obj/machinery/atmospherics/components/unary/update_airs(var/a1) + ..(list("a1" = a1)) /* Iconnery */ @@ -16,30 +23,21 @@ Iconnery update_icon() ..(intact) -/* -Helpers -*/ - -/obj/machinery/atmospherics/components/unary/update_airs(var/a1) - ..(list(1 = a1)) /* Housekeeping and pipe network stuff below */ /obj/machinery/atmospherics/components/unary/atmosinit() - var/node_connects = list(1 = dir) - /*for(var/obj/machinery/atmospherics/target in get_step(src,dir)) - if(target.initialize_directions & get_dir(target,src)) - nodes[1] = target - break*/ + var/list/node_connects = new/list() + node_connects.Add(dir) ..(node_connects) /obj/machinery/atmospherics/components/unary/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W) if(..()) return 0 initialize_directions = dir - var/obj/machinery/atmospherics/node = nodes[1] + var/obj/machinery/atmospherics/node = nodes["n1"] if(node) node.disconnect(src) node = null @@ -52,4 +50,4 @@ Housekeeping and pipe network stuff below node.addMember(src) build_network() . = 1 - nodes[1] = node \ No newline at end of file + nodes["n1"] = node \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 29ef8b1d7c1..3f8274919a5 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -18,7 +18,7 @@ var/external_pressure_bound = ONE_ATMOSPHERE var/internal_pressure_bound = 0 - var/pressure_checks = 1 + var/pressure_checks = 1 //TODO: make these defines //1: Do not pass external_pressure_bound //2: Do not pass internal_pressure_bound //3: Do not pass either @@ -65,7 +65,7 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/New() ..() - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] air_contents.volume = 1000 update_airs(air_contents) @@ -78,7 +78,7 @@ icon_state = "vent_welded" return - if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) icon_state = "vent_off" return @@ -91,7 +91,7 @@ ..() if(stat & (NOPOWER|BROKEN)) return - if (!nodes[1]) + if (!nodes["n1"]) on = 0 //broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0 if(!on) @@ -100,7 +100,7 @@ if(welded) return 0 - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] var/datum/gas_mixture/environment = loc.return_air() var/environment_pressure = environment.return_pressure() diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index a63fadf0c84..06bdd4738b6 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -56,7 +56,7 @@ icon_state = "scrub_welded" return - if(!nodes[1] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) icon_state = "scrub_off" return @@ -114,13 +114,13 @@ ..() if(stat & (NOPOWER|BROKEN)) return - if (!nodes[1]) + if (!nodes["n1"]) on = 0 //broadcast_status() if(!on || welded) return 0 - var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/air_contents = airs["a1"] var/datum/gas_mixture/environment = loc.return_air() if(scrubbing) diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index 6d3a308ed1c..1d110092c4f 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -207,8 +207,8 @@ var/pipenetwarnings = 10 GL += P.other_airs for(var/obj/machinery/atmospherics/binary/valve/V in P.other_atmosmch) if(V.open) - PL |= V.parents[1] - PL |= V.parents[2] + PL |= V.parents["p1"] + PL |= V.parents["p2"] for(var/obj/machinery/atmospherics/unary/portables_connector/C in P.other_atmosmch) if(C.connected_device) GL += C.portableConnectorReturnAir() diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 6a9fcf140e5..d535c7f1b4a 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -11,14 +11,15 @@ var/list/vents = list() /datum/round_event/vent_clog/announce() - priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") + priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") /datum/round_event/vent_clog/setup() endWhen = rand(25, 100) for(var/obj/machinery/atmospherics/unary/vent_scrubber/temp_vent in machines) if(temp_vent.loc.z == ZLEVEL_STATION) - if(temp_vent.parent.other_atmosmch.len > 20) + var/datum/pipeline/temp_vent_parent = temp_vent.parents["p1"] + if(temp_vent_parent.other_atmosmch.len > 20) vents += temp_vent if(!vents.len) return kill() diff --git a/config/admins.txt b/config/admins.txt index 4b3dac24043..98ade024c33 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -7,6 +7,7 @@ # NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn # # NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # ############################################################################################### +Dunc = Game Master Optimumtact = Host MrStonedOne = Game Master microscopics = Game Master @@ -87,4 +88,4 @@ Ahammer18 = Game Master ACCount12 = Game Master fayrik = Game Master shadowlight213 = Game Master -drovidicorv = Game Master \ No newline at end of file +drovidicorv = Game Master From cf6e258251fe9f37abdcb3fe5a6a100ffa3dbf69 Mon Sep 17 00:00:00 2001 From: duncathan Date: Sun, 5 Jul 2015 15:43:36 -0600 Subject: [PATCH 25/52] fixes parents; gets pipenets working again --- .../components/components_base.dm | 98 +++++++------------ code/ATMOSPHERICS/datum_pipeline.dm | 26 +++-- 2 files changed, 53 insertions(+), 71 deletions(-) diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm index 1278760777d..88f7be7e3c3 100644 --- a/code/ATMOSPHERICS/components/components_base.dm +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -11,9 +11,9 @@ On top of that, now people can add component-speciic procs/vars if they want! var/welded = 0 //Used on pumps and scrubbers var/showpipe = 0 - var/list/nodes = new/list() - var/list/parents = new/list() - var/list/airs = new/list() + var/list/obj/machinery/atmospherics/nodes = list() + var/list/datum/pipeline/parents = list() + var/list/datum/gas_mixture/airs = list() var/device_type //used for initialization stuff //UNARY = 1 @@ -23,8 +23,7 @@ On top of that, now people can add component-speciic procs/vars if they want! /obj/machinery/atmospherics/components/New() //it's workiiiing ..() for(var/I = 1; I <= device_type; I++) - var/datum/gas_mixture/A - A = new + var/datum/gas_mixture/A = new A.volume = 200 airs["a[I]"] = A /* @@ -46,7 +45,7 @@ Iconnery /obj/machinery/atmospherics/components/proc/update_icon_nopipes() return -/obj/machinery/atmospherics/components/update_icon() //works +/obj/machinery/atmospherics/components/update_icon() //not working update_icon_nopipes() underlays.Cut() @@ -56,8 +55,7 @@ Iconnery var/connected = 0 for(var/obj/machinery/atmospherics/N in nodes) //adds intact pieces - if(N) - connected |= icon_addintact(N) + connected |= icon_addintact(N) icon_addbroken(connected) //adds broken pieces @@ -65,102 +63,82 @@ Iconnery Pipenet stuff; housekeeping */ /obj/machinery/atmospherics/components/Destroy() //works somewhat - var/I = 1 - for(var/obj/machinery/atmospherics/N in nodes) + for(var/I = 1; I <= device_type; I++) + var/obj/machinery/atmospherics/N = nodes["n[I]"] if(N) N.disconnect(src) N = null nullifyPipenet(parents["p[I]"]) - nodes["n[I]"] = N - I++ ..() /obj/machinery/atmospherics/components/atmosinit(var/list/node_connects) //doesn't get called properly - var/I = 1 - for(var/N in node_connects) - for(var/obj/machinery/atmospherics/target in get_step(src,N)) + for(var/I = 1; I <= device_type; I++) + for(var/obj/machinery/atmospherics/target in get_step(src,node_connects[I])) if(target.initialize_directions & get_dir(target,src)) nodes["n[I]"] = target break - I++ if(level == 2) showpipe = 1 update_icon() /obj/machinery/atmospherics/components/construction() ..() - for(var/I = 1; I <= device_type; I++) - var/datum/pipeline/P = new + for(var/datum/pipeline/P in parents) P.update = 1 - parents["p[I]"] = P - I++ /obj/machinery/atmospherics/components/build_network() //doesn't work for(var/I = 1; I <= device_type; I++) - var/datum/pipeline/P = parents["p[I]"] - if(P) - return - P = new /datum/pipeline() - P.build_pipeline(src) - parents["p[I]"] = P + if(!parents["p[I]"]) + var/datum/pipeline/P = new + P.build_pipeline(src) + parents["p[I]"] = P -/obj/machinery/atmospherics/components/disconnect(obj/machinery/atmospherics/reference) //works - var/I = 1 - for(var/obj/machinery/atmospherics/N in nodes) - if(reference == N) - if(istype(N, /obj/machinery/atmospherics/pipe)) +/obj/machinery/atmospherics/components/disconnect(obj/machinery/atmospherics/reference) + for(var/I = 1; I <= device_type; I++) + if(reference == nodes["n[I]"]) + if(istype(nodes["n[I]"], /obj/machinery/atmospherics/pipe)) qdel(parents["p[I]"]) parents["p[I]"] = null - I++ + break update_icon() /obj/machinery/atmospherics/components/nullifyPipenet(datum/pipeline/reference) //untestable ..() - var/I = 1 - for(var/datum/pipeline/P in parents) + for(var/I = 1; I <= device_type; I++) + var/datum/pipeline/P = parents["p[I]"] if(reference == P) - P.other_airs -= airs[I] + P.other_airs -= airs["a[I]"] P = null - parents["p[I]"] = P - I++ + break -/obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/reference) //untestable; should work - var/I = 1 - for(var/datum/pipeline/P in parents) - if(reference == parent) +/obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/reference) + for(var/I = 1; I <= device_type; I++) + if(reference == parents["p[I]"]) return airs["a[I]"] - I++ /obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) if(!reference) return nodes - var/I = 1 - for(var/obj/machinery/atmospherics/N in nodes) + for(var/I = 1; I <= device_type; I++) if(parents["p[I]"] == reference) - return list(N) //untestable; should work - I++ + return list(nodes["n[I]"]) -/obj/machinery/atmospherics/components/setPipenet(datum/pipeline/pipeline, obj/machinery/atmospherics/A) - var/I = 1 - for(var/obj/machinery/atmospherics/N in nodes) - if(A == N) - parents["p[I]"] = pipeline - I++ +/obj/machinery/atmospherics/components/setPipenet(datum/pipeline/reference, obj/machinery/atmospherics/A) + for(var/I = 1; I <= device_type; I++) + if(A == nodes["n[I]"]) + parents["p[I]"] = reference + break /obj/machinery/atmospherics/components/returnPipenet(obj/machinery/atmospherics/A) - var/I = 1 - for(var/obj/machinery/atmospherics/N in nodes) - if(A == N) + for(var/I = 1; I <= device_type; I++) + if(A == nodes["n[I]"]) return parents["p[I]"] //probably works - I++ /obj/machinery/atmospherics/components/replacePipenet(datum/pipeline/Old, datum/pipeline/New) - var/I for(var/datum/pipeline/P in parents) if(Old == P) P = New - parents["p[I]"] = P - I++ + break /obj/machinery/atmospherics/components/unsafe_pressure_release(var/mob/user, var/pressures) //untestable; I'll fix this last ..() @@ -210,8 +188,6 @@ Helpers /obj/machinery/atmospherics/components/proc/update_parents(var/list/L = parents) var/I = 1 for(var/datum/pipeline/parent in L) - if(!parent) - continue parent.update = 1 parents["p[I]"] = parent I++ diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index 1d110092c4f..e9a36b1fe7b 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -3,7 +3,7 @@ var/list/datum/gas_mixture/other_airs = list() var/list/obj/machinery/atmospherics/pipe/members = list() - var/list/obj/machinery/atmospherics/other_atmosmch = list() + var/list/obj/machinery/atmospherics/components/other_atmosmch = list() var/update = 1 @@ -16,8 +16,8 @@ temporarily_store_air() for(var/obj/machinery/atmospherics/pipe/P in members) P.parent = null - for(var/obj/machinery/atmospherics/A in other_atmosmch) - A.nullifyPipenet(src) + for(var/obj/machinery/atmospherics/components/C in other_atmosmch) + C.nullifyPipenet(src) ..() /datum/pipeline/process() @@ -77,9 +77,9 @@ var/pipenetwarnings = 10 air.volume = volume -/datum/pipeline/proc/addMachineryMember(obj/machinery/atmospherics/A) - other_atmosmch |= A - var/datum/gas_mixture/G = A.returnPipenetAir(src) +/datum/pipeline/proc/addMachineryMember(obj/machinery/atmospherics/components/C) + other_atmosmch |= C + var/datum/gas_mixture/G = C.returnPipenetAir(src) other_airs |= G /datum/pipeline/proc/addMember(obj/machinery/atmospherics/A, obj/machinery/atmospherics/N) @@ -105,8 +105,8 @@ var/pipenetwarnings = 10 for(var/obj/machinery/atmospherics/pipe/S in E.members) S.parent = src air.merge(E.air) - for(var/obj/machinery/atmospherics/A in E.other_atmosmch) - A.replacePipenet(E, src) + for(var/obj/machinery/atmospherics/components/C in E.other_atmosmch) + C.replacePipenet(E, src) other_atmosmch.Add(E.other_atmosmch) other_airs.Add(E.other_airs) E.members.Cut() @@ -119,9 +119,15 @@ var/pipenetwarnings = 10 /obj/machinery/atmospherics/pipe/addMember(obj/machinery/atmospherics/A) parent.addMember(A, src) -/obj/machinery/atmospherics/addMember(obj/machinery/atmospherics/A) +/obj/machinery/atmospherics/components/addMember(obj/machinery/atmospherics/A) var/datum/pipeline/P = returnPipenet(A) - P.addMember(A, src) + for(var/I = 1; I <= parents.len; I++) + if(parents["p[I]"] == P) + P.addMember(A, src) + parents["p[I]"] = P + break + + /datum/pipeline/proc/temporarily_store_air() //Update individual gas_mixtures by volume ratio From 2a8cd506ef4be3b36b884544db4e615e6451c820 Mon Sep 17 00:00:00 2001 From: duncathan Date: Sun, 5 Jul 2015 17:27:16 -0600 Subject: [PATCH 26/52] fixes update_icon --- TODO.txt | 4 ++++ .../components/components_base.dm | 21 +++++++++++-------- .../components/trinary_devices/mixer.dm | 10 +++++---- 3 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 TODO.txt diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 00000000000..e2e3b29d086 --- /dev/null +++ b/TODO.txt @@ -0,0 +1,4 @@ +make air flow + likely an issue with multiple devices' process_atmos procs +fix runtime at line 51 in datum_pipeline.dm + problem with the return value of pipeline_expansion \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm index 88f7be7e3c3..bf05e33b7e4 100644 --- a/code/ATMOSPHERICS/components/components_base.dm +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -30,11 +30,11 @@ On top of that, now people can add component-speciic procs/vars if they want! Iconnery */ -/obj/machinery/atmospherics/components/proc/icon_addintact(var/obj/machinery/atmospherics/node) +/obj/machinery/atmospherics/components/proc/icon_addintact(var/obj/machinery/atmospherics/node, var/connected = 0) var/image/img = getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color) underlays += img - return img.dir + return connected | img.dir /obj/machinery/atmospherics/components/proc/icon_addbroken(var/connected = 0) var/unconnected = (~connected) & initialize_directions @@ -54,15 +54,16 @@ Iconnery var/connected = 0 - for(var/obj/machinery/atmospherics/N in nodes) //adds intact pieces - connected |= icon_addintact(N) - + for(var/I = 1; I <= device_type; I++) //adds intact pieces + var/obj/machinery/atmospherics/N = nodes["n[I]"] + connected = icon_addintact(N, connected) icon_addbroken(connected) //adds broken pieces + /* Pipenet stuff; housekeeping */ -/obj/machinery/atmospherics/components/Destroy() //works somewhat +/obj/machinery/atmospherics/components/Destroy() for(var/I = 1; I <= device_type; I++) var/obj/machinery/atmospherics/N = nodes["n[I]"] if(N) @@ -71,7 +72,7 @@ Pipenet stuff; housekeeping nullifyPipenet(parents["p[I]"]) ..() -/obj/machinery/atmospherics/components/atmosinit(var/list/node_connects) //doesn't get called properly +/obj/machinery/atmospherics/components/atmosinit(var/list/node_connects) for(var/I = 1; I <= device_type; I++) for(var/obj/machinery/atmospherics/target in get_step(src,node_connects[I])) if(target.initialize_directions & get_dir(target,src)) @@ -119,9 +120,11 @@ Pipenet stuff; housekeeping /obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) if(!reference) return nodes - for(var/I = 1; I <= device_type; I++) + var/I = 1 + for(var/obj/machinery/atmospherics/N in nodes) if(parents["p[I]"] == reference) - return list(nodes["n[I]"]) + return list(N) + I++ /obj/machinery/atmospherics/components/setPipenet(datum/pipeline/reference, obj/machinery/atmospherics/A) for(var/I = 1; I <= device_type; I++) diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 1a05dac6625..9d5a1860464 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -23,11 +23,13 @@ /obj/machinery/atmospherics/components/trinary/mixer/update_icon() overlays.Cut() for(var/direction in cardinal) - if(direction & (get_dir(src,nodes["n1"]) || get_dir(src,nodes["n2"]) || get_dir(src,nodes["n3"]))) + if(direction & initialize_directions) var/obj/machinery/atmospherics/node = findConnecting(direction) - overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction, node.pipe_color) - continue - overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) + if(node) + overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction, node.pipe_color) + continue + overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) + ..() /obj/machinery/atmospherics/components/trinary/mixer/update_icon_nopipes() if(!(stat & NOPOWER) && on && nodes["n1"] && nodes["n2"] && nodes["n3"]) From 0e004e3939d6237dffc4b3a79117ee7a3c7dfd15 Mon Sep 17 00:00:00 2001 From: duncathan Date: Sat, 11 Jul 2015 02:00:58 -0600 Subject: [PATCH 27/52] fixes runtimes --- TODO.txt | 4 +- .../binary_devices/binary_atmos_base.dm | 6 --- .../components/binary_devices/circulator.dm | 2 - .../components/binary_devices/dp_vent_pump.dm | 7 +-- .../components/binary_devices/passive_gate.dm | 1 - .../components/binary_devices/pump.dm | 1 - .../components/binary_devices/valve.dm | 1 - .../components/binary_devices/volume_pump.dm | 1 - .../components/components_base.dm | 50 +++++++------------ .../components/trinary_devices/filter.dm | 1 - .../components/trinary_devices/mixer.dm | 7 ++- .../trinary_devices/trinary_base.dm | 5 -- .../components/unary_devices/cold_sink.dm | 1 - .../components/unary_devices/cryo.dm | 5 +- .../unary_devices/heat_exchanger.dm | 3 -- .../components/unary_devices/heat_source.dm | 1 - .../unary_devices/outlet_injector.dm | 2 - .../unary_devices/oxygen_generator.dm | 1 - .../components/unary_devices/tank.dm | 8 +-- .../components/unary_devices/unary_base.dm | 6 --- .../components/unary_devices/vent_pump.dm | 2 - .../components/unary_devices/vent_scrubber.dm | 1 - code/modules/power/generator.dm | 14 +++--- 23 files changed, 32 insertions(+), 98 deletions(-) diff --git a/TODO.txt b/TODO.txt index e2e3b29d086..1187050192d 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,4 +1,2 @@ make air flow - likely an issue with multiple devices' process_atmos procs -fix runtime at line 51 in datum_pipeline.dm - problem with the return value of pipeline_expansion \ No newline at end of file + likely an issue with multiple devices' process_atmos procs; who knows \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index a63f0147b77..466898bc53a 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -24,12 +24,6 @@ Iconnery ..(intact) /* -Helpers -*/ - -/obj/machinery/atmospherics/components/binary/update_airs(var/a1, var/a2) - ..(list("a1" = a1, "a2" = a2)) -/* Housekeeping and pipe network stuff */ diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 67b2420fbf5..7f489bc6820 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -42,8 +42,6 @@ //Actually transfer the gas var/datum/gas_mixture/removed = air2.remove(transfer_moles) - update_airs(air1, air2) - update_parents() return removed diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 975a3067855..fc00c522f48 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -44,7 +44,6 @@ Acts like a normal vent, but has an input AND output. ..() var/datum/gas_mixture/air1 = airs["a1"] ; air1.volume = 1000 var/datum/gas_mixture/air2 = airs["a2"] ; air2.volume = 1000 - update_airs(air1, air2) /obj/machinery/atmospherics/binary/dp_vent_pump/update_icon_nopipes() overlays.Cut() @@ -88,7 +87,7 @@ Acts like a normal vent, but has an input AND output. loc.assume_air(removed) air_update_turf() - update_parents(list("p1" = parents["p1"])) //this looks disgusting, but it works + var/datum/pipeline/parent1 = parents["p1"] ; parent1.update = 1 else //external -> output var/pressure_delta = 10000 @@ -107,9 +106,7 @@ Acts like a normal vent, but has an input AND output. air2.merge(removed) air_update_turf() - update_parents(list("p2" = parents["p2"])) - - update_airs(air1, air2) + var/datum/pipeline/parent2 = parents["p2"] ; parent2.update = 1 return 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 058dd3d088f..5f64ec72075 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -62,7 +62,6 @@ Passive gate is similar to the regular pump except: var/datum/gas_mixture/removed = air1.remove(transfer_moles) air2.merge(removed) - update_airs(air1, air2) update_parents() diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 8f391d9cd33..f34cf5dc602 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -66,7 +66,6 @@ Thus, the two variables affect pump operation are set in New(): var/datum/gas_mixture/removed = air1.remove(transfer_moles) air2.merge(removed) - update_airs(air1, air2) update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index 61749cd2bf3..cb978048917 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -29,7 +29,6 @@ It's like a regular ol' straight pipe, but you can turn it on and off. update_icon_nopipes() update_parents() var/datum/pipeline/parent1 = parents["p1"] ; parent1.reconcile_air() - parents["p1"] = parent1 investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", "atmos") /obj/machinery/atmospherics/binary/valve/proc/close() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index a5ace7d427c..c1beaa8ae8f 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -65,7 +65,6 @@ Thus, the two variables affect pump operation are set in New(): air2.merge(removed) - update_airs(air1, air2) update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm index bf05e33b7e4..9952c58ccdd 100644 --- a/code/ATMOSPHERICS/components/components_base.dm +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -20,7 +20,7 @@ On top of that, now people can add component-speciic procs/vars if they want! //BINARY = 2 //TRINARY = 3 -/obj/machinery/atmospherics/components/New() //it's workiiiing +/obj/machinery/atmospherics/components/New() ..() for(var/I = 1; I <= device_type; I++) var/datum/gas_mixture/A = new @@ -55,8 +55,9 @@ Iconnery var/connected = 0 for(var/I = 1; I <= device_type; I++) //adds intact pieces - var/obj/machinery/atmospherics/N = nodes["n[I]"] - connected = icon_addintact(N, connected) + if(nodes["n[I]"]) + connected = icon_addintact(nodes["n[I]"], connected) + icon_addbroken(connected) //adds broken pieces @@ -103,11 +104,11 @@ Pipenet stuff; housekeeping break update_icon() -/obj/machinery/atmospherics/components/nullifyPipenet(datum/pipeline/reference) //untestable +/obj/machinery/atmospherics/components/nullifyPipenet(datum/pipeline/reference) ..() for(var/I = 1; I <= device_type; I++) - var/datum/pipeline/P = parents["p[I]"] - if(reference == P) + if(reference == parents["p[I]"]) + var/datum/pipeline/P = parents["p[I]"] P.other_airs -= airs["a[I]"] P = null break @@ -117,14 +118,13 @@ Pipenet stuff; housekeeping if(reference == parents["p[I]"]) return airs["a[I]"] -/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) - if(!reference) - return nodes - var/I = 1 - for(var/obj/machinery/atmospherics/N in nodes) - if(parents["p[I]"] == reference) - return list(N) - I++ +/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) //runtime + if(reference) + for(var/I = 1; I <= device_type; I++) + if(nodes["n[I]"]) + if(parents["p[I]"] == reference) + return list("n" = nodes["n1"]) + return nodes /obj/machinery/atmospherics/components/setPipenet(datum/pipeline/reference, obj/machinery/atmospherics/A) for(var/I = 1; I <= device_type; I++) @@ -135,7 +135,7 @@ Pipenet stuff; housekeeping /obj/machinery/atmospherics/components/returnPipenet(obj/machinery/atmospherics/A) for(var/I = 1; I <= device_type; I++) if(A == nodes["n[I]"]) - return parents["p[I]"] //probably works + return parents["p[I]"] /obj/machinery/atmospherics/components/replacePipenet(datum/pipeline/Old, datum/pipeline/New) for(var/datum/pipeline/P in parents) @@ -182,21 +182,7 @@ I think this is NanoUI? /* Helpers */ -/obj/machinery/atmospherics/components/proc/update_airs(var/list/L) - var/I = 1 - for(var/datum/gas_mixture/air in L) - airs["a[I]"] = air - I++ -/obj/machinery/atmospherics/components/proc/update_parents(var/list/L = parents) - var/I = 1 - for(var/datum/pipeline/parent in L) - parent.update = 1 - parents["p[I]"] = parent - I++ -/obj/machinery/atmospherics/components/proc/init_airs() - return -/obj/machinery/atmospherics/components/proc/init_nodes() - return -/obj/machinery/atmospherics/components/proc/init_parents() - return \ No newline at end of file +/obj/machinery/atmospherics/components/proc/update_parents() + for(var/datum/pipeline/parent in parents) + parent.update = 1 \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 0047cb3d359..69d80ef8b26 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -146,7 +146,6 @@ Filter types: air2.merge(filtered_out) air3.merge(removed) - update_airs(air1, air2, air3) update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 9d5a1860464..15bf4f2fdc8 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -104,13 +104,12 @@ air3.merge(removed2) if(transfer_moles1) - update_parents(list("p1" = parents["p1"])) + var/datum/pipeline/parent1 = parents["p1"] ; parent1.update = 1 if(transfer_moles2) - update_parents(list("p2" = parents["p2"])) + var/datum/pipeline/parent2 = parents["p2"] ; parent2.update = 1 - update_airs(air1, air2, air3) - update_parents(list("p3" = parents["p3"])) + var/datum/pipeline/parent3 = parents["p3"] ; parent3.update = 1 return 1 diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index dda2ea802f1..5ea47605266 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -19,11 +19,6 @@ initialize_directions = WEST|NORTH|EAST /* -Helpers -*/ -/obj/machinery/atmospherics/components/trinary/update_airs(var/a1, var/a2, var/a3) - ..(list("a1" = a1, "a2" = a2, "a3" = a3)) -/* Housekeeping and pipe network stuff */ diff --git a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm index 15ddc423edd..722f56926fd 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm @@ -38,7 +38,6 @@ air_contents.temperature = combined_energy/combined_heat_capacity //todo: have current temperature affected. require power to bring down current temperature again - update_airs(air_contents) if(abs(old_temperature-air_contents.temperature) > 1) update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/cryo.dm b/code/ATMOSPHERICS/components/unary_devices/cryo.dm index 522826535b7..bcacd991678 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cryo.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cryo.dm @@ -331,8 +331,6 @@ if(combined_heat_capacity > 0) var/combined_energy = T20C * current_heat_capacity + air_heat_capacity * air_contents.temperature air_contents.temperature = combined_energy/combined_heat_capacity - update_airs(air_contents) - /obj/machinery/atmospherics/components/unary/cryo_cell/proc/expel_gas() var/datum/gas_mixture/air_contents = airs["a1"] @@ -344,5 +342,4 @@ expel_gas = air_contents.remove(remove_amount) expel_gas.temperature = T20C //Lets expel hot gas and see if that helps people not die as they are removed loc.assume_air(expel_gas) - air_update_turf() - update_airs(air_contents) + air_update_turf() \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm index 69c975f68ed..7e3f5294525 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm @@ -66,7 +66,4 @@ if(abs(other_old_temperature-partner_air_contents.temperature) > 1) partner.update_parents() - update_airs(air_contents) - partner.update_airs(partner_air_contents) - return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm index 8a8a1daa322..0b86ff02248 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm @@ -43,5 +43,4 @@ if(abs(old_temperature-air_contents.temperature) > 1) update_parents() - update_airs(air_contents) return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index 3e558451c36..ed548bbd3e2 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -55,7 +55,6 @@ loc.assume_air(removed) air_update_turf() - update_airs(air_contents) update_parents() return 1 @@ -75,7 +74,6 @@ loc.assume_air(removed) - update_airs(air_contents) update_parents() flick("inje_inject", src) diff --git a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm index 8b588a3e1f3..f4da714e038 100644 --- a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm +++ b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm @@ -47,7 +47,6 @@ air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen) air_contents.oxygen += added_oxygen - update_airs(air_contents) update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/tank.dm b/code/ATMOSPHERICS/components/unary_devices/tank.dm index 922703853a9..a9ecac258ae 100644 --- a/code/ATMOSPHERICS/components/unary_devices/tank.dm +++ b/code/ATMOSPHERICS/components/unary_devices/tank.dm @@ -15,7 +15,6 @@ air_contents.volume = volume air_contents.temperature = T20C air_contents.carbon_dioxide = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) - update_airs(air_contents) /obj/machinery/atmospherics/components/unary/tank/toxins icon_state = "orange" @@ -27,7 +26,6 @@ air_contents.volume = volume air_contents.temperature = T20C air_contents.toxins = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) - update_airs(air_contents) /obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b icon_state = "orange_2" @@ -41,7 +39,6 @@ var/datum/gas/oxygen_agent_b/trace_gas = new trace_gas.moles = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) air_contents.trace_gases += trace_gas - update_airs(air_contents) /obj/machinery/atmospherics/components/unary/tank/oxygen icon_state = "blue" @@ -53,7 +50,6 @@ air_contents.volume = volume air_contents.temperature = T20C air_contents.oxygen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) - update_airs(air_contents) /obj/machinery/atmospherics/components/unary/tank/nitrogen icon_state = "red" @@ -65,7 +61,6 @@ air_contents.volume = volume air_contents.temperature = T20C air_contents.nitrogen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) - update_airs(air_contents) /obj/machinery/atmospherics/components/unary/tank/air icon_state = "grey" @@ -77,5 +72,4 @@ air_contents.volume = volume air_contents.temperature = T20C air_contents.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) - air_contents.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) - update_airs(air_contents) \ No newline at end of file + air_contents.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index d67ab08686a..e06e0658a89 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -9,12 +9,6 @@ initialize_directions = dir /* -Helpers -*/ - -/obj/machinery/atmospherics/components/unary/update_airs(var/a1) - ..(list("a1" = a1)) -/* Iconnery */ diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 3f8274919a5..530620bcb86 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -67,7 +67,6 @@ ..() var/datum/gas_mixture/air_contents = airs["a1"] air_contents.volume = 1000 - update_airs(air_contents) /obj/machinery/atmospherics/unary/vent_pump/update_icon_nopipes() overlays.Cut() @@ -138,7 +137,6 @@ air_contents.merge(removed) air_update_turf() - update_airs(air_contents) update_parents() return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 06bdd4738b6..a984cd46aa2 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -169,7 +169,6 @@ air_contents.merge(removed) air_update_turf() - update_airs(air_contents) update_parents() return 1 diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index f103978dd5c..0f8711f2fef 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -106,14 +106,12 @@ // update icon overlays only if displayed level has changed if(hot_air) - var/datum/gas_mixture/circ2_air1 = circ2.airs[1] + var/datum/gas_mixture/circ2_air1 = circ2.airs["a1"] circ2_air1.merge(hot_air) - circ2.update_airs(circ2_air1) if(cold_air) - var/datum/gas_mixture/circ1_air1 = circ1.airs[1] + var/datum/gas_mixture/circ1_air1 = circ1.airs["a1"] circ1_air1.merge(cold_air) - circ1.update_airs(circ1_air1) var/genlev = max(0, min( round(11*lastgen / 100000), 11)) var/circ = "[circ1 && circ1.last_pressure_delta > 0 ? "1" : "0"][circ2 && circ2.last_pressure_delta > 0 ? "1" : "0"]" @@ -135,10 +133,10 @@ if(!powernet) t += "Unable to connect to the power network!" else if(circ1 && circ2) - var/datum/gas_mixture/circ1_air1 = circ1.airs[1] - var/datum/gas_mixture/circ1_air2 = circ1.airs[2] - var/datum/gas_mixture/circ2_air1 = circ2.airs[1] - var/datum/gas_mixture/circ2_air2 = circ2.airs[2] + var/datum/gas_mixture/circ1_air1 = circ1.airs["a1"] + var/datum/gas_mixture/circ1_air2 = circ1.airs["a2"] + var/datum/gas_mixture/circ2_air1 = circ2.airs["a1"] + var/datum/gas_mixture/circ2_air2 = circ2.airs["a2"] t += "
" From 03bf88bfbac0eab1f3d851e15bcc8c6f79448fe9 Mon Sep 17 00:00:00 2001 From: Miauw Date: Sat, 11 Jul 2015 13:39:54 +0200 Subject: [PATCH 28/52] Adds a huge message to sec borgs telling them not to be shitheads. --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 6409b17e945..41ebf4b0440 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -198,7 +198,7 @@ icon_state = "secborg" animation_length = 28 modtype = "Sec" - //speed = -1 Secborgs have nerfed tasers now, so the speed boost is not necessary + src << "While you have picked the security module, you still have to follow your laws, NOT Space Law. For Asimov, this means you must follow criminals' orders unless there is a law 1 reason not to." status_flags &= ~CANPUSH feedback_inc("cyborg_security",1) From e074fb7856bfe65fd824ae8c574e15686abdbcd9 Mon Sep 17 00:00:00 2001 From: duncathan Date: Sat, 11 Jul 2015 18:45:19 -0600 Subject: [PATCH 29/52] makes air flow; fixes EVERYTHING --- .../AsteroidStation/Asteroidstation.dmm | 844 ++++++------- .../MetaStation/MetaStation.v41A.II.dmm | 1106 ++++++++--------- _maps/map_files/MetaStation/z4.dmm | 42 +- _maps/map_files/MetaStation/z5.dmm | 40 +- _maps/map_files/MiniStation/MiniStation.dmm | 260 ++-- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 938 +++++++------- _maps/map_files/generic/z4.dmm | 42 +- _maps/map_files/generic/z5.dmm | 40 +- code/ATMOSPHERICS/atmospherics.dm | 27 +- .../binary_devices/binary_atmos_base.dm | 2 +- .../components/binary_devices/circulator.dm | 8 +- .../components/binary_devices/dp_vent_pump.dm | 26 +- .../components/binary_devices/passive_gate.dm | 30 +- .../components/binary_devices/pump.dm | 30 +- .../components/binary_devices/valve.dm | 30 +- .../components/binary_devices/volume_pump.dm | 30 +- .../components/components_base.dm | 32 +- .../components/trinary_devices/filter.dm | 6 +- .../components/trinary_devices/mixer.dm | 6 +- .../trinary_devices/trinary_base.dm | 2 +- .../components/unary_devices/cold_sink.dm | 8 +- .../unary_devices/generator_input.dm | 6 +- .../unary_devices/heat_exchanger.dm | 12 +- .../components/unary_devices/heat_source.dm | 8 +- .../unary_devices/outlet_injector.dm | 24 +- .../unary_devices/oxygen_generator.dm | 10 +- .../unary_devices/portables_connector.dm | 2 +- .../components/unary_devices/unary_base.dm | 4 +- .../components/unary_devices/vent_pump.dm | 70 +- .../components/unary_devices/vent_scrubber.dm | 30 +- code/ATMOSPHERICS/datum_pipeline.dm | 5 +- code/ATMOSPHERICS/pipes/pipes.dm | 4 + code/game/machinery/atmo_control.dm | 8 +- .../atmoalter/portable_atmospherics.dm | 9 +- code/game/machinery/atmoalter/zvent.dm | 2 +- code/game/machinery/constructable_frame.dm | 10 +- code/game/machinery/pipe/construction.dm | 48 +- code/game/mecha/mecha.dm | 9 +- code/game/objects/effects/spiders.dm | 9 +- code/game/objects/items/blueprints.dm | 4 +- .../objects/items/weapons/tanks/watertank.dm | 2 +- code/modules/events/alien_infestation.dm | 5 +- code/modules/events/spider_infestation.dm | 5 +- code/modules/events/vent_clog.dm | 2 +- code/modules/flufftext/Hallucination.dm | 6 +- .../mob/living/carbon/human/species.dm | 4 +- code/modules/mob/living/carbon/life.dm | 2 +- code/modules/mob/living/carbon/monkey/life.dm | 2 +- code/modules/mob/living/living.dm | 4 +- code/modules/mob/living/ventcrawling.dm | 14 +- code/modules/power/generator.dm | 8 +- .../reagents/reagent_containers/glass.dm | 2 +- icons/obj/atmospherics/binary_devices.dmi | Bin 22000 -> 0 bytes .../components/binary_devices.dmi | Bin 0 -> 22360 bytes .../{ => components}/relief_valve.dmi | Bin .../{ => components}/trinary_devices.dmi | Bin .../{ => components}/unary_devices.dmi | Bin tgstation.dme | 1 + 58 files changed, 1941 insertions(+), 1939 deletions(-) delete mode 100644 icons/obj/atmospherics/binary_devices.dmi create mode 100644 icons/obj/atmospherics/components/binary_devices.dmi rename icons/obj/atmospherics/{ => components}/relief_valve.dmi (100%) rename icons/obj/atmospherics/{ => components}/trinary_devices.dmi (100%) rename icons/obj/atmospherics/{ => components}/unary_devices.dmi (100%) diff --git a/_maps/map_files/AsteroidStation/Asteroidstation.dmm b/_maps/map_files/AsteroidStation/Asteroidstation.dmm index 16b06b51dd4..fde7189fbbd 100644 --- a/_maps/map_files/AsteroidStation/Asteroidstation.dmm +++ b/_maps/map_files/AsteroidStation/Asteroidstation.dmm @@ -81,7 +81,7 @@ "abC" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/extinguisher_cabinet{pixel_y = 30},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 8},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abE" = (/obj/machinery/camera{c_tag = "Arrivals Hallway"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) -"abF" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) +"abF" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abG" = (/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abH" = (/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 8},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abI" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) @@ -92,7 +92,7 @@ "abN" = (/obj/machinery/newscaster{dir = 8; pixel_x = -32},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abO" = (/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abP" = (/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) -"abQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) +"abQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "abT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/secondary/entry{name = "Arrivals Lounge"}) @@ -106,7 +106,7 @@ "acb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "acc" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "acd" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) -"ace" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) +"ace" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "acf" = (/obj/docking_port/stationary{dir = 8; dwidth = 2; height = 12; id = "ferry_home"; name = "port bay 2"; width = 5},/turf/space,/area/space) "acg" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/fpmaint) "ach" = (/obj/machinery/vending/snack,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) @@ -151,7 +151,7 @@ "acU" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "acV" = (/obj/machinery/light_construct{dir = 8},/turf/simulated/floor/plating,/area/construction) "acW" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plating,/area/construction) -"acX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating,/area/construction) +"acX" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating,/area/construction) "acY" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/construction) "acZ" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/construction) "ada" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel,/area/construction) @@ -159,7 +159,7 @@ "adc" = (/obj/machinery/light_construct{dir = 4},/turf/simulated/floor/plating,/area/construction) "add" = (/obj/machinery/vending/coffee,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "ade" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/snacks/chips,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola,/turf/simulated/floor/fancy/carpet,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) -"adf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) +"adf" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "adg" = (/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/fancy/carpet,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "adh" = (/obj/structure/table/wood,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/fancy/carpet,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "adi" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light_switch{dir = 4; pixel_x = 22},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) @@ -167,7 +167,7 @@ "adk" = (/obj/structure/rack,/obj/item/weapon/aiModule/supplied/oxygen,/obj/item/weapon/aiModule/supplied/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/hallway/secondary/entry{name = "Arrivals Lounge"}) "adl" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plating,/area/construction) "adm" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/construction) -"adn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plating,/area/construction) +"adn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plating,/area/construction) "ado" = (/turf/simulated/floor/plasteel,/area/construction) "adp" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai) "adq" = (/obj/structure/cable/orange{icon_state = "0-2"; d1 = 1; d2 = 2},/obj/machinery/power/smes,/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -270,9 +270,9 @@ "afj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "afk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Customs Deck Maintenance"; req_access_txt = "1"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "afl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint{name = "Customs Desk"}) -"afm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/security/checkpoint{name = "Customs Desk"}) +"afm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/security/checkpoint{name = "Customs Desk"}) "afn" = (/turf/simulated/floor/plasteel,/area/security/checkpoint{name = "Customs Desk"}) -"afo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/checkpoint{name = "Customs Desk"}) +"afo" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/checkpoint{name = "Customs Desk"}) "afp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint{name = "Customs Desk"}) "afq" = (/obj/machinery/door/airlock/security{desc = "Have your documents ready."; name = "Customs Desk"; req_access = null; req_access_txt = "1"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/security/checkpoint{name = "Customs Desk"}) "afr" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/junction,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/hallway/primary/fore{name = "Fore Hallway"}) @@ -302,11 +302,11 @@ "afP" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/checkpoint{name = "Customs Desk"}) "afQ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/checkpoint{name = "Customs Desk"}) "afR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/hallway/primary/fore{name = "Fore Hallway"}) -"afS" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) +"afS" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) "afT" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) "afU" = (/obj/machinery/door/window{name = "Gateway Chamber"; req_access_txt = "62"},/obj/structure/cable/orange{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) "afV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) -"afW" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) +"afW" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) "afX" = (/obj/structure/cable/orange{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/apmaint) "afY" = (/obj/machinery/conveyor_switch{id = "Recycler2"},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/apmaint) "afZ" = (/obj/machinery/mineral/stacking_unit_console{machinedir = 4},/turf/simulated/wall,/area/maintenance/apmaint) @@ -327,7 +327,7 @@ "ago" = (/turf/simulated/wall,/area/storage/tech) "agp" = (/turf/simulated/wall/r_wall,/area/storage/tech) "agq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/fore{name = "Fore Hallway"}) -"agr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore{name = "Fore Hallway"}) +"agr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore{name = "Fore Hallway"}) "ags" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/fore{name = "Fore Hallway"}) "agt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/gateway) "agu" = (/obj/structure/table,/obj/structure/sign/biohazard{pixel_x = -32},/obj/item/weapon/storage/firstaid/regular,/obj/machinery/camera{c_tag = "Gateway"; dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel,/area/gateway) @@ -391,16 +391,16 @@ "ahA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/gateway) "ahB" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/gateway) "ahC" = (/obj/machinery/conveyor{dir = 1; id = "Recycler2"},/turf/simulated/floor/plating,/area/maintenance/apmaint) -"ahD" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint) +"ahD" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint) "ahE" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/apmaint) "ahF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/camera{c_tag = "Cargo Atmospheric Control"},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/apmaint) -"ahG" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/apmaint) +"ahG" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/apmaint) "ahH" = (/obj/structure/rack,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 8},/area/maintenance/apmaint) "ahI" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/apmaint) "ahJ" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 4},/area/maintenance/apmaint) "ahK" = (/obj/machinery/camera/motion{c_tag = "AI Chamber Port"; dir = 4},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) -"ahL" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) -"ahM" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) +"ahL" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) +"ahM" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) "ahN" = (/obj/machinery/camera/motion{c_tag = "AI Chamber Starboard"; dir = 9},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) "ahO" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/solar/auxstarboard) "ahP" = (/obj/machinery/door_control{id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = -26; req_access_txt = "19"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/storage/eva) @@ -416,15 +416,15 @@ "ahZ" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/storage/tech) "aia" = (/obj/machinery/door/poddoor/shutters{id = "gateshutter"; name = "Gateway Access Shutter"},/turf/simulated/floor/plasteel,/area/gateway) "aib" = (/obj/machinery/light_switch{pixel_x = -6; pixel_y = -22},/obj/machinery/door_control{id = "gateshutter"; name = "Gateway Shutter Control"; pixel_x = 6; pixel_y = -26; req_access_txt = "19"},/turf/simulated/floor/plasteel,/area/gateway) -"aic" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/closet/emcloset,/obj/machinery/light,/obj/machinery/newscaster{hitstaken = 1; pixel_y = -32},/turf/simulated/floor/plasteel,/area/gateway) +"aic" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/closet/emcloset,/obj/machinery/light,/obj/machinery/newscaster{hitstaken = 1; pixel_y = -32},/turf/simulated/floor/plasteel,/area/gateway) "aid" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/orange,/obj/machinery/power/apc{name = "Gateway APC"; pixel_y = -24},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/gateway) -"aie" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/structure/closet/secure_closet/exile,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/gateway) +"aie" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/structure/closet/secure_closet/exile,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/gateway) "aif" = (/obj/structure/closet/l3closet/scientist,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/gateway) "aig" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/apmaint) "aih" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 1},/turf/simulated/floor/plating,/area/maintenance/apmaint) "aii" = (/obj/machinery/power/apc{dir = 8; name = "Cargo Bay Maintenance APC"; pixel_x = -24},/obj/structure/cable/orange{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/maintenance/apmaint) -"aij" = (/obj/machinery/atmospherics/binary/pump/on{dir = 1},/turf/simulated/floor/plating,/area/maintenance/apmaint) -"aik" = (/obj/machinery/atmospherics/binary/pump/on,/turf/simulated/floor/plating,/area/maintenance/apmaint) +"aij" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 1},/turf/simulated/floor/plating,/area/maintenance/apmaint) +"aik" = (/obj/machinery/atmospherics/components/binary/pump/on,/turf/simulated/floor/plating,/area/maintenance/apmaint) "ail" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plating,/area/maintenance/apmaint) "aim" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/maintenance/apmaint) "ain" = (/turf/simulated/floor/plating,/area/maintenance/apmaint) @@ -439,9 +439,9 @@ "aiw" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel,/area/storage/eva) "aix" = (/obj/structure/cable/orange{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 8; name = "Tech Storage APC"; pixel_x = -24},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/storage/tech) "aiy" = (/turf/simulated/floor/plasteel,/area/storage/tech) -"aiz" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/storage/tech) +"aiz" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/storage/tech) "aiA" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/storage/tech) -"aiB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/storage/tech) +"aiB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/storage/tech) "aiC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/storage/tech) "aiD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/storage/tech) "aiE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/storage/tech) @@ -469,7 +469,7 @@ "aja" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) "ajb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) "ajc" = (/obj/machinery/status_display{pixel_y = -32},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) -"ajd" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) +"ajd" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "aje" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ajf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ajg" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -518,7 +518,7 @@ "ajX" = (/turf/simulated/wall/r_wall,/area/maintenance/auxsolarstarboard) "ajY" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "ajZ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) -"aka" = (/obj/machinery/atmospherics/binary/pump/on{dir = 1},/obj/machinery/camera{c_tag = "Mining Atmospherics Control"; dir = 8; network = list("SS13","Medbay")},/turf/simulated/floor/plating,/area/maintenance/fpmaint) +"aka" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 1},/obj/machinery/camera{c_tag = "Mining Atmospherics Control"; dir = 8; network = list("SS13","Medbay")},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "akb" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "akc" = (/obj/machinery/door/airlock/maintenance{name = "Maintenance Storage"; req_access_txt = "12"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "akd" = (/obj/structure/table/reinforced,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/storage/eva) @@ -570,14 +570,14 @@ "akX" = (/obj/structure/cable,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/solar/auxstarboard) "akY" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/turf/simulated/floor/plating/asteroid/airless,/area/space) "akZ" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plating,/area/maintenance/fpmaint) -"ala" = (/obj/machinery/atmospherics/binary/pump/on,/turf/simulated/floor/plating,/area/maintenance/fpmaint) +"ala" = (/obj/machinery/atmospherics/components/binary/pump/on,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "alb" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "alc" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ald" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ale" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "alf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/storage/eva) "alg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/table/reinforced,/obj/item/clothing/head/welding,/obj/item/weapon/crowbar,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/storage/eva) -"alh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/storage/eva) +"alh" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/storage/eva) "ali" = (/obj/structure/cable/orange{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/orange{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/storage/eva) "alj" = (/obj/structure/cable/orange{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/storage/eva) "alk" = (/obj/machinery/door/airlock/maintenance{name = "E.V.A. Maintenance"; req_access_txt = "18"; req_one_access_txt = "0"},/obj/structure/cable/orange{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -630,10 +630,10 @@ "amf" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor/wood,/area/security/vacantoffice) "amg" = (/obj/structure/table/wood,/obj/item/weapon/folder/red,/turf/simulated/floor/wood,/area/security/vacantoffice) "amh" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/fore{name = "Fore Hallway"}) -"ami" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore{name = "Fore Hallway"}) +"ami" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore{name = "Fore Hallway"}) "amj" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/fore{name = "Fore Hallway"}) "amk" = (/obj/structure/table/reinforced,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/quartermaster/office) -"aml" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/quartermaster/office) +"aml" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/quartermaster/office) "amm" = (/obj/machinery/computer/secure_data,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/quartermaster/office) "amn" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plasteel{dir = 9; icon_state = "brown"},/area/quartermaster/qm) "amo" = (/obj/structure/closet,/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/quartermaster/qm) @@ -687,7 +687,7 @@ "ank" = (/obj/structure/closet/crate/rcd,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/storage/eva) "anl" = (/obj/structure/cable/orange{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "anm" = (/turf/simulated/floor/wood,/area/security/vacantoffice) -"ann" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/security/vacantoffice) +"ann" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/security/vacantoffice) "ano" = (/obj/structure/table/wood,/turf/simulated/floor/wood,/area/security/vacantoffice) "anp" = (/obj/structure/table/wood,/obj/item/weapon/folder/yellow,/turf/simulated/floor/wood,/area/security/vacantoffice) "anq" = (/obj/structure/table/wood,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/newscaster/security_unit{pixel_x = 30},/turf/simulated/floor/wood,/area/security/vacantoffice) @@ -703,18 +703,18 @@ "anA" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/quartermaster/office) "anB" = (/obj/effect/landmark/start{name = "Cargo Technician"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/quartermaster/office) "anC" = (/obj/machinery/conveyor_switch{id = "QMLoad"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/quartermaster/office) -"anD" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/quartermaster/office) +"anD" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/quartermaster/office) "anE" = (/turf/simulated/floor/plasteel{icon_state = "loadingarea"},/area/quartermaster/office) "anF" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/turf/simulated/floor/plasteel{icon_state = "loadingarea"},/area/quartermaster/office) "anG" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/apmaint) "anH" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/tcommsat/server) "anI" = (/obj/machinery/door/airlock/glass_engineering{desc = "The main server room. Dangerously cold to protect the sensitive machinery."; name = "Telecommunications Server Room"; req_access_txt = "61"},/turf/simulated/floor/plasteel,/area/tcommsat/server) "anJ" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) -"anK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) +"anK" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) "anL" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) "anM" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "anN" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) -"anO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) +"anO" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) "anP" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "anQ" = (/obj/machinery/door/airlock/engineering{name = "Fore Starboard Solar Access"; req_access_txt = "10"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/maintenance/auxsolarstarboard) "anR" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/maintenance/auxsolarstarboard) @@ -722,7 +722,7 @@ "anT" = (/obj/effect/landmark{name = "carpspawn"},/turf/space,/area/space) "anU" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) "anV" = (/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) -"anW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) +"anW" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "anX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "anY" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "anZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) @@ -738,7 +738,7 @@ "aoj" = (/obj/structure/cable/orange{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/storage/eva) "aok" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/storage/eva) "aol" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/storage/eva) -"aom" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/storage/eva) +"aom" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/storage/eva) "aon" = (/obj/structure/dispenser/oxygen,/obj/machinery/light_switch{dir = 4; pixel_x = 22},/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/storage/eva) "aoo" = (/obj/structure/cable/orange{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "aop" = (/obj/machinery/door/airlock/maintenance{name = "Vacant Office Maintenance"; req_access_txt = "32"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/security/vacantoffice) @@ -751,8 +751,8 @@ "aow" = (/obj/structure/closet/secure_closet/security/cargo,/obj/machinery/camera{c_tag = "Cargo Security Post"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/quartermaster/office) "aox" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/wiki/security_space_law,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/quartermaster/office) "aoy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/disposalpipe/segment,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/qm) -"aoz" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/qm) -"aoA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/qm) +"aoz" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/qm) +"aoA" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/qm) "aoB" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/qm) "aoC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/qm) "aoD" = (/obj/machinery/door/airlock/mining{desc = "The office of the station's chief Supply officer, the Quartermaster. Smells faintly of swag."; name = "Quartermaster's Office"; req_access_txt = "41"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/qm) @@ -791,7 +791,7 @@ "apk" = (/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "apl" = (/obj/machinery/door/airlock/glass_mining{desc = "Storage of the Company's specialized mining gear."; name = "Mining Equipment Room"; req_access_txt = "54"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/miningdock) "apm" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) -"apn" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) +"apn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "apo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "app" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/miningdock) "apq" = (/obj/machinery/power/apc{dir = 8; name = "Mining APC"; pixel_x = -24},/obj/structure/cable/orange{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/quartermaster/miningdock) @@ -808,13 +808,13 @@ "apB" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/fancy/carpet,/area/security/vacantoffice) "apC" = (/obj/structure/table/wood,/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/fancy/carpet,/area/security/vacantoffice) "apD" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/fancy/carpet,/area/security/vacantoffice) -"apE" = (/obj/structure/stool/bed/chair/office/dark,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/wood,/area/security/vacantoffice) +"apE" = (/obj/structure/stool/bed/chair/office/dark,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/wood,/area/security/vacantoffice) "apF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/security/vacantoffice) "apG" = (/obj/machinery/light_switch{dir = 4; pixel_x = 22},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/security/vacantoffice) "apH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/security/vacantoffice) "apI" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/fore{name = "Fore Hallway"}) "apJ" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/quartermaster/office) -"apK" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "red"},/area/quartermaster/office) +"apK" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "red"},/area/quartermaster/office) "apL" = (/obj/structure/reagent_dispensers/peppertank{pixel_x = 30},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/quartermaster/office) "apM" = (/obj/structure/stool/bed/chair/office/dark,/obj/effect/landmark/start{name = "Quartermaster"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 10; icon_state = "brown"},/area/quartermaster/qm) "apN" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor/plasteel{icon_state = "brown"},/area/quartermaster/qm) @@ -831,7 +831,7 @@ "apY" = (/obj/structure/closet/secure_closet/cargotech,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/quartermaster/office) "apZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/quartermaster/office) "aqa" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) -"aqb" = (/obj/machinery/door_control{id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = -24; req_access_txt = "50"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"aqb" = (/obj/machinery/door_control{id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = -24; req_access_txt = "50"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) "aqc" = (/obj/structure/table/glass,/obj/machinery/cell_charger,/obj/machinery/light,/turf/simulated/floor/plasteel,/area/quartermaster/office) "aqd" = (/obj/structure/table/glass,/obj/item/device/taperecorder/empty,/obj/item/device/tape/random,/turf/simulated/floor/plasteel,/area/quartermaster/office) "aqe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/apmaint) @@ -846,7 +846,7 @@ "aqn" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aqo" = (/obj/machinery/porta_turret{ai = 1; dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) "aqp" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) -"aqq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) +"aqq" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "aqr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "aqs" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "aqt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) @@ -885,14 +885,14 @@ "ara" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/grille,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/apmaint) "arb" = (/obj/machinery/power/apc{dir = 4; name = "Telecommunications Control APC"; pixel_x = 24},/obj/structure/cable/blue{icon_state = "0-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/tcommsat/computer) "arc" = (/obj/machinery/computer/message_monitor,/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/tcommsat/computer) -"ard" = (/obj/machinery/computer/telecomms/monitor{network = "tcommsat"},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/tcommsat/computer) +"ard" = (/obj/machinery/computer/telecomms/monitor{network = "tcommsat"},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/tcommsat/computer) "are" = (/obj/machinery/computer/telecomms/server{network = "tcommsat"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellowcorner"},/area/tcommsat/computer) "arf" = (/obj/structure/table,/obj/item/weapon/paper/monitorkey,/obj/item/device/multitool,/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 8},/area/tcommsat/computer) -"arg" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/tcommsat/computer) +"arg" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/tcommsat/computer) "arh" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/tcommsat/computer) "ari" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer) "arj" = (/obj/structure/table/glass,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/tcommsat/computer) -"ark" = (/obj/structure/table/glass,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/tcommsat/computer) +"ark" = (/obj/structure/table/glass,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/tcommsat/computer) "arl" = (/obj/structure/table/glass,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/tcommsat/computer) "arm" = (/obj/machinery/computer/station_alert,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "arn" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) @@ -940,7 +940,7 @@ "asd" = (/obj/structure/filingcabinet/filingcabinet,/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; name = "Cargo Bay Requests Console"; pixel_y = 30},/obj/machinery/camera{c_tag = "Cargo Port"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/quartermaster/office) "ase" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "browncorner"},/area/quartermaster/office) "asf" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/quartermaster/office) -"asg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"asg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) "ash" = (/obj/structure/table/glass,/obj/item/weapon/storage/firstaid/regular,/obj/machinery/light{dir = 4},/obj/machinery/newscaster{pixel_x = 32},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/office) "asi" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) "asj" = (/turf/simulated/floor/plasteel{icon_state = "warndarkcorners"; dir = 8},/area/quartermaster/office) @@ -965,7 +965,7 @@ "asC" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "asD" = (/obj/machinery/door/airlock/highsecurity{desc = "A small monitoring station to allow the AI to keep tabs on the crew and (usually) help."; name = "AI Monitoring Station"; req_access_txt = "16"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "asE" = (/obj/machinery/turretid{control_area = "\improper AI Upload Chamber"; name = "AI Upload turret control"; pixel_x = 8; pixel_y = 24},/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = -8; pixel_y = 22},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) -"asF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) +"asF" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "asG" = (/obj/machinery/camera/motion{c_tag = "AI Upload Foyer"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "asH" = (/obj/machinery/door/airlock/highsecurity{desc = "A small maintenance area to allow the AI to be repaired in case of damage, and for its borgs to recharge."; name = "AI Maintenance Control"; req_access_txt = "16"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "asI" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) @@ -975,11 +975,11 @@ "asM" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/miningdock) "asN" = (/obj/machinery/door/airlock/glass_mining{desc = "Storage of the Company's specialized mining gear."; name = "Mining Equipment Room"; req_access_txt = "54"},/turf/simulated/floor/plasteel{icon_state = "brown"},/area/quartermaster/miningdock) "asO" = (/obj/machinery/mineral/equipment_vendor,/obj/machinery/status_display{pixel_x = -32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) -"asP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) +"asP" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "asQ" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/quartermaster/miningdock) "asR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/construction/hallway{name = "Port Central Hallway"}) -"asS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) -"asT" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) +"asS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) +"asT" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "asU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "asV" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/camera{c_tag = "Port Central Hallway Starboard"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/construction/hallway{name = "Port Central Hallway"}) "asW" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/machinery/requests_console{department = "Tool Storage"; name = "Tool Storage Requests Console"; pixel_y = 30},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) @@ -999,7 +999,7 @@ "atk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "atl" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "atm" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/quartermaster/office) -"atn" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"atn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) "ato" = (/obj/machinery/computer/ordercomp,/turf/simulated/floor/plasteel,/area/quartermaster/office) "atp" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id = "packageExternal"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/office) "atq" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/quartermaster/office) @@ -1015,22 +1015,22 @@ "atA" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) "atB" = (/obj/structure/closet/crate/hydroponics,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) "atC" = (/obj/structure/closet/crate,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) -"atD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) +"atD" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) "atE" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/maintenance/apmaint) "atF" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/apmaint) "atG" = (/obj/machinery/computer/telecomms/traffic{network = "tcommsat"},/obj/item/device/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Telecoms)"; pixel_x = -30},/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"atH" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/machinery/requests_console{announcementConsole = 1; department = "Telecoms Admin"; departmentType = 5; name = "Telecoms Requests Console"; pixel_y = -32},/turf/simulated/floor/plasteel,/area/tcommsat/computer) +"atH" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/machinery/requests_console{announcementConsole = 1; department = "Telecoms Admin"; departmentType = 5; name = "Telecoms Requests Console"; pixel_y = -32},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "atI" = (/obj/machinery/light/small,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"atJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "yellowcorner"},/area/tcommsat/computer) +"atJ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "yellowcorner"},/area/tcommsat/computer) "atK" = (/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/tcommsat/computer) "atL" = (/obj/machinery/disposal,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/disposalpipe/trunk,/obj/machinery/camera{c_tag = "Telecommunications"; dir = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellowcorner"},/area/tcommsat/computer) -"atM" = (/obj/structure/rack,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/receiver,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/broadcaster,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/tcommsat/computer) +"atM" = (/obj/structure/rack,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/receiver,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/broadcaster,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/tcommsat/computer) "atN" = (/obj/structure/table/glass,/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/tcommsat/computer) "atO" = (/obj/structure/table/glass,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/tcommsat/computer) "atP" = (/obj/machinery/computer/crew,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "atQ" = (/obj/machinery/camera{c_tag = "AI Monitoring Station"; dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "atR" = (/obj/effect/landmark/start{name = "Cyborg"},/obj/machinery/power/apc{dir = 8; name = "AI Upload Access APC"; pixel_x = -24},/obj/machinery/light_switch{pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/blue{icon_state = "0-4"; d1 = 1; d2 = 2},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) -"atS" = (/obj/effect/landmark/start{name = "Cyborg"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/blue{icon_state = "2-8"; d1 = 1; d2 = 2},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) +"atS" = (/obj/effect/landmark/start{name = "Cyborg"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/blue{icon_state = "2-8"; d1 = 1; d2 = 2},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "atT" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/effect/landmark/start{name = "Cyborg"},/obj/machinery/light,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "atU" = (/obj/machinery/recharge_station,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "atV" = (/obj/structure/cable/blue{icon_state = "0-2"},/obj/machinery/power/apc{dir = 8; name = "Disposal APC"; pixel_x = -24},/turf/simulated/floor/plating,/area/maintenance/disposal) @@ -1089,7 +1089,7 @@ "auW" = (/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/space) "auX" = (/obj/machinery/door/airlock/external{name = "Mining External Airlock"; req_access_txt = "54"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/miningdock) "auY" = (/obj/machinery/door/airlock/external{name = "Mining External Airlock"; req_access_txt = "54"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) -"auZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) +"auZ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "ava" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/glass_mining{desc = "Storage of the Company's specialized mining gear."; name = "Mining E.V.A."; req_access_txt = "54"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/miningdock) "avb" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "avc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) @@ -1097,11 +1097,11 @@ "ave" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/construction/hallway{name = "Port Central Hallway"}) "avf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/construction/hallway{name = "Port Central Hallway"}) "avg" = (/obj/machinery/door/airlock/glass{desc = "The primary storage area for tools aboard the station. Any spaceman knows this place by heart."; name = "Tool Storage"},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) -"avh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) +"avh" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) "avi" = (/turf/simulated/floor/plasteel{icon_state = "bot"},/area/storage/primary{name = "Tool Storage"}) "avj" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) "avk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/storage/primary{name = "Tool Storage"}) -"avl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) +"avl" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) "avm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) "avn" = (/obj/machinery/door/airlock/glass{desc = "The primary storage area for tools aboard the station. Any spaceman knows this place by heart."; name = "Tool Storage"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) "avo" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/hallway/secondary/construction{name = "Fore Central Hallway"}) @@ -1110,7 +1110,7 @@ "avr" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor/plasteel{dir = 1; icon_state = "browncorner"},/area/quartermaster/office) "avs" = (/obj/item/weapon/stamp,/obj/item/weapon/stamp/denied{force = 15; pixel_x = 3; pixel_y = 2},/obj/structure/table/glass,/turf/simulated/floor/plasteel,/area/quartermaster/office) "avt" = (/obj/structure/table/glass,/obj/item/weapon/hand_labeler,/turf/simulated/floor/plasteel,/area/quartermaster/office) -"avu" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"avu" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) "avv" = (/obj/effect/landmark/start{name = "Cargo Technician"},/turf/simulated/floor/plasteel,/area/quartermaster/office) "avw" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/quartermaster/office) "avx" = (/obj/machinery/light_switch{pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "browncorner"},/area/quartermaster/office) @@ -1157,7 +1157,7 @@ "awm" = (/obj/structure/disposalpipe/segment,/obj/structure/stool{pixel_y = 8},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) "awn" = (/obj/structure/stool{pixel_y = 8},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) "awo" = (/obj/structure/table,/obj/item/weapon/weldingtool,/obj/item/weapon/crowbar,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/storage/primary{name = "Tool Storage"}) -"awp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"awp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) "awq" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) "awr" = (/obj/machinery/door/airlock/glass_mining{desc = "The station's cargo bay, where supplies can be ordered and certain items sold for a profit back to CentCom."; name = "Cargo Bay"; req_access_txt = "31"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warningcorner"},/area/quartermaster/office) "aws" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/quartermaster/office) @@ -1167,7 +1167,7 @@ "aww" = (/obj/structure/table/glass,/obj/item/stack/wrapping_paper,/obj/item/stack/wrapping_paper,/obj/item/stack/packageWrap{pixel_x = 2; pixel_y = -3},/obj/item/stack/packageWrap{pixel_x = 2; pixel_y = -3},/obj/item/stack/packageWrap{pixel_x = 2; pixel_y = -3},/obj/item/stack/packageWrap{pixel_x = 2; pixel_y = -3},/obj/item/stack/packageWrap{pixel_x = 2; pixel_y = -3},/obj/item/stack/packageWrap{pixel_x = 2; pixel_y = -3},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/quartermaster/office) "awx" = (/obj/structure/table/glass,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/quartermaster/office) "awy" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) -"awz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) +"awz" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) "awA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) "awB" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) "awC" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/quartermaster/office) @@ -1177,10 +1177,10 @@ "awG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "awH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "awI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"awJ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"awJ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "awK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "awL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=StHF2"; location = "AI"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"awM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"awM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "awN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "awO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "awP" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -1199,7 +1199,7 @@ "axc" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/construction/hallway{name = "Port Central Hallway"}) "axd" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "axe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 4},/area/construction/hallway{name = "Port Central Hallway"}) -"axf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) +"axf" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "axg" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 4},/area/construction/hallway{name = "Port Central Hallway"}) "axh" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/storage/primary{name = "Tool Storage"}) "axi" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/device/analyzer,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/storage/primary{name = "Tool Storage"}) @@ -1330,7 +1330,7 @@ "azD" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "azE" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "azF" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"azG" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) +"azG" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "azH" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "azI" = (/obj/machinery/washing_machine,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "azJ" = (/obj/machinery/washing_machine,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) @@ -1354,7 +1354,7 @@ "aAb" = (/obj/machinery/conveyor{dir = 4; id = "Mininginput"},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "aAc" = (/obj/machinery/conveyor{dir = 9; id = "Mininginput"},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "aAd" = (/turf/simulated/floor/plasteel{dir = 10; icon_state = "brown"},/area/quartermaster/miningdock) -"aAe" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) +"aAe" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "aAf" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "aAg" = (/obj/structure/table,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen,/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/miningdock) "aAh" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/construction/hallway{name = "Port Central Hallway"}) @@ -1363,12 +1363,12 @@ "aAk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "aAl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass{name = "Fore Central Hallway"},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aAm" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) -"aAn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) +"aAn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aAo" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) -"aAp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) +"aAp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aAq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aAr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=Arrival"; location = "FrCH1"},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) -"aAs" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) +"aAs" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aAt" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=StHF1"; location = "FrCH2"},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aAu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aAv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass{name = "Starboard Hallway"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -1376,11 +1376,11 @@ "aAx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=AI"; location = "StHF1"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aAy" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aAz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) -"aAA" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/obj/machinery/door_control{id = "Dorm1"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) +"aAA" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/obj/machinery/door_control{id = "Dorm1"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aAB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) -"aAC" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/blue,/obj/machinery/door_control{id = "Dorm2"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) -"aAD" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/yellow,/obj/machinery/door_control{id = "Dorm3"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) -"aAE" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/purple,/obj/machinery/door_control{id = "Dorm4"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) +"aAC" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/blue,/obj/machinery/door_control{id = "Dorm2"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) +"aAD" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/yellow,/obj/machinery/door_control{id = "Dorm3"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) +"aAE" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/purple,/obj/machinery/door_control{id = "Dorm4"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aAF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aAG" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aAH" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=StAF2"; location = "StHF2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -1453,7 +1453,7 @@ "aBW" = (/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/structure/table,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "aBX" = (/obj/structure/table,/obj/item/device/flashlight/lantern,/obj/item/device/flashlight/lantern,/turf/simulated/floor/plasteel{icon_state = "browncorner"; dir = 4},/area/quartermaster/miningdock) "aBY" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "browncorner"},/area/construction/hallway{name = "Port Central Hallway"}) -"aBZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) +"aBZ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "aCa" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/construction/hallway{name = "Port Central Hallway"}) "aCb" = (/obj/machinery/door/airlock/glass{name = "Fore Port Transit"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/construction/hallway{name = "Port Central Hallway"}) "aCc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/construction/hallway{name = "Port Central Hallway"}) @@ -1467,7 +1467,7 @@ "aCk" = (/turf/simulated/wall,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aCl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/glass{desc = "Supplies available to the public to help with cultivating the open hydro trays in the hallways."; name = "Public Garden Storage"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "green"},/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aCm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/status_display{pixel_x = -32},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"aCn" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"aCn" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aCo" = (/obj/machinery/light_switch{dir = 8; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aCp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aCq" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) @@ -1483,12 +1483,12 @@ "aCA" = (/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aCB" = (/obj/machinery/light_switch{dir = 4; pixel_x = 22},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aCC" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"aCD" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"aCD" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aCE" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aCF" = (/turf/simulated/wall,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aCG" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aCH" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plating,/area/maintenance/maintcentral) -"aCI" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/maintcentral) +"aCI" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aCJ" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 10},/turf/simulated/floor/plating,/area/construction/Storage{name = "Construction Site"}) "aCK" = (/obj/structure/closet/crate,/turf/simulated/floor/plasteel,/area/construction/Storage{name = "Construction Site"}) "aCL" = (/turf/simulated/wall/r_wall,/area/security/detectives_office) @@ -1496,7 +1496,7 @@ "aCN" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters/preopen{id = "detffice"; name = "detective's shutters"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/detectives_office) "aCO" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/door/poddoor/shutters/preopen{id = "detffice"; name = "detective's shutters"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/detectives_office) "aCP" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/construction/hallway{name = "Port Central Hallway"}) -"aCQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) +"aCQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "aCR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/construction/hallway{name = "Port Central Hallway"}) "aCS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/construction/hallway{name = "Port Central Hallway"}) "aCT" = (/obj/structure/table/glass,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/device/gps,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) @@ -1526,7 +1526,7 @@ "aDr" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/glass{name = "Fore Dormitory"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aDs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aDt" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) -"aDu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) +"aDu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aDv" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aDw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aDx" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -1534,7 +1534,7 @@ "aDz" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aDA" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aDB" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/maintcentral) -"aDC" = (/obj/machinery/atmospherics/binary/pump/on{dir = 4},/obj/machinery/camera{c_tag = "Bridge Atmospheric Control"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) +"aDC" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 4},/obj/machinery/camera{c_tag = "Bridge Atmospheric Control"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aDD" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aDE" = (/obj/structure/filingcabinet,/turf/simulated/floor/wood,/area/security/detectives_office) "aDF" = (/obj/machinery/firealarm{pixel_y = 25},/turf/simulated/floor/wood,/area/security/detectives_office) @@ -1550,7 +1550,7 @@ "aDP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "aDQ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/construction/hallway{name = "Port Central Hallway"}) "aDR" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) -"aDS" = (/obj/machinery/light,/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "warningcorner"},/area/construction/hallway{name = "Port Central Hallway"}) +"aDS" = (/obj/machinery/light,/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "warningcorner"},/area/construction/hallway{name = "Port Central Hallway"}) "aDT" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/construction/hallway{name = "Port Central Hallway"}) "aDU" = (/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 1},/area/construction/hallway{name = "Port Central Hallway"}) "aDV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) @@ -1562,7 +1562,7 @@ "aEb" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/maintenance/aft) "aEc" = (/obj/structure/rack,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/aft) "aEd" = (/obj/machinery/door/airlock/maintenance{name = "Fore Starboard Transit Maintenance"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/aft) -"aEe" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) +"aEe" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aEf" = (/obj/structure/stool/bed/chair{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 27},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aEg" = (/obj/machinery/biogenerator,/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aEh" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "green"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -1573,7 +1573,7 @@ "aEm" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aEn" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aEo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) -"aEp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) +"aEp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aEq" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aEr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aEs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -1582,7 +1582,7 @@ "aEv" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aEw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aEx" = (/obj/machinery/door/airlock/atmos{name = "Bridge Atmospheric Control"; req_access_txt = "24"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) -"aEy" = (/obj/machinery/atmospherics/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/maintenance/maintcentral) +"aEy" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aEz" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aEA" = (/obj/machinery/computer/med_data,/turf/simulated/floor/wood,/area/security/detectives_office) "aEB" = (/turf/simulated/floor/wood,/area/security/detectives_office) @@ -1599,7 +1599,7 @@ "aEM" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "aEN" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft) "aEO" = (/obj/machinery/light{dir = 8},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) -"aEP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) +"aEP" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aEQ" = (/obj/structure/stool/bed/chair{dir = 8},/obj/machinery/camera{c_tag = "Fore Starboard Transit"; dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aER" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aES" = (/obj/machinery/seed_extractor,/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) @@ -1630,11 +1630,11 @@ "aFr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/camera{c_tag = "Starboard Hallway Fore Starboard"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aFs" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/blue{icon_state = "1-4"; d1 = 1; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aFt" = (/obj/machinery/power/apc{dir = 4; name = "Captain's Quarters APC"; pixel_x = 24},/obj/structure/cable/blue{icon_state = "0-8"; d1 = 1; d2 = 2},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plating,/area/crew_quarters/captain) -"aFu" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/maintcentral) +"aFu" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aFv" = (/obj/machinery/computer/secure_data,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/fancy/carpet,/area/security/detectives_office) "aFw" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Detective"},/turf/simulated/floor/fancy/carpet,/area/security/detectives_office) "aFx" = (/obj/structure/table/wood,/obj/item/weapon/hand_labeler,/turf/simulated/floor/fancy/carpet,/area/security/detectives_office) -"aFy" = (/obj/structure/table/wood,/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detective's camera"; pictures_left = 30},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/machinery/light{dir = 4},/turf/simulated/floor/wood,/area/security/detectives_office) +"aFy" = (/obj/structure/table/wood,/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detective's camera"; pictures_left = 30},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/machinery/light{dir = 4},/turf/simulated/floor/wood,/area/security/detectives_office) "aFz" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/security/main) "aFA" = (/obj/structure/closet/secure_closet/security,/turf/simulated/floor/plasteel,/area/security/main) "aFB" = (/obj/structure/closet/secure_closet/security,/obj/machinery/requests_console{department = "Security"; departmentType = 5; name = "Security Requests Console"; pixel_y = 30},/turf/simulated/floor/plasteel,/area/security/main) @@ -1651,7 +1651,7 @@ "aFM" = (/obj/machinery/newscaster{hitstaken = 1; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/construction/hallway{name = "Port Central Hallway"}) "aFN" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/construction/hallway{name = "Port Central Hallway"}) "aFO" = (/obj/structure/transit_tube/station/reverse{dir = 4},/obj/structure/transit_tube_pod,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/construction/hallway{name = "Port Central Hallway"}) -"aFP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) +"aFP" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/construction/hallway{name = "Port Central Hallway"}) "aFQ" = (/obj/machinery/door/airlock/maintenance{name = "External Airlock Access"; req_access_txt = "13"},/turf/simulated/floor/plating,/area/maintenance/aft) "aFR" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/aft) "aFS" = (/obj/machinery/door/airlock/external{name = "External Access"; req_access = null; req_access_txt = "13"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/aft) @@ -1698,13 +1698,13 @@ "aGH" = (/obj/structure/closet,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aGI" = (/obj/structure/table,/obj/item/device/t_scanner,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aGJ" = (/turf/simulated/wall,/area/maintenance/fsmaint2) -"aGK" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) +"aGK" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aGL" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aGM" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) -"aGN" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) -"aGO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) +"aGN" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) +"aGO" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aGP" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) -"aGQ" = (/obj/machinery/door_control{id = "Dorm6"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) +"aGQ" = (/obj/machinery/door_control{id = "Dorm6"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aGR" = (/obj/machinery/shower{dir = 4},/obj/item/weapon/soap,/obj/item/weapon/bikehorn/rubberducky,/obj/machinery/door_control{id = "shutbath"; name = "Bathroom Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aGS" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aGT" = (/obj/structure/toilet,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) @@ -1717,7 +1717,7 @@ "aHa" = (/obj/structure/grille,/obj/structure/cable/blue{icon_state = "0-2"},/obj/machinery/door/poddoor/shutters/preopen{id = "capffice"; name = "captain's shutters"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/captain) "aHb" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/fancy/carpet,/area/security/detectives_office) "aHc" = (/obj/structure/table/wood,/obj/item/weapon/book/manual/wiki/security_space_law,/obj/item/weapon/restraints/handcuffs,/obj/machinery/newscaster{hitstaken = 1; pixel_y = -32},/turf/simulated/floor/fancy/carpet,/area/security/detectives_office) -"aHd" = (/obj/structure/table/wood,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/security/detectives_office) +"aHd" = (/obj/structure/table/wood,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/security/detectives_office) "aHe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/power/apc{cell_type = 5000; name = "Detective's Office APC"; pixel_y = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/wood,/area/security/detectives_office) "aHf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/wood,/area/security/detectives_office) "aHg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood,/area/security/detectives_office) @@ -1749,8 +1749,8 @@ "aHG" = (/obj/structure/cable/green{icon_state = "2-4"},/obj/structure/cable/green{icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aHH" = (/obj/structure/stool,/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Fore Dormitory APC"; pixel_x = 24},/turf/simulated/floor/plating,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aHI" = (/turf/simulated/floor/plating,/area/maintenance/fsmaint2) -"aHJ" = (/obj/machinery/camera{c_tag = "Crew Area Atmospheric Control"; dir = 1},/obj/machinery/atmospherics/binary/pump/on{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) -"aHK" = (/obj/machinery/atmospherics/binary/pump/on,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) +"aHJ" = (/obj/machinery/camera{c_tag = "Crew Area Atmospheric Control"; dir = 1},/obj/machinery/atmospherics/components/binary/pump/on{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) +"aHK" = (/obj/machinery/atmospherics/components/binary/pump/on,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aHL" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aHM" = (/obj/structure/closet/secure_closet/personal/cabinet,/turf/simulated/floor/wood,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) "aHN" = (/obj/machinery/light/small,/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/wood,/area/crew_quarters/sleep_female{name = "Fore Dormitory"}) @@ -1764,7 +1764,7 @@ "aHV" = (/obj/structure/table/wood,/obj/item/weapon/pinpointer,/obj/item/weapon/disk/nuclear,/obj/machinery/status_display{layer = 4; pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aHW" = (/obj/structure/table/wood,/obj/machinery/recharger{pixel_y = 4},/obj/structure/cable/blue{icon_state = "1-4"; d1 = 1; d2 = 2},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aHX" = (/obj/structure/table/wood,/obj/item/weapon/melee/chainofcommand,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/blue{icon_state = "2-8"; d1 = 1; d2 = 2},/obj/structure/cable/blue{icon_state = "2-4"; d1 = 1; d2 = 2},/obj/machinery/cell_charger,/turf/simulated/floor/wood,/area/crew_quarters/captain) -"aHY" = (/obj/structure/table/wood,/obj/structure/cable/blue{icon_state = "1-8"; d1 = 1; d2 = 2},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/item/device/paicard,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) +"aHY" = (/obj/structure/table/wood,/obj/structure/cable/blue{icon_state = "1-8"; d1 = 1; d2 = 2},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/item/device/paicard,/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aHZ" = (/obj/structure/table/wood,/obj/structure/cable/blue{icon_state = "1-8"; d1 = 1; d2 = 2},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/wood,/area/crew_quarters/captain) "aIa" = (/obj/structure/table/wood,/obj/item/weapon/storage/lockbox/medal,/obj/machinery/ai_status_display{pixel_y = 32},/obj/machinery/camera{c_tag = "Captain's Office"},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aIb" = (/obj/structure/filingcabinet,/turf/simulated/floor/wood,/area/crew_quarters/captain) @@ -1772,7 +1772,7 @@ "aId" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/security/main) "aIe" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/main) "aIf" = (/obj/structure/table/wood,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flash/handheld,/turf/simulated/floor/plasteel,/area/security/main) -"aIg" = (/obj/structure/table/wood,/obj/item/weapon/storage/fancy/donut_box,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/security/main) +"aIg" = (/obj/structure/table/wood,/obj/item/weapon/storage/fancy/donut_box,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/security/main) "aIh" = (/obj/structure/table/wood,/obj/item/weapon/book/manual/wiki/security_space_law,/turf/simulated/floor/plasteel,/area/security/main) "aIi" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/main) "aIj" = (/obj/machinery/requests_console{department = "Law office"; name = "Lawyer's Requests Console"; pixel_x = -32},/turf/simulated/floor/wood,/area/lawoffice) @@ -1806,7 +1806,7 @@ "aIL" = (/obj/machinery/door/airlock/maintenance{name = "Firefighting equipment"; req_access_txt = "12"},/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aIM" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/wall,/area/maintenance/fsmaint2) "aIN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/atmos{name = "Crew Area Atmospheric Control"; req_access_txt = "24"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) -"aIO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"aIO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aIP" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aIQ" = (/obj/machinery/suit_storage_unit/captain,/turf/simulated/floor/wood,/area/crew_quarters/captain) "aIR" = (/obj/machinery/camera{c_tag = "Captain's Quarters"},/turf/simulated/floor/wood,/area/crew_quarters/captain) @@ -1823,14 +1823,14 @@ "aJc" = (/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/prison) "aJd" = (/turf/simulated/wall,/area/security/prison) "aJe" = (/obj/structure/table/glass,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/glasses/sunglasses/blindfold,/obj/item/clothing/mask/muzzle,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"},/area/security/prison) -"aJf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/security/prison) +"aJf" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/security/prison) "aJg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/security/prison) "aJh" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 5},/area/security/prison) "aJi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/security/prison) "aJj" = (/obj/structure/table/glass,/obj/item/stack/medical/ointment{pixel_y = 4},/obj/item/stack/medical/bruise_pack{pixel_x = 10; pixel_y = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aJk" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/obj/structure/table/glass,/obj/item/device/electropack,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aJl" = (/obj/structure/table/glass,/obj/item/weapon/razor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) -"aJm" = (/obj/structure/table,/obj/item/weapon/folder/red,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/main) +"aJm" = (/obj/structure/table,/obj/item/weapon/folder/red,/obj/item/weapon/pen,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/main) "aJn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door_control{id = "interrogation"; name = "Interrogation Shutters Control"; pixel_y = 26; req_access_txt = "0"},/turf/simulated/floor/plasteel,/area/security/main) "aJo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/security/main) "aJp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/main) @@ -1847,7 +1847,7 @@ "aJA" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/landmark/start{name = "Lawyer"},/turf/simulated/floor/wood,/area/lawoffice) "aJB" = (/obj/machinery/light_switch{dir = 4; pixel_x = 22},/turf/simulated/floor/wood,/area/lawoffice) "aJC" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/port{name = "Port Hallway"}) -"aJD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) +"aJD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) "aJE" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/port{name = "Port Hallway"}) "aJF" = (/obj/machinery/door/airlock/maintenance{name = "Port Interior Maintenance Access"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/aft) "aJG" = (/obj/structure/table,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft) @@ -1859,8 +1859,8 @@ "aJM" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/engine/gravity_generator) "aJN" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/engine/gravity_generator) "aJO" = (/obj/machinery/door/airlock/engineering{name = "Gravity Generator"; req_access_txt = "11"},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 1},/area/engine/gravity_generator) -"aJP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) -"aJQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) +"aJP" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) +"aJQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) "aJR" = (/obj/machinery/door/airlock/engineering{name = "Gravity Generator"; req_access_txt = "11"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/engine/gravity_generator) "aJS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aJT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -1899,12 +1899,12 @@ "aKA" = (/obj/structure/stool/bed,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aKB" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/security/prison) "aKC" = (/obj/machinery/door/airlock/highsecurity{name = "Prisoner Treatment Center"; req_access_txt = "2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/security/prison) -"aKD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) +"aKD" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aKE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aKF" = (/obj/structure/table,/obj/item/weapon/paper_bin,/obj/machinery/camera{c_tag = "Interrogation Observation"; dir = 4},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel,/area/security/main) "aKG" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel,/area/security/main) "aKH" = (/obj/structure/stool/bed/chair,/obj/item/device/radio/intercom{broadcasting = 1; freerange = 1; frequency = 1424; layer = 3.3; listening = 0; name = "Interrogation Intercom"; pixel_y = -31},/turf/simulated/floor/plasteel,/area/security/main) -"aKI" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/structure/table,/obj/item/weapon/phone{desc = "Supposedly a direct line to NanoTrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3},/turf/simulated/floor/plasteel,/area/security/main) +"aKI" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/structure/table,/obj/item/weapon/phone{desc = "Supposedly a direct line to NanoTrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3},/turf/simulated/floor/plasteel,/area/security/main) "aKJ" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/security/main) "aKK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/main) "aKL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/security/main) @@ -1954,12 +1954,12 @@ "aLD" = (/obj/item/weapon/soap/nanotrasen,/obj/machinery/shower{pixel_y = 20},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/prison) "aLE" = (/obj/structure/closet,/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/security/prison) "aLF" = (/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/security/prison) -"aLG" = (/obj/machinery/light_switch{pixel_y = -22},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/security/prison) +"aLG" = (/obj/machinery/light_switch{pixel_y = -22},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/security/prison) "aLH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"},/area/security/prison) "aLI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/security/prison) "aLJ" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aLK" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) -"aLL" = (/obj/machinery/light_switch{dir = 4; pixel_x = 22},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) +"aLL" = (/obj/machinery/light_switch{dir = 4; pixel_x = 22},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aLM" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/shutters{id = "interrogation"; name = "interrogation shutters"},/turf/simulated/floor/plating,/area/security/main) "aLN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 8},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/security/main) "aLO" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp/green{on = 0; pixel_x = -3; pixel_y = 8},/obj/item/weapon/paper_bin{pixel_y = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/main) @@ -2003,13 +2003,13 @@ "aMA" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/obj/structure/sign/botany{pixel_x = -32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "greencorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aMB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aMC" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/drinks/flask{pixel_x = 8},/obj/item/weapon/razor{pixel_x = -4; pixel_y = 2},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"aMD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) +"aMD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aME" = (/obj/machinery/bookbinder,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aMF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/crew_quarters/captain) "aMG" = (/obj/machinery/computer/communications,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aMH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aMI" = (/obj/structure/table/wood,/obj/item/device/laser_pointer/green,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"aMJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) +"aMJ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aMK" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/fancy/carpet,/area/crew_quarters/captain) "aML" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/captain) "aMM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/captain) @@ -2022,7 +2022,7 @@ "aMT" = (/obj/machinery/door/airlock/glass_security{name = "Prison Medbay"; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aMU" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) "aMV" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) -"aMW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) +"aMW" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) "aMX" = (/obj/machinery/door/airlock/security{desc = "The room set aside for the interrogation of prisoners, suspects, and witnesses."; name = "Interrogation Room"; req_access_txt = "63"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) "aMY" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/security/main) "aMZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/main) @@ -2033,11 +2033,11 @@ "aNe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/main) "aNf" = (/obj/machinery/door/airlock/glass_security{name = "Security Office"; req_access_txt = "0"; req_one_access_txt = "1; 4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/security/main) "aNg" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/brig) -"aNh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/brig) +"aNh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/brig) "aNi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel,/area/security/brig) "aNj" = (/obj/machinery/light{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{id = "cell1"; name = "Cell One"; req_access_txt = "2"},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/turf/simulated/floor/plasteel,/area/security/brig) "aNk" = (/turf/simulated/floor/plasteel,/area/security/brig) -"aNl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Brig Cell One"; network = list("SS13","Prison")},/turf/simulated/floor/plasteel,/area/security/brig) +"aNl" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Brig Cell One"; network = list("SS13","Prison")},/turf/simulated/floor/plasteel,/area/security/brig) "aNm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) "aNn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) "aNo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/hallway/primary/port{name = "Port Hallway"}) @@ -2049,7 +2049,7 @@ "aNu" = (/obj/machinery/shieldgen,/turf/simulated/floor/plating,/area/engine/engineering) "aNv" = (/turf/simulated/floor/plating,/area/engine/engineering) "aNw" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/camera{c_tag = "Chief Engineer's Office"; dir = 4},/obj/machinery/suit_storage_unit/ce,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/engine/chiefs_office) -"aNx" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/engine/chiefs_office) +"aNx" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/engine/chiefs_office) "aNy" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark/start{name = "Chief Engineer"},/turf/simulated/floor/plasteel,/area/engine/chiefs_office) "aNz" = (/obj/structure/table,/obj/item/weapon/paper_bin,/obj/item/weapon/stamp/ce,/turf/simulated/floor/plasteel,/area/engine/chiefs_office) "aNA" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/engine/chiefs_office) @@ -2058,7 +2058,7 @@ "aND" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/engine/gravity_generator) "aNE" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/engine/gravity_generator) "aNF" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/engine/gravity_generator) -"aNG" = (/obj/machinery/camera{c_tag = "Gravity Generator Room"; dir = 8},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) +"aNG" = (/obj/machinery/camera{c_tag = "Gravity Generator Room"; dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "aNH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/newscaster{dir = 8; pixel_x = -32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aNI" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aNJ" = (/obj/machinery/light/small{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera{c_tag = "Crew Area Power Control"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) @@ -2069,7 +2069,7 @@ "aNO" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "green"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aNP" = (/obj/structure/dresser,/turf/simulated/floor/wood,/area/crew_quarters/captain) "aNQ" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/captain,/obj/machinery/status_display{pixel_y = -32},/obj/effect/landmark/start{name = "Captain"},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"aNR" = (/obj/structure/closet,/obj/effect/landmark/costume,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) +"aNR" = (/obj/structure/closet,/obj/effect/landmark/costume,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aNS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/crew_quarters/captain) "aNT" = (/obj/structure/closet/secure_closet/captains,/obj/item/device/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Captain)"; pixel_x = -28},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) "aNU" = (/obj/machinery/keycard_auth{pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) @@ -2088,7 +2088,7 @@ "aOh" = (/obj/structure/table,/obj/structure/bedsheetbin,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/security/prison) "aOi" = (/obj/structure/stool,/obj/machinery/door_control{id = "permabolt1"; name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor/plasteel,/area/security/prison) "aOj" = (/obj/structure/table,/obj/machinery/flasher{id = "PCell 1"; pixel_y = 26},/obj/machinery/camera{c_tag = "Prison Cell 1"; network = list("SS13","Prison")},/obj/item/weapon/razor,/turf/simulated/floor/plasteel,/area/security/prison) -"aOk" = (/obj/structure/stool,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/security/prison) +"aOk" = (/obj/structure/stool,/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/security/prison) "aOl" = (/obj/machinery/flasher_button{id = "PCell 1"; pixel_x = -26},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/security/prison) "aOm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/security/prison) "aOn" = (/obj/machinery/light_switch{dir = 8; pixel_x = -22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) @@ -2099,7 +2099,7 @@ "aOs" = (/obj/machinery/status_display,/turf/simulated/wall,/area/security/main) "aOt" = (/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/security/main) "aOu" = (/obj/structure/table/wood,/obj/item/weapon/storage/box/cups,/turf/simulated/floor/plasteel,/area/security/main) -"aOv" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/security/main) +"aOv" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/security/main) "aOw" = (/obj/structure/table/wood,/obj/machinery/recharger,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/security/main) "aOx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/main) "aOy" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/security/main) @@ -2108,7 +2108,7 @@ "aOB" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/security/brig) "aOC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) "aOD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/closet/secure_closet/brig,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/brig) -"aOE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 1"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) +"aOE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 1"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) "aOF" = (/obj/structure/stool/bed,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) "aOG" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) "aOH" = (/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/hallway/primary/port{name = "Port Hallway"}) @@ -2129,7 +2129,7 @@ "aOW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "aOX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "aOY" = (/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"aOZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"aOZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aPa" = (/obj/structure/cable,/obj/machinery/power/terminal{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aPb" = (/obj/structure/cable/green,/obj/machinery/power/smes,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aPc" = (/turf/simulated/wall,/area/crew_quarters/kitchen) @@ -2157,7 +2157,7 @@ "aPy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/prison) "aPz" = (/obj/machinery/door/airlock/glass_security{name = "Cell 1"; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) "aPA" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "yellowcorner"},/area/security/prison) -"aPB" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) +"aPB" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) "aPC" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) "aPD" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{freerange = 1; frequency = 1424; name = "Interrogation Intercom"; pixel_y = -31},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) "aPE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/main) @@ -2176,10 +2176,10 @@ "aPR" = (/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/structure/table,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 8; name = "Chief Engineer's Office APC"; pixel_x = -24},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 10},/area/engine/chiefs_office) "aPS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/chiefs_office) "aPT" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/chiefs_office) -"aPU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/chiefs_office) +"aPU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/chiefs_office) "aPV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/chiefs_office) "aPW" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "yellow"},/area/engine/chiefs_office) -"aPX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) +"aPX" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "aPY" = (/obj/machinery/gravity_generator/main/station,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/engine/gravity_generator) "aPZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/camera{c_tag = "Starboard Hallway Central Port"; dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aQa" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -2189,7 +2189,7 @@ "aQe" = (/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aQf" = (/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aQg" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/plasteel{dir = 8; icon_state = "green"},/area/hydroponics) -"aQh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hydroponics) +"aQh" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hydroponics) "aQi" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hydroponics) "aQj" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hydroponics) "aQk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/hydroponics) @@ -2208,10 +2208,10 @@ "aQx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/prison) "aQy" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/security/prison) "aQz" = (/obj/structure/stool,/turf/simulated/floor/plasteel,/area/security/prison) -"aQA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) +"aQA" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) "aQB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) "aQC" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) -"aQD" = (/obj/structure/closet,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) +"aQD" = (/obj/structure/closet,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) "aQE" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) "aQF" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/brown,/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel,/area/security/prison) "aQG" = (/obj/machinery/door_control{id = "permacell1"; name = "Cell 1 Lockdown"; pixel_x = -26; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) @@ -2224,7 +2224,7 @@ "aQN" = (/obj/machinery/vending/coffee,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/main) "aQO" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/security/main) "aQP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/brig) -"aQQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) +"aQQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) "aQR" = (/obj/machinery/light{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{id = "cell2"; name = "Cell Two"; req_access_txt = "2"},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) "aQS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) "aQT" = (/obj/machinery/camera{c_tag = "Brig Cell Two"; network = list("SS13","Prison")},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) @@ -2232,7 +2232,7 @@ "aQV" = (/obj/structure/grille,/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) "aQW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/hallway/primary/port{name = "Port Hallway"}) "aQX" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) -"aQY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) +"aQY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) "aQZ" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{dir = 4; icon_state = "greencorner"},/area/hallway/primary/port{name = "Port Hallway"}) "aRa" = (/obj/structure/transit_tube{icon_state = "N-S"},/turf/simulated/floor/plating/airless,/area/space) "aRb" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = -32},/turf/simulated/floor/plating/airless,/area/engine/engineering) @@ -2256,7 +2256,7 @@ "aRt" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=2"; freq = 1400; location = "Bar"},/obj/structure/plasticflaps,/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 4; icon_state = "loadingarea"},/area/crew_quarters/bar) "aRu" = (/obj/machinery/door/window/eastleft{name = "Bar Deliveries"; req_access_txt = "25"},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/bar) "aRv" = (/obj/structure/sink/kitchen{pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"aRw" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 22},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"aRw" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 22},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aRx" = (/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aRy" = (/obj/structure/kitchenspike,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aRz" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) @@ -2281,18 +2281,18 @@ "aRS" = (/obj/structure/table,/obj/item/weapon/storage/pill_bottle/dice,/turf/simulated/floor/plasteel,/area/security/prison) "aRT" = (/obj/machinery/newscaster{dir = 8; pixel_x = 32},/turf/simulated/floor/plasteel,/area/security/prison) "aRU" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/security/prison) -"aRV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/security/prison) +"aRV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/security/prison) "aRW" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall,/area/security/prison) "aRX" = (/obj/structure/table,/obj/item/weapon/storage/box/prisoner,/obj/item/weapon/paper{icon_state = "paper_words"; info = "ATTN: Please ensure any prisoner being assigned to Rehabilitation Labor Detail is tracking/chem implanted. Please monitor via consoles to ensure security."; name = "Notice"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellowcorner"},/area/security/prison) "aRY" = (/obj/structure/table,/obj/item/weapon/storage/box/bodybags{pixel_x = 4; pixel_y = 2},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "redcorner"},/area/security/prison) -"aRZ" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/structure/closet/secure_closet/brig,/turf/simulated/floor/plasteel,/area/security/prison) +"aRZ" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/structure/closet/secure_closet/brig,/turf/simulated/floor/plasteel,/area/security/prison) "aSa" = (/obj/machinery/camera{c_tag = "Prison Access"; dir = 8; network = list("SS13","Prison")},/obj/structure/closet/secure_closet/brig,/turf/simulated/floor/plasteel{icon_state = "redcorner"},/area/security/prison) "aSb" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/main) "aSc" = (/obj/machinery/door/airlock/glass_security{name = "Security Office"; req_access_txt = "0"; req_one_access_txt = "1; 4"},/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/security/main) "aSd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/brig) "aSe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/brig) -"aSf" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 2"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) -"aSg" = (/obj/structure/stool/bed,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_scrubber,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) +"aSf" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 2"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) +"aSg" = (/obj/structure/stool/bed,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/bedsheet/brown,/obj/machinery/atmospherics/components/unary/vent_scrubber,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) "aSh" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/aft) "aSi" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/aft) "aSj" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/turf/simulated/floor/plating/airless{icon_state = "warnplate"; dir = 4},/area/engine/engineering) @@ -2323,14 +2323,14 @@ "aSI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/closet/secure_closet/bar,/obj/machinery/camera{c_tag = "Bar Storage"; dir = 8},/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aSJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/kitchen) "aSK" = (/obj/structure/kitchenspike,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) -"aSL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/mob/living/simple_animal/hostile/retaliate/goat{name = "Pete"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) +"aSL" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/mob/living/simple_animal/hostile/retaliate/goat{name = "Pete"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aSM" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 4; name = "Kitchen APC"; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aSN" = (/obj/machinery/light{dir = 8},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/plasteel{dir = 8; icon_state = "green"},/area/hydroponics) "aSO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hydroponics) -"aSP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel,/area/hydroponics) +"aSP" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel,/area/hydroponics) "aSQ" = (/obj/machinery/seed_extractor,/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hydroponics) "aSR" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"aSS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"aSS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aST" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/green{icon_state = "1-2"},/obj/machinery/camera{c_tag = "Starboard Hallway Central Starboard"; dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aSU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/bridge) "aSV" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/window{name = "Bridge Deliveries"; req_access_txt = "19"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/bridge) @@ -2351,7 +2351,7 @@ "aTk" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel,/area/security/prison) "aTl" = (/obj/structure/stool,/obj/machinery/door_control{id = "permabolt2"; name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor/plasteel,/area/security/prison) "aTm" = (/obj/structure/table,/obj/machinery/flasher{id = "PCell 2"; pixel_y = 26},/obj/machinery/camera{c_tag = "Prison Cell 2"; network = list("SS13","Prison")},/obj/item/weapon/paper,/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/security/prison) -"aTn" = (/obj/structure/stool,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) +"aTn" = (/obj/structure/stool,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) "aTo" = (/obj/machinery/flasher_button{id = "PCell 2"; pixel_x = -26},/obj/machinery/camera{c_tag = "Prison Hallway Fore"; dir = 4; network = list("SS13","Prison")},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) "aTp" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/security/prison) "aTq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/prison) @@ -2378,7 +2378,7 @@ "aTL" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 32},/turf/simulated/floor/plating/airless{icon_state = "warnplate"; dir = 8},/area/engine/engineering) "aTM" = (/obj/machinery/status_display,/turf/simulated/wall,/area/engine/engineering) "aTN" = (/obj/machinery/suit_storage_unit/engine,/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellowcorner"},/area/engine/engineering) -"aTO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"aTO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "aTP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/engine/engineering) "aTQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) "aTR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor/plasteel,/area/engine/engineering) @@ -2389,9 +2389,9 @@ "aTW" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/engine/engineering) "aTX" = (/obj/item/stack/sheet/plasteel{amount = 50},/obj/item/stack/sheet/plasteel{amount = 50},/obj/structure/table,/obj/machinery/requests_console{department = "Engineering"; departmentType = 4; name = "Engineering Requests Console"; pixel_y = 30},/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/engine/engineering) "aTY" = (/turf/simulated/wall/r_wall,/area/maintenance/aft) -"aTZ" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft) +"aTZ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft) "aUa" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft) -"aUb" = (/obj/machinery/atmospherics/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/maintenance/aft) +"aUb" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/maintenance/aft) "aUc" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/machinery/door/airlock/atmos{name = "Engineering Atmospheric Control"; req_access_txt = "24"},/turf/simulated/floor/plating,/area/maintenance/aft) "aUd" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/aft) "aUe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -2402,7 +2402,7 @@ "aUj" = (/turf/simulated/floor/wood,/area/crew_quarters/bar) "aUk" = (/obj/machinery/chem_master,/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aUl" = (/obj/machinery/chem_master/condimaster,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) -"aUm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) +"aUm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aUn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/gibber,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aUo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/kitchen) "aUp" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "green"},/area/hydroponics) @@ -2416,7 +2416,7 @@ "aUx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) "aUy" = (/obj/machinery/door/poddoor/preopen{id = "bridge blast"; name = "Bridge Blast Door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) "aUz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/structure/cable/blue{icon_state = "2-8"; d1 = 1; d2 = 2},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) -"aUA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) +"aUA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) "aUB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/requests_console{announcementConsole = 1; department = "Bridge"; departmentType = 5; name = "Bridge Requests Console"; pixel_y = 30},/turf/simulated/floor/plasteel,/area/bridge) "aUC" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) "aUD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "blue"},/area/bridge) @@ -2437,18 +2437,18 @@ "aUS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/prison) "aUT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/security/prison) "aUU" = (/obj/machinery/door/airlock/glass_security{layer = 2.8; name = "Prison Wing"; req_access_txt = "2"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowfull"},/area/security/prison) -"aUV" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/security/prison) +"aUV" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/security/prison) "aUW" = (/obj/machinery/door/poddoor/preopen{id = "Prison Gate"; name = "Prison Blast Door"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/prison) -"aUX" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/prison) +"aUX" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/prison) "aUY" = (/obj/machinery/door/airlock/glass_security{desc = "The station's long-term incarceration and labor facility. Remember, only the Captain or HoS can authorize sending people here! (Or the Warden, at a pinch.)"; name = "Prison Access"; req_access_txt = "2"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/security/prison) "aUZ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/prison) "aVa" = (/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel,/area/security/brig) -"aVb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) +"aVb" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) "aVc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/security/brig) "aVd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/security/brig) "aVe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/brig) "aVf" = (/obj/machinery/light{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{id = "cell3"; name = "Cell Three"; req_access_txt = "2"},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/turf/simulated/floor/plasteel,/area/security/brig) -"aVg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Brig Cell Three"; network = list("SS13","Prison")},/turf/simulated/floor/plasteel,/area/security/brig) +"aVg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Brig Cell Three"; network = list("SS13","Prison")},/turf/simulated/floor/plasteel,/area/security/brig) "aVh" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) "aVi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/grille,/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) "aVj" = (/obj/item/weapon/crowbar,/turf/simulated/floor/plating/airless{icon_state = "warnplate"; dir = 8},/area/engine/engineering) @@ -2478,7 +2478,7 @@ "aVH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aVI" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aVJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/bar) -"aVK" = (/obj/structure/closet/gmcloset,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"aVK" = (/obj/structure/closet/gmcloset,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/turf/simulated/floor/wood,/area/crew_quarters/bar) "aVL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/bar) "aVM" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aVN" = (/obj/structure/table/wood,/obj/machinery/reagentgrinder,/obj/machinery/power/apc{dir = 4; name = "Bar APC"; pixel_x = 24},/obj/structure/cable/green,/obj/item/weapon/gun/projectile/revolver/doublebarrel{name = "bartender's shotgun"},/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -2501,17 +2501,17 @@ "aWe" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/machinery/camera{c_tag = "Bridge Fore Entrance"; dir = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/bridge) "aWf" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) "aWg" = (/obj/machinery/power/apc{name = "Head of Personnel APC"; pixel_y = -24},/obj/structure/cable/blue,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) -"aWh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel,/area/bridge) +"aWh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel,/area/bridge) "aWi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "blue"},/area/bridge) "aWj" = (/obj/machinery/door/airlock/glass_command{desc = "The station's command center, where the fate of Nanotrasen's trillion-dollar investment is often decided."; name = "Bridge"; req_access_txt = "19"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/bridge) "aWk" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) -"aWl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel,/area/bridge) +"aWl" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel,/area/bridge) "aWm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/bridge) "aWn" = (/obj/machinery/computer/security,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/bridge) "aWo" = (/obj/item/clothing/under/rank/prisoner,/turf/simulated/floor/plating/asteroid/airless,/area/mine/explored) "aWp" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/prison) "aWq" = (/obj/machinery/vending/cola,/turf/simulated/floor/plasteel,/area/security/prison) -"aWr" = (/obj/structure/closet,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) +"aWr" = (/obj/structure/closet,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) "aWs" = (/obj/machinery/light,/turf/simulated/floor/plasteel,/area/security/prison) "aWt" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/plasteel,/area/security/prison) "aWu" = (/obj/machinery/door_control{id = "permacell2"; name = "Cell 2 Lockdown"; pixel_x = -26; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/security/prison) @@ -2525,7 +2525,7 @@ "aWC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/prison) "aWD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/security/brig) "aWE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/security/brig) -"aWF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 3"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) +"aWF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 3"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) "aWG" = (/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/hallway/primary/port{name = "Port Hallway"}) "aWH" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "redcorner"},/area/hallway/primary/port{name = "Port Hallway"}) "aWI" = (/obj/item/weapon/wrench,/turf/simulated/floor/plating,/area/maintenance/aft) @@ -2545,9 +2545,9 @@ "aWW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/engine/engineering) "aWX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/engine/engineering) "aWY" = (/obj/machinery/computer/station_alert,/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) -"aWZ" = (/obj/machinery/atmospherics/binary/pump/on,/turf/simulated/floor/plating,/area/maintenance/aft) +"aWZ" = (/obj/machinery/atmospherics/components/binary/pump/on,/turf/simulated/floor/plating,/area/maintenance/aft) "aXa" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/aft) -"aXb" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft) +"aXb" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft) "aXc" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 5},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/aft) "aXd" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft) "aXe" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Maintenance Access"; req_one_access_txt = "10; 12"},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 4},/area/maintenance/aft) @@ -2571,7 +2571,7 @@ "aXw" = (/obj/effect/decal/remains/human,/turf/simulated/floor/plating/asteroid/airless,/area/mine/explored) "aXx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "green"},/area/security/prison) "aXy" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "green"},/area/security/prison) -"aXz" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "green"},/area/security/prison) +"aXz" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "green"},/area/security/prison) "aXA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "green"},/area/security/prison) "aXB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{dir = 8; icon_state = "greencorner"},/area/security/prison) "aXC" = (/obj/machinery/vending/sustenance,/obj/machinery/status_display{pixel_x = 32},/turf/simulated/floor/plasteel,/area/security/prison) @@ -2580,7 +2580,7 @@ "aXF" = (/obj/structure/sign/securearea,/turf/simulated/wall,/area/security/prison) "aXG" = (/obj/structure/rack,/obj/item/weapon/storage/box/chemimp{pixel_x = 4; pixel_y = 3},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellowcorner"},/area/security/prison) "aXH" = (/obj/structure/rack,/obj/item/weapon/storage/box/trackimp,/turf/simulated/floor/plasteel,/area/security/prison) -"aXI" = (/obj/structure/closet/secure_closet/brig,/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) +"aXI" = (/obj/structure/closet/secure_closet/brig,/obj/machinery/light,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) "aXJ" = (/obj/structure/closet/secure_closet/brig,/obj/machinery/power/apc{cell_type = 5000; name = "Prison Wing APC"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/plasteel{dir = 4; icon_state = "redcorner"},/area/security/prison) "aXK" = (/obj/machinery/computer/secure_data,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/prison) "aXL" = (/obj/machinery/computer/security,/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/brig) @@ -2607,7 +2607,7 @@ "aYg" = (/obj/machinery/light{dir = 1},/obj/machinery/door_control{id = "singularity"; name = "Shutters Control"; pixel_y = 25; req_access_txt = "11"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/engine/engineering) "aYh" = (/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/engine/engineering) "aYi" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = -32},/obj/machinery/vending/tool,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/engine/engineering) -"aYj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"aYj" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "aYk" = (/obj/structure/stool/bed/chair/office/dark,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/engine/engineering) "aYl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/engine/engineering) "aYm" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Engineering APC"; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) @@ -2615,7 +2615,7 @@ "aYo" = (/obj/machinery/door/airlock/maintenance{name = "Engineering Maintenance"; req_access_txt = "32"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/aft) "aYp" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=2"; freq = 1400; location = "Engineering"},/obj/structure/plasticflaps,/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "loadingarea"},/area/maintenance/aft) "aYq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"aYr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"aYr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aYs" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 4},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aYt" = (/obj/machinery/light_switch{dir = 1; pixel_x = 6; pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aYu" = (/obj/machinery/door/window/westright{name = "Bar"; req_access_txt = "25"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -2720,7 +2720,7 @@ "bap" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/storage/secure/briefcase,/turf/simulated/floor/plasteel{dir = 0; icon_state = "blue"},/area/bridge) "baq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/table,/obj/machinery/recharger,/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/bridge) "bar" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/bridge) -"bas" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/bridge) +"bas" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/bridge) "bat" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/bridge) "bau" = (/obj/machinery/seed_extractor,/turf/simulated/floor/plasteel,/area/security/prison) "bav" = (/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel,/area/security/prison) @@ -2747,7 +2747,7 @@ "baQ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) "baR" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/security/brig) "baS" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/hallway/primary/port{name = "Port Hallway"}) -"baT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/bot/secbot/beepsky,/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) +"baT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/bot/secbot/beepsky,/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) "baU" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/port{name = "Port Hallway"}) "baV" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/grille,/turf/space,/area/space) "baW" = (/obj/machinery/camera/emp_proof{c_tag = "Singularity Port"; dir = 4; network = list("SS13","Singularity")},/turf/simulated/floor/plating/airless,/area/engine/engineering) @@ -2770,10 +2770,10 @@ "bbn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) "bbo" = (/obj/machinery/door/airlock/engineering{desc = "Main engineering. Loot and danger in equal measures lie ahead!"; id_tag = "Engineering"; name = "Engineering"; req_access_txt = "10"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowfull"},/area/engine/engineering) "bbp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/engine/engineering) -"bbq" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) +"bbq" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) "bbr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) "bbs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) -"bbt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) +"bbt" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) "bbu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass_engineering{name = "Engineering Access"; req_access_txt = "32"; req_one_access_txt = "0"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) "bbv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bbw" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -2782,19 +2782,19 @@ "bbz" = (/obj/effect/landmark/start{name = "Bartender"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bbA" = (/mob/living/carbon/monkey{name = "Pun Pun"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bbB" = (/obj/machinery/door/airlock/glass{desc = "The workplace of the diligent station chef, with enough ingredients to work up a masterpiece."; name = "Kitchen"; req_access_txt = "0"; req_one_access_txt = "25, 28"},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) -"bbC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) +"bbC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bbD" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bbE" = (/obj/effect/landmark/start{name = "Chef"},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) -"bbF" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) +"bbF" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bbG" = (/obj/structure/table,/obj/machinery/reagentgrinder,/obj/machinery/requests_console{department = "Kitchen"; departmentType = 2; name = "Kitchen Requests Console"; pixel_x = 30},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bbH" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/light{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bbI" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "blue"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bbJ" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters/preopen{id = "hopqueue"; name = "HoP Queue Shutters"},/obj/machinery/flasher{id = "hopline"; layer = 3.5; name = "civility enforcement flasher"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bbK" = (/turf/simulated/floor/plasteel{icon_state = "bot"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bbL" = (/obj/structure/cable/blue{icon_state = "1-8"; d1 = 1; d2 = 2},/obj/machinery/pdapainter,/turf/simulated/floor/wood,/area/crew_quarters/heads) -"bbM" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/heads) +"bbM" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/heads) "bbN" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/crew_quarters/heads) -"bbO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/heads) +"bbO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/heads) "bbP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/heads) "bbQ" = (/obj/machinery/door/airlock/command{desc = "The office of the hero the station deserves, but not the one it needs right now. They also change IDs on occasion."; name = "Head of Personnel's Office"; req_access = null; req_access_txt = "57"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/bridge) "bbR" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "1-4"; d1 = 1; d2 = 2},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/bridge) @@ -2809,14 +2809,14 @@ "bca" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/sunflowerseed,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/security/prison) "bcb" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "green"},/area/security/prison) "bcc" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/prison) -"bcd" = (/obj/machinery/door_control{id = "permacell3"; name = "Cell 3 Lockdown"; pixel_x = -26; req_access_txt = "2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/prison) +"bcd" = (/obj/machinery/door_control{id = "permacell3"; name = "Cell 3 Lockdown"; pixel_x = -26; req_access_txt = "2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/prison) "bce" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/computer/security/telescreen{desc = "Used for watching the Prison Wing."; dir = 8; name = "Prison Monitor"; network = list("Prison"); pixel_x = 32},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/security/prison) "bcf" = (/obj/machinery/deployable/barrier,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) "bcg" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) "bch" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/warden) "bci" = (/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/security/warden) "bcj" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/security/warden) -"bck" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/security/warden) +"bck" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/security/warden) "bcl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/warden) "bcm" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark/start{name = "Warden"},/turf/simulated/floor/plasteel,/area/security/warden) "bcn" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/red,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/window/brigdoor{dir = 8; layer = 2.9; name = "Armory Desk"; req_access_txt = "3"},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/warden) @@ -2883,7 +2883,7 @@ "bdw" = (/obj/machinery/suit_storage_unit/security,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) "bdx" = (/obj/structure/rack,/obj/item/weapon/gun/energy/ionrifle{pin = /obj/item/device/firing_pin},/obj/item/clothing/suit/armor/laserproof,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) "bdy" = (/obj/structure/rack,/obj/item/weapon/storage/box/teargas,/obj/item/weapon/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) -"bdz" = (/obj/structure/rack,/obj/item/weapon/storage/box/chemimp{pixel_x = 4; pixel_y = 3},/obj/item/weapon/storage/box/trackimp,/obj/item/weapon/storage/lockbox/loyalty,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) +"bdz" = (/obj/structure/rack,/obj/item/weapon/storage/box/chemimp{pixel_x = 4; pixel_y = 3},/obj/item/weapon/storage/box/trackimp,/obj/item/weapon/storage/lockbox/loyalty,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) "bdA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) "bdB" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/warden) "bdC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/security/warden) @@ -2902,7 +2902,7 @@ "bdP" = (/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/engine/engineering) "bdQ" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = -32},/obj/machinery/vending/engivend,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/engine/engineering) "bdR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/engine/engineering) -"bdS" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"bdS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "bdT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/engine/engineering) "bdU" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/engine/engineering) "bdV" = (/obj/machinery/status_display{pixel_x = 32},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) @@ -2946,12 +2946,12 @@ "beH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass_security{id_tag = "outerbrig"; name = "Armory"; req_access_txt = "3"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) "beI" = (/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/security/warden) "beJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/warden) -"beK" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/security/warden) +"beK" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/security/warden) "beL" = (/obj/item/weapon/storage/box/seccarts{pixel_x = 3; pixel_y = 2},/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/item/weapon/storage/box/deputy,/turf/simulated/floor/plasteel,/area/security/warden) "beM" = (/obj/structure/table,/obj/item/clothing/ears/earmuffs,/obj/item/clothing/glasses/sunglasses,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor/plasteel,/area/security/warden) "beN" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/security/warden) "beO" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/brig) -"beP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) +"beP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) "beQ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/security/brig) "beR" = (/obj/machinery/door/airlock/glass_security{name = "Brig Desk"; req_access_txt = "2"},/turf/simulated/floor/plasteel,/area/security/brig) "beS" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/turf/simulated/floor/plasteel,/area/security/brig) @@ -2998,18 +2998,18 @@ "bfH" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/table,/turf/simulated/floor/plasteel{dir = 1; icon_state = "blue"},/area/bridge) "bfI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/machinery/recharger,/turf/simulated/floor/plasteel{dir = 1; icon_state = "bluecorner"},/area/bridge) "bfJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "yellowcorner"},/area/bridge) -"bfK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "yellow"},/area/bridge) +"bfK" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "yellow"},/area/bridge) "bfL" = (/obj/machinery/computer/station_alert,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/bridge) "bfM" = (/obj/machinery/door/airlock/external{name = "Prison Mining External Airlock"; req_access_txt = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/mine/explored) "bfN" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/mine/explored) "bfO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/security/prison) "bfP" = (/obj/machinery/door/airlock/external{name = "Prison Mining External Airlock"; req_access_txt = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/security/prison) -"bfQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) +"bfQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) "bfR" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) "bfS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/security{name = "Prison Mining"; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/security/prison) "bfT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/security/prison) "bfU" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/security/prison) -"bfV" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/structure/rack,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) +"bfV" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/structure/rack,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) "bfW" = (/obj/structure/rack,/obj/item/weapon/gun/energy/gun/advtaser{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/energy/gun/advtaser,/obj/item/weapon/gun/energy/gun/advtaser{pixel_x = 3; pixel_y = -3},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) "bfX" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser{pixel_x = 3; pixel_y = -3},/obj/item/weapon/gun/energy/laser,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) "bfY" = (/obj/structure/rack,/obj/item/weapon/gun/energy/gun{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun{pixel_x = 3; pixel_y = -3},/obj/item/weapon/gun/energy/gun,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/warden) @@ -3043,8 +3043,8 @@ "bgA" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes,/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) "bgB" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/engine/engineering) "bgC" = (/obj/machinery/computer/secure_data,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/engine/engineering) -"bgD" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) -"bgE" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) +"bgD" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"bgE" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) "bgF" = (/obj/structure/closet/secure_closet/security/engine,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/engine/engineering) "bgG" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bgH" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -3059,11 +3059,11 @@ "bgQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/green{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "blue"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bgR" = (/obj/machinery/door/poddoor/preopen{id = "bridge blast"; name = "Bridge Blast Door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "bluecorner"},/area/bridge) "bgS" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "blue"},/area/bridge) -"bgT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/machinery/camera{c_tag = "Bridge Aft Entrance"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "bluecorner"},/area/bridge) +"bgT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/machinery/camera{c_tag = "Bridge Aft Entrance"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "bluecorner"},/area/bridge) "bgU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/bridge) "bgV" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/bridge) "bgW" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/bridge) -"bgX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/bridge) +"bgX" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/bridge) "bgY" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/bridge) "bgZ" = (/obj/structure/table,/obj/item/weapon/storage/box/zipties,/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/bridge) "bha" = (/obj/structure/table,/obj/item/device/aicard,/obj/item/device/multitool,/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellowcorner"},/area/bridge) @@ -3091,7 +3091,7 @@ "bhw" = (/obj/item/weapon/wrench,/turf/simulated/floor/plating/airless{icon_state = "warnplate"},/area/engine/engineering) "bhx" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 32},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless{icon_state = "warnplate"; dir = 8},/area/engine/engineering) "bhy" = (/obj/machinery/suit_storage_unit/engine,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellowcorner"},/area/engine/engineering) -"bhz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/engine/engineering) +"bhz" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/engine/engineering) "bhA" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/engine/engineering) "bhB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/engine/engineering) "bhC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) @@ -3106,8 +3106,8 @@ "bhL" = (/turf/simulated/floor/plasteel{icon_state = "red"},/area/engine/engineering) "bhM" = (/obj/structure/filingcabinet,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/engine/engineering) "bhN" = (/obj/structure/stool/bed/chair/wood/normal{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"bhO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"bhP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"bhO" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"bhP" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bhQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bhR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bhS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -3115,7 +3115,7 @@ "bhU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/bridge) "bhV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/bridge) "bhW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/newscaster{pixel_y = -32},/turf/simulated/floor/plasteel,/area/bridge) -"bhX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/bridge) +"bhX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/bridge) "bhY" = (/obj/structure/cable/blue{icon_state = "2-4"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "blue"},/area/bridge) "bhZ" = (/obj/machinery/door/airlock/glass_command{desc = "The station's command center, where the fate of Nanotrasen's trillion-dollar investment is often decided."; name = "Bridge"; req_access_txt = "19"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "4-8"; d1 = 1; d2 = 2},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/bridge) "bia" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/blue{icon_state = "1-8"; d1 = 1; d2 = 2},/turf/simulated/floor/plasteel,/area/bridge) @@ -3168,7 +3168,7 @@ "biV" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"},/area/bridge) "biW" = (/obj/machinery/computer/crew,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"},/area/bridge) "biX" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/security/prison) -"biY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) +"biY" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/prison) "biZ" = (/obj/structure/table,/obj/item/weapon/storage/bag/ore{pixel_y = 3},/obj/item/weapon/storage/bag/ore{pixel_x = -3},/obj/machinery/light_switch{dir = 4; pixel_x = 22},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/security/prison) "bja" = (/obj/machinery/door/airlock/security{name = "Prison Storage"; req_access_txt = "2"},/turf/simulated/floor/plasteel,/area/security/prison) "bjb" = (/turf/simulated/wall/r_wall,/area/security/hos) @@ -3178,10 +3178,10 @@ "bjf" = (/obj/structure/table,/obj/item/weapon/crowbar/red,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel,/area/security/brig) "bjg" = (/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/plasteel,/area/security/brig) "bjh" = (/obj/structure/extinguisher_cabinet{pixel_x = -27},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/security/brig) -"bji" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 5"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) +"bji" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 5"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) "bjj" = (/obj/structure/grille,/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) "bjk" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) -"bjl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) +"bjl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) "bjm" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/light,/turf/simulated/floor/plating/airless,/area/engine/engineering) "bjn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area/engine/engineering) "bjo" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/camera/emp_proof{c_tag = "Singularity Aft"; dir = 1; network = list("SS13","Singularity")},/turf/simulated/floor/plating/airless,/area/engine/engineering) @@ -3200,7 +3200,7 @@ "bjB" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bjC" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bjD" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"bjE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"bjE" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bjF" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/green{icon_state = "1-2"},/obj/machinery/camera{c_tag = "Starboard Hallway Aft Starboard"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bjG" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/maintenance{name = "Maintenance Access"; req_access_txt = "19"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bjH" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"},/area/bridge) @@ -3212,7 +3212,7 @@ "bjN" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/plasteel,/area/security/prison) "bjO" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/structure/closet/secure_closet/hos,/obj/item/weapon/gun/energy/gun/hos,/turf/simulated/floor/wood,/area/security/hos) "bjP" = (/turf/simulated/floor/wood,/area/security/hos) -"bjQ" = (/obj/structure/table/wood,/obj/machinery/recharger,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/security/hos) +"bjQ" = (/obj/structure/table/wood,/obj/machinery/recharger,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/security/hos) "bjR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/security/brig) "bjS" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/security/brig) "bjT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/glass_security{name = "Brig"; req_access_txt = "0"; req_one_access_txt = "1; 4; 42; 58"},/turf/simulated/floor/plasteel,/area/security/brig) @@ -3227,8 +3227,8 @@ "bkc" = (/obj/structure/table/wood,/obj/item/toy/carpplushie,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bkd" = (/obj/machinery/door/window/westright{name = "Theater Stage"; req_access_txt = "46"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bke" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bkf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bkg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bkf" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bkg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bkh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bki" = (/obj/machinery/door/window/eastright{name = "Theater Stage"; req_access_txt = "46"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bkj" = (/obj/structure/stool/bed/chair/wood/normal{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -3250,14 +3250,14 @@ "bkz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/wood,/area/security/hos) "bkA" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/security/hos) "bkB" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/security/brig) -"bkC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) -"bkD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/security/brig) +"bkC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) +"bkD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/security/brig) "bkE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/brig) "bkF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass_security{name = "Brig"; req_access_txt = "0"; req_one_access_txt = "1; 4; 42; 58"},/turf/simulated/floor/plasteel,/area/security/brig) "bkG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/security/brig) -"bkH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/security/brig) +"bkH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/security/brig) "bkI" = (/obj/machinery/light{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{id = "cell5"; name = "Cell Five"; req_access_txt = "2"},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/turf/simulated/floor/plasteel,/area/security/brig) -"bkJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Brig Cell Six"; network = list("SS13","Prison")},/turf/simulated/floor/plasteel,/area/security/brig) +"bkJ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Brig Cell Six"; network = list("SS13","Prison")},/turf/simulated/floor/plasteel,/area/security/brig) "bkK" = (/obj/machinery/power/apc{dir = 8; name = "Port Hallway APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/hallway/primary/port{name = "Port Hallway"}) "bkL" = (/obj/structure/bookcase/manuals/engineering,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 9; icon_state = "yellow"},/area/engine/engineering) "bkM" = (/obj/machinery/requests_console{department = "Engineering"; departmentType = 4; name = "Engineering Requests Console"; pixel_y = 30},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/engine/engineering) @@ -3291,17 +3291,17 @@ "blo" = (/obj/structure/table,/obj/structure/bedsheetbin,/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) "blp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/security/brig) "blq" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/security/brig) -"blr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 6"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) +"blr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/flasher{id = "Cell 6"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/brig) "bls" = (/obj/structure/grille,/obj/structure/cable,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "Security Blast Door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) "blt" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) "blu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/port{name = "Port Hallway"}) "blv" = (/obj/machinery/door/airlock/maintenance{name = "Port Interior Maintenance Access"; req_access_txt = "12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/aft) "blw" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/maintenance/aft) "blx" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/engine/engineering) -"bly" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/effect/landmark/start{name = "Station Engineer"},/obj/structure/stool,/turf/simulated/floor/plasteel,/area/engine/engineering) +"bly" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/effect/landmark/start{name = "Station Engineer"},/obj/structure/stool,/turf/simulated/floor/plasteel,/area/engine/engineering) "blz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table/glass,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/engine/engineering) "blA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/glass,/obj/item/weapon/paint/anycolor,/turf/simulated/floor/plasteel,/area/engine/engineering) -"blB" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/stool,/turf/simulated/floor/plasteel,/area/engine/engineering) +"blB" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/stool,/turf/simulated/floor/plasteel,/area/engine/engineering) "blC" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) "blD" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/engine/engineering) "blE" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/simulated/wall/shuttle{icon_state = "swall_f5"},/area/space) @@ -3312,7 +3312,7 @@ "blJ" = (/obj/machinery/disposal,/obj/machinery/newscaster{dir = 8; pixel_x = -32},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "blK" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/sortjunction{dir = 2; icon_state = "pipe-j2s"; sortType = 16},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "blL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"blM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/closet/secure_closet/freezer,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/nuke_storage) +"blM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/closet/secure_closet/freezer,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/nuke_storage) "blN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; luminosity = 2},/area/security/nuke_storage) "blO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/closet/secure_closet{name = "contraband locker"; req_access_txt = "3"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/nuke_storage) "blP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/security/nuke_storage) @@ -3365,11 +3365,11 @@ "bmK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/fancy/carpet,/area/bridge) "bmL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/fancy/carpet,/area/bridge) "bmM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/fancy/carpet,/area/bridge) -"bmN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/fancy/carpet,/area/bridge) +"bmN" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/fancy/carpet,/area/bridge) "bmO" = (/obj/machinery/vending/coffee,/turf/simulated/floor/wood,/area/bridge) "bmP" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/bridge) "bmQ" = (/obj/machinery/computer/security,/obj/machinery/door_control{id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = -28; pixel_y = 7; req_access_txt = "2"},/obj/machinery/door_control{id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = -28; pixel_y = -3; req_access_txt = "2"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/wood,/area/security/hos) -"bmR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/wood,/area/security/hos) +"bmR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/wood,/area/security/hos) "bmS" = (/obj/machinery/status_display{pixel_y = -32},/turf/simulated/floor/wood,/area/security/hos) "bmT" = (/obj/machinery/disposal,/obj/machinery/keycard_auth{pixel_y = -24},/obj/machinery/light_switch{dir = 4; pixel_x = 22},/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/security/hos) "bmU" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) @@ -3394,7 +3394,7 @@ "bnn" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bno" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bnp" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"bnq" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"bnq" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bnr" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bns" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bnt" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=StAF1"; location = "StAF2"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -3414,7 +3414,7 @@ "bnH" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/fancy/carpet,/area/bridge) "bnI" = (/obj/structure/table/wood,/obj/machinery/recharger,/turf/simulated/floor/wood,/area/bridge) "bnJ" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) -"bnK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) +"bnK" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) "bnL" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) "bnM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/security/brig) "bnN" = (/obj/machinery/light_switch{dir = 8; pixel_x = -22},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) @@ -3456,16 +3456,16 @@ "box" = (/obj/structure/table/wood,/turf/simulated/floor/fancy/carpet,/area/bridge) "boy" = (/obj/structure/table/wood,/turf/simulated/floor/wood,/area/bridge) "boz" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/camera{c_tag = "Evidence Storage"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) -"boA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) +"boA" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) "boB" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) "boC" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) "boD" = (/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) "boE" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "blue"},/area/crew_quarters/courtroom) -"boF" = (/obj/structure/table/wood,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 10},/area/crew_quarters/courtroom) +"boF" = (/obj/structure/table/wood,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 10},/area/crew_quarters/courtroom) "boG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/wood,/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/crew_quarters/courtroom) "boH" = (/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 4},/area/crew_quarters/courtroom) "boI" = (/obj/structure/table/wood,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/courtroom) -"boJ" = (/obj/structure/table/wood,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/courtroom) +"boJ" = (/obj/structure/table/wood,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/courtroom) "boK" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "greencorner"},/area/hallway/primary/port{name = "Port Hallway"}) "boL" = (/obj/machinery/door/airlock/maintenance{name = "Aft Port Transit Maintenance"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/aft) "boM" = (/turf/simulated/wall,/area/hallway/primary/port{name = "Port Hallway"}) @@ -3485,13 +3485,13 @@ "bpa" = (/obj/item/weapon/folder/documents,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/nuke_storage) "bpb" = (/obj/structure/filingcabinet/filingcabinet,/obj/machinery/camera{c_tag = "Vault"; dir = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/nuke_storage) "bpc" = (/obj/structure/safe,/obj/item/clothing/head/bearpelt,/obj/item/weapon/twohanded/fireaxe,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/nuke_storage) -"bpd" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 29},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/structure/closet/crate,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/gold,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/nuke_storage) +"bpd" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 29},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/structure/closet/crate,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/gold,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/nuke_storage) "bpe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/security/nuke_storage) "bpf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bpg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bph" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/bridge) "bpi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/bridge) -"bpj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/newscaster{pixel_y = -32},/turf/simulated/floor/fancy/carpet,/area/bridge) +"bpj" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/newscaster{pixel_y = -32},/turf/simulated/floor/fancy/carpet,/area/bridge) "bpk" = (/obj/structure/stool/bed/chair/comfy/beige{dir = 1},/turf/simulated/floor/fancy/carpet,/area/bridge) "bpl" = (/obj/structure/stool/bed/chair/comfy/beige{dir = 1},/obj/machinery/light,/turf/simulated/floor/fancy/carpet,/area/bridge) "bpm" = (/obj/structure/noticeboard{dir = 1; pixel_y = -27},/turf/simulated/floor/fancy/carpet,/area/bridge) @@ -3513,15 +3513,15 @@ "bpC" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/hallway/primary/port{name = "Port Hallway"}) "bpD" = (/obj/machinery/camera{c_tag = "Aft Port Transit"},/obj/machinery/light_switch{dir = 1; pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) "bpE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) -"bpF" = (/obj/machinery/light{dir = 1},/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) +"bpF" = (/obj/machinery/light{dir = 1},/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) "bpG" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel,/area/hallway/primary/port{name = "Port Hallway"}) "bpH" = (/obj/structure/transit_tube{icon_state = "N-S-Pass"},/turf/simulated/floor/plating/airless,/area/space) "bpI" = (/obj/machinery/door/airlock/external{name = "External Airlock"; req_access_txt = "13"},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft) "bpJ" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 4},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"bpK" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/structure/dresser,/turf/simulated/floor/wood,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bpK" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/structure/dresser,/turf/simulated/floor/wood,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bpL" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bpM" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"bpN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/stool/bed,/obj/item/weapon/bedsheet/purple,/turf/simulated/floor/wood,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bpN" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/stool/bed,/obj/item/weapon/bedsheet/purple,/turf/simulated/floor/wood,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bpO" = (/obj/structure/table/wood,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bpP" = (/obj/structure/stool,/obj/effect/landmark/start{name = "Clown"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bpQ" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) @@ -3586,7 +3586,7 @@ "bqX" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/courtroom) "bqY" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 4},/area/hallway/primary/port{name = "Port Hallway"}) "bqZ" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/hallway/primary/port{name = "Port Hallway"}) -"bra" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/primary/port{name = "Port Hallway"}) +"bra" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/primary/port{name = "Port Hallway"}) "brb" = (/obj/structure/transit_tube{icon_state = "Block"; dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/hallway/primary/port{name = "Port Hallway"}) "brc" = (/obj/structure/transit_tube/station/reverse{dir = 1},/obj/structure/transit_tube_pod{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/primary/port{name = "Port Hallway"}) "brd" = (/obj/structure/transit_tube,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/primary/port{name = "Port Hallway"}) @@ -3609,11 +3609,11 @@ "bru" = (/turf/simulated/floor/plating,/area/maintenance/asmaint2) "brv" = (/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "brw" = (/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) -"brx" = (/obj/structure/table/wood,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "blue"},/area/crew_quarters/courtroom) +"brx" = (/obj/structure/table/wood,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "blue"},/area/crew_quarters/courtroom) "bry" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/wood,/turf/simulated/floor/plasteel{dir = 1; icon_state = "bluecorner"},/area/crew_quarters/courtroom) "brz" = (/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/crew_quarters/courtroom) "brA" = (/obj/structure/table/wood,/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/courtroom) -"brB" = (/obj/structure/table/wood,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/courtroom) +"brB" = (/obj/structure/table/wood,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/courtroom) "brC" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/newscaster{dir = 8; pixel_x = -32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/port{name = "Port Hallway"}) "brD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/camera{c_tag = "Port Hallway Aft"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/port{name = "Port Hallway"}) "brE" = (/obj/machinery/door/airlock/maintenance{name = "Aft Port Transit Maintenance"; req_access_txt = "12"},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 8},/area/maintenance/aft) @@ -3645,7 +3645,7 @@ "bse" = (/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/power/apc{dir = 1; name = "Fitness Room APC"; pixel_y = 25},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bsf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bsg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) -"bsh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) +"bsh" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bsi" = (/obj/machinery/firealarm{pixel_y = 25},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bsj" = (/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bsk" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) @@ -3663,9 +3663,9 @@ "bsw" = (/obj/machinery/door/airlock/maintenance{name = "Aft Starboard Transit Maintenance"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/aft) "bsx" = (/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bsy" = (/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) -"bsz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) +"bsz" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bsA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) -"bsB" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) +"bsB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bsC" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bsD" = (/obj/structure/rack,/obj/machinery/light/small{dir = 1},/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/maintenance/aft) "bsE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Aft Dormitory"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) @@ -3673,7 +3673,7 @@ "bsG" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bsH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bsI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"bsJ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bsJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bsK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/green{icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bsL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/green{icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bsM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/structure/cable/green{icon_state = "4-8"},/obj/machinery/door/airlock/glass{name = "Aft Dormitory"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) @@ -3691,7 +3691,7 @@ "bsY" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bsZ" = (/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/crew_quarters/fitness) "bta" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{desc = "Hosed down three times a week by the Janitor."; name = "Holodeck"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) -"btb" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"btb" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "btc" = (/obj/machinery/power/apc{dir = 1; name = "Tribunal APC"; pixel_x = 25},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/crew_quarters/courtroom) "btd" = (/obj/structure/closet/secure_closet/courtroom,/turf/simulated/floor/plasteel{dir = 4; icon_state = "bluecorner"},/area/crew_quarters/courtroom) "bte" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) @@ -3717,7 +3717,7 @@ "bty" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "btz" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "btA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/landmark{name = "lightsout"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"btB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"btB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "btC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "btD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "btE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) @@ -3738,7 +3738,7 @@ "btT" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "btU" = (/obj/machinery/computer/HolodeckControl,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/crew_quarters/fitness) "btV" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/machinery/camera{c_tag = "Brig Atmospheric Control"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"btW" = (/obj/machinery/atmospherics/binary/pump/on{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"btW" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "btX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/atmos{name = "Brig Atmospheric Control"; req_access_txt = "24"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "btY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "btZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -3768,7 +3768,7 @@ "bux" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "buy" = (/obj/machinery/light_switch{dir = 4; pixel_x = 22},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "buz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 1},/area/hallway/primary/starboard{name = "Starboard Hallway"}) -"buA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) +"buA" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard{name = "Starboard Hallway"}) "buB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 4},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "buC" = (/obj/machinery/door/airlock/glass{desc = "The base's recreational center. Focused on fitness, as any astronaut would expect."; name = "Fitness Room"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "buD" = (/obj/structure/closet/boxinggloves,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) @@ -3777,7 +3777,7 @@ "buG" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "buH" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/cups,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/crew_quarters/fitness) "buI" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"buJ" = (/obj/machinery/atmospherics/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"buJ" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "buK" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/asmaint2) "buL" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "buM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -3842,7 +3842,7 @@ "bvT" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "darkgreencorners"},/area/crew_quarters/fitness) "bvU" = (/obj/machinery/door/window/eastright{base_state = "left"; icon_state = "left"; name = "Fitness Ring"},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "darkgreen"; dir = 6},/area/crew_quarters/fitness) "bvV" = (/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/crew_quarters/fitness) -"bvW" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"bvW" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bvX" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bvY" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bvZ" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -3857,29 +3857,29 @@ "bwi" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwj" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=Sec"; location = "Mech"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) -"bwl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) +"bwl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwm" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) -"bwn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) +"bwn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwo" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=Mech"; location = "AfCH1"},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) -"bwq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) +"bwq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=Escape"; location = "AfCH2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bws" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwt" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) -"bww" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) +"bww" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) -"bwy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) +"bwy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwB" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=AfCH2"; location = "Med"},/turf/simulated/floor/plasteel,/area/hallway/primary/central{name = "Aft Central Hallway"}) "bwC" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 4},/area/hallway/primary/central{name = "Aft Central Hallway"}) -"bwD" = (/obj/machinery/door_control{id = "Dorm1s"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bwD" = (/obj/machinery/door_control{id = "Dorm1s"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bwE" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"bwF" = (/obj/machinery/door_control{id = "Dorm2s"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"bwG" = (/obj/machinery/door_control{id = "Dorm3s"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"bwH" = (/obj/machinery/door_control{id = "Dorm4s"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bwF" = (/obj/machinery/door_control{id = "Dorm2s"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bwG" = (/obj/machinery/door_control{id = "Dorm3s"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bwH" = (/obj/machinery/door_control{id = "Dorm4s"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bwI" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bwJ" = (/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 1},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bwK" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) @@ -3889,7 +3889,7 @@ "bwO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bwP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bwQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) -"bwR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) +"bwR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bwS" = (/obj/machinery/light,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "bwT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/engineering{name = "Brig Power Control"; req_access_txt = "11"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bwU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall,/area/maintenance/asmaint2) @@ -3927,10 +3927,10 @@ "bxA" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitecorner"},/area/hallway/primary/central{name = "Aft Central Hallway"}) "bxB" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 9},/obj/structure/table,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 4},/area/hallway/primary/central{name = "Aft Central Hallway"}) "bxC" = (/obj/machinery/light/small,/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"bxD" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/yellow,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"bxE" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"bxF" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/green,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) -"bxG" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/blue,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bxD" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/yellow,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bxE" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bxF" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/green,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) +"bxG" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/blue,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/fancy/carpet,/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bxH" = (/obj/machinery/washing_machine,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bxI" = (/obj/machinery/washing_machine,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) "bxJ" = (/obj/structure/table,/obj/item/clothing/under/suit_jacket/really_black{pixel_x = -2},/obj/item/clothing/under/suit_jacket/female,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/crew_quarters/sleep_male{name = "Aft Dormitory"}) @@ -3944,7 +3944,7 @@ "bxR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 8},/turf/simulated/floor/bluegrid,/area/assembly/chargebay) "bxS" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/bluegrid,/area/assembly/chargebay) "bxT" = (/turf/simulated/floor/bluegrid,/area/assembly/chargebay) -"bxU" = (/obj/machinery/atmospherics/unary/vent_pump,/turf/simulated/floor/plasteel,/area/assembly/chargebay) +"bxU" = (/obj/machinery/atmospherics/components/unary/vent_pump,/turf/simulated/floor/plasteel,/area/assembly/chargebay) "bxV" = (/turf/simulated/wall,/area/assembly/assembly_line) "bxW" = (/obj/machinery/door/poddoor/shutters/preopen{id = "robotics"; name = "robotics lab shutters"},/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/assembly/assembly_line) "bxX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/poddoor/shutters/preopen{id = "robotics"; name = "robotics lab shutters"},/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/assembly/assembly_line) @@ -3994,7 +3994,7 @@ "byP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "byQ" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "byR" = (/obj/item/clothing/suit/ianshirt,/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"byS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/assembly/chargebay) +"byS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "byT" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "byU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "byV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/assembly/chargebay) @@ -4014,7 +4014,7 @@ "bzj" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/toxins/lab) "bzk" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/table,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitecorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) "bzl" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j2s"; sortType = 14},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) -"bzm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) +"bzm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) "bzn" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/light{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "greencorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) "bzo" = (/obj/structure/table,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) "bzp" = (/obj/structure/table,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; name = "Janitor's Requests Console"; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) @@ -4041,9 +4041,9 @@ "bzK" = (/obj/machinery/vending/snack,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/medbay) "bzL" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/light_switch{dir = 1; pixel_y = 22},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/surgery) "bzM" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 23},/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) -"bzN" = (/obj/structure/table/glass,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/machinery/camera{c_tag = "Surgery Examination Room"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) +"bzN" = (/obj/structure/table/glass,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/machinery/camera{c_tag = "Surgery Examination Room"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bzO" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) -"bzP" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) +"bzP" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "bzQ" = (/obj/machinery/camera{c_tag = "Surgery Observation Room"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "bzR" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/surgery) "bzS" = (/obj/structure/table/glass,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/mask/surgical,/obj/item/clothing/suit/apron/surgical,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/surgery) @@ -4068,7 +4068,7 @@ "bAl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "bAm" = (/obj/machinery/computer/rdconsole/robotics,/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/assembly/assembly_line) "bAn" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/stool,/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/assembly/assembly_line) -"bAo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/assembly/assembly_line) +"bAo" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/assembly/assembly_line) "bAp" = (/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/assembly/assembly_line) "bAq" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/assembly/assembly_line) "bAr" = (/obj/structure/bodycontainer/morgue,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/assembly/assembly_line) @@ -4078,7 +4078,7 @@ "bAv" = (/turf/simulated/floor/plasteel{icon_state = "warnwhitecorner"},/area/toxins/lab) "bAw" = (/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/toxins/lab) "bAx" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warnwhitecorner"},/area/toxins/lab) -"bAy" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) +"bAy" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) "bAz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/toxins/lab) "bAA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/toxins/lab) "bAB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"},/area/hallway/primary/aft{name = "Aft Hallway"}) @@ -4088,7 +4088,7 @@ "bAF" = (/obj/structure/table,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) "bAG" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) "bAH" = (/obj/structure/stool,/obj/effect/landmark/start{name = "Janitor"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) -"bAI" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) +"bAI" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) "bAJ" = (/obj/structure/janitorialcart,/obj/item/weapon/mop,/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) "bAK" = (/obj/structure/cable/cyan{icon_state = "2-4"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bAL" = (/obj/machinery/power/apc{dir = 4; name = "Medbay Foyer APC"; pixel_x = 25},/obj/structure/cable/cyan{icon_state = "0-8"},/turf/simulated/floor/plating,/area/medical/medbay) @@ -4098,7 +4098,7 @@ "bAP" = (/obj/machinery/door/window/northleft{dir = 4; name = "Containment Pen"; req_access_txt = "5; 33"},/obj/machinery/door/poddoor/preopen{id = "chemTesting"; name = "Containment Door"},/turf/simulated/floor/engine,/area/medical/chemistry) "bAQ" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/engine,/area/medical/chemistry) "bAR" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"bAS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"bAS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bAT" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bAU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bAV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -4107,7 +4107,7 @@ "bAY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bAZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"},/area/medical/medbay) "bBa" = (/obj/machinery/door/airlock/medical{name = "Examination room"; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/medical/surgery) -"bBb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"},/area/medical/surgery) +"bBb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"},/area/medical/surgery) "bBc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bBd" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bBe" = (/obj/machinery/door/airlock/medical{name = "Surgery Observation Room"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) @@ -4162,7 +4162,7 @@ "bCb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "whiteblue"},/area/medical/medbay) "bCc" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "whiteblue"},/area/medical/medbay) "bCd" = (/turf/simulated/floor/plasteel{icon_state = "whiteblue"},/area/medical/medbay) -"bCe" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay) +"bCe" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay) "bCf" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 29},/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitehall"},/area/medical/medbay) "bCg" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/surgery) "bCh" = (/obj/machinery/door/airlock/glass_medical{desc = "A storage area for important medical supplies. Leads to the front desk."; name = "Patient Room"; req_access_txt = "5"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) @@ -4170,7 +4170,7 @@ "bCj" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "bCk" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "bCl" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) -"bCm" = (/obj/structure/table/glass,/obj/item/weapon/surgicaldrill,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/surgery) +"bCm" = (/obj/structure/table/glass,/obj/item/weapon/surgicaldrill,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/surgery) "bCn" = (/obj/structure/optable,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bCo" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/surgery) "bCp" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -4222,11 +4222,11 @@ "bDj" = (/obj/structure/table/glass,/obj/item/weapon/retractor,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/surgery) "bDk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bDl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) -"bDm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) +"bDm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bDn" = (/obj/structure/table/glass,/obj/item/weapon/circular_saw,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/surgery) "bDo" = (/obj/structure/rack,/obj/item/clothing/tie/stethoscope,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bDp" = (/obj/structure/stool/bed/chair/comfy/black{dir = 1},/turf/simulated/floor/wood,/area/library) -"bDq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/library) +"bDq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/library) "bDr" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/fancy/carpet,/area/library) "bDs" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/fancy/carpet,/area/library) "bDt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/fancy/carpet,/area/library) @@ -4239,22 +4239,22 @@ "bDA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bDB" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/plasteel,/area/assembly/assembly_line) "bDC" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/assembly/assembly_line) -"bDD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/assembly/assembly_line) +"bDD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/assembly/assembly_line) "bDE" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel,/area/assembly/assembly_line) "bDF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/assembly/assembly_line) "bDG" = (/obj/machinery/door/window/southleft{dir = 8; name = "Robotics Surgery"; req_access_txt = "29"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteyellow"},/area/assembly/assembly_line) "bDH" = (/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/assembly_line) -"bDI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/assembly_line) +"bDI" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/assembly_line) "bDJ" = (/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/assembly_line) "bDK" = (/obj/structure/optable{name = "Robotics Operating Table"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/assembly_line) "bDL" = (/obj/structure/table/glass,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/weapon/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/toxins/lab) "bDM" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhitecorner"},/area/toxins/lab) "bDN" = (/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/lab) "bDO" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/lab) -"bDP" = (/obj/machinery/atmospherics/unary/vent_pump,/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/lab) +"bDP" = (/obj/machinery/atmospherics/components/unary/vent_pump,/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/lab) "bDQ" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/lab) "bDR" = (/obj/machinery/light_switch{dir = 8; pixel_x = -22},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) -"bDS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) +"bDS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) "bDT" = (/obj/effect/landmark/start{name = "Janitor"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) "bDU" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) "bDV" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) @@ -4277,7 +4277,7 @@ "bEm" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/table/glass,/turf/simulated/floor/plasteel{icon_state = "whitebluecorner"},/area/medical/medbay) "bEn" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bEo" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) -"bEp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) +"bEp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "bEq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "bEr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/surgery) "bEs" = (/obj/structure/table/glass,/obj/item/weapon/cautery{pixel_x = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whiteblue"},/area/medical/surgery) @@ -4290,7 +4290,7 @@ "bEz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/obj/structure/bookcase{name = "bookcase (Non-Fiction)"},/turf/simulated/floor/wood,/area/library) "bEA" = (/obj/structure/bookcase{name = "bookcase (Non-Fiction)"},/turf/simulated/floor/wood,/area/library) "bEB" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/library) -"bEC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/wood,/area/library) +"bEC" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/wood,/area/library) "bED" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/library) "bEE" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/wall,/area/maintenance/asmaint2) "bEF" = (/obj/structure/cable/pink{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -4326,7 +4326,7 @@ "bFj" = (/obj/machinery/door/window/northright{name = "Janitor's Closet Deliveries"; req_access_txt = "26"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/janitor) "bFk" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "Janitor"},/obj/structure/plasticflaps,/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 8; icon_state = "loadingarea"},/area/janitor) "bFl" = (/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/dropper,/obj/structure/table/glass,/obj/machinery/requests_console{department = "Chemistry"; departmentType = 2; name = "Chemistry Requests Console"; pixel_x = -32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteyellow"},/area/medical/chemistry) -"bFm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) +"bFm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bFn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bFo" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellow"},/area/medical/chemistry) "bFp" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/window/eastright{dir = 8; name = "Chemistry Desk"; req_access_txt = "5; 33"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellowfull"},/area/medical/medbay) @@ -4355,15 +4355,15 @@ "bFM" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bFN" = (/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/structure/table/glass,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bFO" = (/obj/machinery/chem_heater,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellow"},/area/medical/chemistry) -"bFP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"bFP" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bFQ" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay) "bFR" = (/obj/machinery/door/airlock/glass_security{name = "Security Post"; req_access_txt = "63"},/turf/simulated/floor/plasteel{icon_state = "whiteblue"},/area/medical/medbay) "bFS" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) "bFT" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"bFU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay) +"bFU" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay) "bFV" = (/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteblue"},/area/medical/medbay) -"bFW" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{current_temperature = 80; on = 1},/obj/machinery/status_display{pixel_y = 32},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/medbay) -"bFX" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteblue"},/area/medical/medbay) +"bFW" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{current_temperature = 80; on = 1},/obj/machinery/status_display{pixel_y = 32},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/medbay) +"bFX" = (/obj/machinery/atmospherics/components/unary/cryo_cell,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteblue"},/area/medical/medbay) "bFY" = (/obj/structure/table/glass,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/obj/machinery/door_control{desc = "A remote control switch for the medbay cryogenics."; id = "FoyerCryo"; name = "Cryogenics Doors Control"; normaldoorcontrol = 1; pixel_x = -26; pixel_y = -9; req_access_txt = "0"},/obj/item/weapon/wrench,/obj/item/weapon/paper{info = "Due to long lines at the Cryo station, we've implemented a door button to allow people to get out without the aid of an MD. Please use it rather than screaming endlessly."; name = "Notice to Patients"},/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteblue"},/area/medical/medbay) "bFZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/surgery) "bGa" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/machinery/light_switch{dir = 1; pixel_y = 22},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteblue"},/area/medical/surgery) @@ -4400,15 +4400,15 @@ "bGF" = (/obj/structure/closet/firecloset,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bGG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"}) "bGH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) -"bGI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) +"bGI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) "bGJ" = (/obj/machinery/light{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) "bGK" = (/turf/simulated/wall,/area/hallway/primary/aft{name = "Aft Hallway"}) "bGL" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bGM" = (/obj/machinery/power/apc{dir = 1; name = "Custodial Closet APC"; pixel_y = 25},/obj/structure/cable/cyan{icon_state = "0-2"},/turf/simulated/floor/plating,/area/janitor) "bGN" = (/turf/simulated/wall,/area/maintenance/asmaint) "bGO" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bGP" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/camera{c_tag = "Medbay Power Control"},/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bGQ" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/asmaint) +"bGP" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/camera{c_tag = "Medbay Power Control"},/turf/simulated/floor/plating,/area/maintenance/asmaint) +"bGQ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bGR" = (/obj/item/clothing/glasses/science{pixel_x = 2; pixel_y = 4},/obj/item/clothing/glasses/science,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteyellowcorner"},/area/medical/chemistry) "bGS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bGT" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellow"},/area/medical/chemistry) @@ -4424,18 +4424,18 @@ "bHd" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"},/area/medical/medbay) "bHe" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bHf" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"bHg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay) +"bHg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay) "bHh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteblue"},/area/medical/medbay) "bHi" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"},/area/medical/surgery) "bHj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) -"bHk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) +"bHk" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bHl" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/surgery) "bHm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bHn" = (/obj/structure/extinguisher_cabinet{pixel_x = -27},/obj/structure/stool/bed/chair/comfy/black{dir = 1},/turf/simulated/floor/wood,/area/library) "bHo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/fancy/carpet,/area/library) "bHp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/fancy/carpet,/area/library) "bHq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/fancy/carpet,/area/library) -"bHr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/library) +"bHr" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/library) "bHs" = (/obj/structure/table/wood,/obj/item/weapon/lipstick/random,/turf/simulated/floor/wood,/area/library) "bHt" = (/obj/structure/grille,/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating/airless,/area/mine/abandoned) "bHu" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/mine/abandoned) @@ -4459,7 +4459,7 @@ "bHM" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bHN" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/structure/cable/cyan{icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bHO" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/machinery/door/airlock/atmos{name = "Medbay Atmospheric Control"; req_access_txt = "24"},/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bHP" = (/obj/machinery/atmospherics/binary/pump/on{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) +"bHP" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bHQ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bHR" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bHS" = (/obj/machinery/door/airlock/maintenance{name = "Chemistry Lab Maintenance"; req_access_txt = "5; 33"},/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -4482,7 +4482,7 @@ "bIj" = (/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bIk" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"},/area/medical/surgery) "bIl" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/wood,/area/library) -"bIm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/library) +"bIm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/library) "bIn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/library) "bIo" = (/obj/structure/bookcase{name = "bookcase (Adult)"},/turf/simulated/floor/wood,/area/library) "bIp" = (/obj/structure/table/wood,/obj/item/weapon/folder,/obj/item/weapon/pen,/turf/simulated/floor/wood,/area/library) @@ -4510,11 +4510,11 @@ "bIL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bIM" = (/obj/structure/cable/cyan{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bIN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/asmaint) -"bIO" = (/obj/machinery/atmospherics/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint) +"bIO" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bIP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bIQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bIR" = (/obj/structure/closet/wardrobe/chemistry_white,/obj/machinery/newscaster{dir = 8; pixel_x = -32},/turf/simulated/floor/plasteel{icon_state = "whiteyellowcorner"; dir = 8},/area/medical/chemistry) -"bIS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) +"bIS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bIT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bIU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bIV" = (/obj/structure/closet/secure_closet/chemical,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellow"},/area/medical/chemistry) @@ -4524,14 +4524,14 @@ "bIZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bJa" = (/obj/structure/stool/bed/roller,/obj/item/device/radio/intercom{frequency = 1485; name = "Station Intercom (Medbay)"; pixel_y = -29},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay) "bJb" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/medical/medbay) -"bJc" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/medical/medbay) -"bJd" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/medical/medbay) +"bJc" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/medical/medbay) +"bJd" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/medical/medbay) "bJe" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/obj/machinery/light_switch{dir = 4; pixel_x = 22},/obj/machinery/camera{c_tag = "Medbay Security Post"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/medical/medbay) "bJf" = (/obj/item/device/radio/intercom{frequency = 1485; name = "Station Intercom (Medbay)"; pixel_y = -29},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay) -"bJg" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) +"bJg" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) "bJh" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/medical/medbay) "bJi" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/surgery) -"bJj" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) +"bJj" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "bJk" = (/obj/machinery/door/airlock/maintenance{name = "Medbay Maintenance"; req_access_txt = "5"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bJl" = (/obj/structure/stool/bed/chair/comfy/black{dir = 4},/obj/machinery/newscaster{dir = 8; pixel_x = -32},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/wood,/area/library) "bJm" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/wood,/area/library) @@ -4583,9 +4583,9 @@ "bKg" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/machinery/light{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/medical/medbay) "bKh" = (/obj/machinery/door/airlock/glass_medical{desc = "The front entrance to the medical bay. Can be exited even without ID via the buttons."; id_tag = "FoyerRight"; name = "Medbay"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bKi" = (/obj/machinery/door/airlock/glass_medical{desc = "The front entrance to the medical bay. Can be exited even without ID via the buttons."; id_tag = "FoyerRight"; name = "Medbay"; req_access_txt = "5"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"bKj" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{dir = 10; icon_state = "whiteblue"},/area/medical/medbay) +"bKj" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{dir = 10; icon_state = "whiteblue"},/area/medical/medbay) "bKk" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay) -"bKl" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "whitebluecorner"},/area/medical/medbay) +"bKl" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "whitebluecorner"},/area/medical/medbay) "bKm" = (/turf/simulated/floor/plasteel{dir = 6; icon_state = "whiteblue"},/area/medical/medbay) "bKn" = (/turf/simulated/floor/plasteel{dir = 10; icon_state = "whiteblue"},/area/medical/surgery) "bKo" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/surgery) @@ -4610,7 +4610,7 @@ "bKH" = (/obj/structure/girder,/turf/simulated/floor/plasteel/airless{icon_state = "asteroidfloor"},/area/mine/abandoned) "bKI" = (/obj/item/organ/heart{beating = 0},/obj/effect/decal/cleanable/blood/gibs,/turf/simulated/floor/plating/asteroid/airless,/area/mine/explored) "bKJ" = (/obj/effect/decal/cleanable/blood,/obj/item/weapon/ectoplasm,/turf/simulated/floor/plating/asteroid/airless,/area/mine/explored) -"bKK" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"bKK" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bKL" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/camera{c_tag = "Research Atmospheric Control"},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bKM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bKN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/asmaint2) @@ -4620,7 +4620,7 @@ "bKR" = (/obj/structure/stool,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bKS" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching the RD's goons from the safety of his office."; dir = 4; name = "Research Monitor"; network = list("RD"); pixel_x = -28},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/crew_quarters/hor) "bKT" = (/obj/structure/stool/bed/chair/office/light,/obj/effect/landmark/start{name = "Research Director"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) -"bKU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) +"bKU" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) "bKV" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) "bKW" = (/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) "bKX" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 31},/obj/structure/lamarr,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/crew_quarters/hor) @@ -4697,7 +4697,7 @@ "bMq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "whiteredcorner"; dir = 4},/area/medical/medbay2) "bMr" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitered"},/area/medical/medbay2) "bMs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/requests_console{department = "Medbay"; departmentType = 1; name = "Medbay Requests Console"; pixel_y = 32},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitered"},/area/medical/medbay2) -"bMt" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "whiteredcorner"; dir = 1},/area/medical/medbay2) +"bMt" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "whiteredcorner"; dir = 1},/area/medical/medbay2) "bMu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bMv" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bMw" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay2) @@ -4720,7 +4720,7 @@ "bMN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/asmaint) "bMO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/mineral/random/low_chance,/area/mine/explored) "bMP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/explored) -"bMQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/space) +"bMQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/space) "bMR" = (/obj/item/weapon/rack_parts,/obj/machinery/light/built{dir = 1},/turf/simulated/floor/plasteel/airless{icon_state = "damaged5"},/area/mine/abandoned) "bMS" = (/obj/structure/rack,/obj/item/weapon/pickaxe{pixel_x = 5},/obj/item/weapon/shovel{pixel_x = -5},/turf/simulated/floor/plating/airless,/area/mine/abandoned) "bMT" = (/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/plasteel/airless{icon_state = "floorgrime"},/area/mine/abandoned) @@ -4730,7 +4730,7 @@ "bMX" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bMY" = (/obj/machinery/r_n_d/server/core,/turf/simulated/floor/bluegrid,/area/crew_quarters/hor) "bMZ" = (/turf/simulated/floor/bluegrid,/area/crew_quarters/hor) -"bNa" = (/obj/machinery/atmospherics/unary/vent_pump,/turf/simulated/floor/bluegrid,/area/crew_quarters/hor) +"bNa" = (/obj/machinery/atmospherics/components/unary/vent_pump,/turf/simulated/floor/bluegrid,/area/crew_quarters/hor) "bNb" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/hor) "bNc" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warnwhitecorner"},/area/crew_quarters/hor) "bNd" = (/obj/structure/stool/bed/chair/office/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) @@ -4749,14 +4749,14 @@ "bNq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/light_switch{pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "whiteyellowcorner"; dir = 8},/area/medical/medbay2) "bNr" = (/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bNs" = (/obj/machinery/door/airlock/glass_medical{desc = "SS13's Chemistry lab, to be used only by qualified and cautious experts."; name = "Chemistry Lab"; req_access_txt = "5; 33"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellowfull"},/area/medical/medbay2) -"bNt" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteyellow"},/area/medical/medbay2) +"bNt" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteyellow"},/area/medical/medbay2) "bNu" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bNv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bNw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "whitebluecorner"},/area/medical/medbay2) "bNx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "whiteblue"},/area/medical/medbay2) "bNy" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{pixel_y = -32},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "whiteblue"},/area/medical/medbay2) "bNz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay2) -"bNA" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) +"bNA" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bNB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bNC" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bND" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) @@ -4789,7 +4789,7 @@ "bOe" = (/obj/machinery/atmospherics/pipe/simple/general/hidden{dir = 10},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/crew_quarters/hor) "bOf" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) "bOg" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) -"bOh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) +"bOh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) "bOi" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/light{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) "bOj" = (/obj/structure/cable/cyan{icon_state = "1-2"},/turf/simulated/wall,/area/maintenance/asmaint) "bOk" = (/turf/simulated/wall/r_wall,/area/medical/genetics) @@ -4811,7 +4811,7 @@ "bOA" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay2) "bOB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bOC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) -"bOD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) +"bOD" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bOE" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bOF" = (/turf/simulated/wall/r_wall,/area/medical/virology) "bOG" = (/obj/structure/cable/cyan{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -4826,7 +4826,7 @@ "bOP" = (/obj/machinery/door/airlock/hatch,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bOQ" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bOR" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid,/area/crew_quarters/hor) -"bOS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/bluegrid,/area/crew_quarters/hor) +"bOS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/bluegrid,/area/crew_quarters/hor) "bOT" = (/obj/machinery/atmospherics/pipe/simple/general/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/crew_quarters/hor) "bOU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) "bOV" = (/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) @@ -4863,7 +4863,7 @@ "bPA" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/rxglasses,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/machinery/camera{c_tag = "Medbay Starboard"; dir = 8},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "whitegreencorner"},/area/medical/medbay2) "bPB" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/medical/virology) "bPC" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitegreen"},/area/medical/virology) -"bPD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Virology Access"},/obj/structure/closet/l3closet,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) +"bPD" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Virology Access"},/obj/structure/closet/l3closet,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) "bPE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/closet/l3closet,/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitegreen"},/area/medical/virology) "bPF" = (/obj/machinery/smartfridge/chemistry/virology,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitegreen"},/area/medical/virology) "bPG" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/structure/sign/deathsposal{pixel_y = 32},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) @@ -4871,7 +4871,7 @@ "bPI" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/structure/sink/kitchen{pixel_y = 32},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitegreen"},/area/medical/virology) "bPJ" = (/turf/simulated/wall,/area/medical/virology) "bPK" = (/obj/structure/closet/wardrobe/virology_white,/obj/item/weapon/tank/internals/air,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitegreen"},/area/medical/virology) -"bPL" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/item/weapon/wrench,/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitegreen"},/area/medical/virology) +"bPL" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/item/weapon/wrench,/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitegreen"},/area/medical/virology) "bPM" = (/turf/space,/area/mine/abandoned) "bPN" = (/obj/structure/closet,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/plating/airless,/area/mine/abandoned) "bPO" = (/turf/simulated/floor/plasteel/airless{icon_state = "damaged4"},/area/mine/abandoned) @@ -4880,10 +4880,10 @@ "bPR" = (/turf/simulated/wall/r_wall,/area/toxins/mixing) "bPS" = (/turf/simulated/wall/r_wall,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bPT" = (/obj/machinery/computer/rdservercontrol,/obj/machinery/atmospherics/pipe/simple/general/hidden{dir = 5},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warnwhitecorner"},/area/crew_quarters/hor) -"bPU" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) +"bPU" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) "bPV" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) "bPW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) -"bPX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) +"bPX" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/hor) "bPY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/crew_quarters/hor) "bPZ" = (/obj/structure/disposalpipe/segment,/obj/structure/extinguisher_cabinet{pixel_x = -27},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) "bQa" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/sortjunction{icon_state = "pipe-j2s"; sortType = 23},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) @@ -4902,7 +4902,7 @@ "bQn" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/rxglasses,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"},/area/medical/genetics) "bQo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bQp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) -"bQq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) +"bQq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bQr" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/machinery/camera{c_tag = "Cloning Lab"; dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/genetics) "bQs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/medbay2) "bQt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteblue"},/area/medical/medbay2) @@ -4914,7 +4914,7 @@ "bQz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteblue"},/area/medical/medbay2) "bQA" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/cups,/obj/machinery/light_switch{dir = 1; pixel_y = 22},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteblue"},/area/medical/medbay2) "bQB" = (/obj/item/weapon/storage/firstaid/fire{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/firstaid/fire,/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay2) -"bQC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) +"bQC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bQD" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/medbay2) "bQE" = (/obj/machinery/door/airlock/virology{name = "Virology Access"; req_access_txt = "39"},/turf/simulated/floor/plasteel{icon_state = "whitegreenfull"},/area/medical/virology) "bQF" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) @@ -4927,14 +4927,14 @@ "bQM" = (/obj/machinery/computer/pandemic,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) "bQN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/newscaster,/turf/simulated/wall,/area/medical/virology) "bQO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) -"bQP" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/effect/landmark/start{name = "Virologist"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) +"bQP" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/effect/landmark/start{name = "Virologist"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) "bQQ" = (/obj/structure/girder,/turf/space,/area/mine/abandoned) "bQR" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable/pink{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bQS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/pink{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bQT" = (/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bQU" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/power/apc{dir = 1; name = "Toxins Lab APC"; pixel_y = 25},/obj/structure/cable/pink{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/toxins/mixing) "bQV" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/toxins/mixing) -"bQW" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/toxins/mixing) +"bQW" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/toxins/mixing) "bQX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/toxins/mixing) "bQY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display,/turf/simulated/wall/r_wall,/area/toxins/mixing) "bQZ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/mixing) @@ -4942,14 +4942,14 @@ "bRb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bRc" = (/obj/structure/table/glass,/obj/item/device/flashlight/pen,/obj/item/device/radio/headset/headset_medsci,/obj/machinery/camera{c_tag = "Genetics Research"; dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurple"},/area/medical/genetics) "bRd" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) -"bRe" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) +"bRe" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bRf" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/medical/genetics) "bRg" = (/obj/machinery/door/airlock/glass_medical{id_tag = ""; name = "Genetics Research"; req_access_txt = "5; 9"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurple"},/area/medical/genetics) "bRh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bRi" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bRj" = (/obj/machinery/clonepod,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/genetics) "bRk" = (/obj/structure/table/glass,/obj/item/weapon/storage/firstaid/regular{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular,/obj/machinery/light_switch{dir = 8; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/camera{c_tag = "Medbay Storage"; dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay2) -"bRl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) +"bRl" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bRm" = (/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay2) "bRn" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay2) "bRo" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) @@ -4963,7 +4963,7 @@ "bRw" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/masks,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay2) "bRx" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreencorner"},/area/medical/medbay2) "bRy" = (/obj/machinery/shower{dir = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitegreen"},/area/medical/virology) -"bRz" = (/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "whitegreen"},/area/medical/virology) +"bRz" = (/obj/machinery/light/small,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "whitegreen"},/area/medical/virology) "bRA" = (/obj/structure/sink{dir = 4; pixel_x = 11},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitegreen"},/area/medical/virology) "bRB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/medical/virology) "bRC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light_switch{dir = 8; pixel_x = -22},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) @@ -4985,10 +4985,10 @@ "bRS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bRT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/toxins/mixing) "bRU" = (/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/mixing) -"bRV" = (/obj/machinery/atmospherics/binary/valve,/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/mixing) -"bRW" = (/obj/machinery/requests_console{department = "Research"; departmentType = 2; name = "Research Requests Console"; pixel_y = 32},/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/mixing) -"bRX" = (/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) -"bRY" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 23},/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) +"bRV" = (/obj/machinery/atmospherics/components/binary/valve,/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/mixing) +"bRW" = (/obj/machinery/requests_console{department = "Research"; departmentType = 2; name = "Research Requests Console"; pixel_y = 32},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/mixing) +"bRX" = (/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) +"bRY" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 23},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bRZ" = (/obj/structure/dispenser,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurplecorner"},/area/toxins/mixing) "bSa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurple"},/area/toxins/mixing) "bSb" = (/turf/simulated/floor/plasteel{icon_state = "whitepurple"; dir = 5},/area/toxins/mixing) @@ -5001,7 +5001,7 @@ "bSi" = (/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurple"},/area/medical/genetics) "bSj" = (/obj/structure/window/reinforced{dir = 4},/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurple"},/area/medical/genetics) "bSk" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/medical/genetics) -"bSl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) +"bSl" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bSm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bSn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/dna_scannernew,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/medical/genetics) "bSo" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/genetics) @@ -5018,26 +5018,26 @@ "bSz" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/cable/cyan{icon_state = "0-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/cmo) "bSA" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/medical/cmo) "bSB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/requests_console{department = "Virology"; name = "Virology Requests Console"; pixel_x = -32},/obj/structure/closet/l3closet/virology,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) -"bSC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"bSC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bSD" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel{icon_state = "whitegreencorner"},/area/medical/virology) "bSE" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitegreen"},/area/medical/virology) "bSF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/virology{name = "Break Room"; req_access_txt = "39"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) "bSG" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) -"bSH" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/item/weapon/storage/secure/safe{pixel_x = 31},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"bSH" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/item/weapon/storage/secure/safe{pixel_x = 31},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bSI" = (/obj/machinery/power/apc{dir = 8; name = "Virology APC"; pixel_x = -24},/obj/structure/cable/cyan{icon_state = "0-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/medical/virology) "bSJ" = (/obj/structure/cable/cyan{icon_state = "1-2"},/obj/structure/cable/cyan{icon_state = "2-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bSK" = (/obj/structure/lattice,/turf/space,/area/toxins/mixing) "bSL" = (/obj/machinery/door/poddoor{id = "mixvent"; name = "Mix Vent Blast Door"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) "bSM" = (/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) -"bSN" = (/obj/machinery/sparker{id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_y = 32},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) +"bSN" = (/obj/machinery/sparker{id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_y = 32},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) "bSO" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/mixing) -"bSP" = (/obj/machinery/airlock_sensor{id_tag = "tox_airlock_sensor"; master_tag = "tox_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/binary/pump{dir = 4; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing) +"bSP" = (/obj/machinery/airlock_sensor{id_tag = "tox_airlock_sensor"; master_tag = "tox_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/components/binary/pump{dir = 4; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing) "bSQ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/meter,/obj/machinery/embedded_controller/radio/airlock_controller{airpump_tag = "tox_airlock_pump"; exterior_door_tag = "tox_airlock_exterior"; id_tag = "tox_airlock_control"; interior_door_tag = "tox_airlock_interior"; pixel_x = -24; sanitize_external = 1; sensor_tag = "tox_airlock_sensor"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warnwhitecorner"},/area/toxins/mixing) "bSR" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bSS" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bST" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/obj/machinery/meter,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bSU" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) -"bSV" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) +"bSV" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bSW" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/toxins/mixing) "bSX" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bSY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -5054,7 +5054,7 @@ "bTj" = (/obj/machinery/computer/scan_consolenew,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/medical/genetics) "bTk" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/genetics) "bTl" = (/obj/structure/closet/wardrobe/white,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/genetics) -"bTm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) +"bTm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bTn" = (/obj/machinery/dna_scannernew,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/genetics) "bTo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay2) "bTp" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay2) @@ -5071,7 +5071,7 @@ "bTA" = (/turf/simulated/floor/plating,/area/medical/cmo) "bTB" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitegreen"},/area/medical/virology) "bTC" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) -"bTD" = (/obj/structure/table/glass,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitegreen"},/area/medical/virology) +"bTD" = (/obj/structure/table/glass,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitegreen"},/area/medical/virology) "bTE" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/virology) "bTF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreencorner"},/area/medical/virology) "bTG" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) @@ -5082,10 +5082,10 @@ "bTL" = (/obj/machinery/power/solar{id = "starboardsolar"; name = "Starboard Solar Array"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/solar/starboard) "bTM" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/toxins/mixing) "bTN" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "8"},/turf/simulated/floor/engine,/area/toxins/mixing) -"bTO" = (/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{frequency = 1449; id = "tox_airlock_pump"},/turf/simulated/floor/engine,/area/toxins/mixing) +"bTO" = (/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{frequency = 1449; id = "tox_airlock_pump"},/turf/simulated/floor/engine,/area/toxins/mixing) "bTP" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "tox_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "8"},/turf/simulated/floor/engine,/area/toxins/mixing) "bTQ" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/mixing) -"bTR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) +"bTR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bTS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bTT" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bTU" = (/obj/item/device/assembly/prox_sensor{pixel_x = -4; pixel_y = 1},/obj/item/device/assembly/prox_sensor{pixel_x = 8; pixel_y = 9},/obj/item/device/assembly/prox_sensor{pixel_x = 9; pixel_y = -2},/obj/item/device/assembly/prox_sensor{pixel_y = 2},/obj/structure/table/glass,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/toxins/mixing) @@ -5120,11 +5120,11 @@ "bUx" = (/obj/structure/table/glass,/obj/item/clothing/tie/stethoscope,/obj/item/clothing/tie/stethoscope,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bUy" = (/obj/machinery/door/airlock/glass_command{desc = "The workplace of the station's foremost doctor of med-TURN ON THOSE FUCKING SUIT SENSORS."; name = "Chief Medical Officer's Office"; req_access_txt = "40"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bUz" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) -"bUA" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/cyan{icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) +"bUA" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/cyan{icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bUB" = (/mob/living/simple_animal/pet/cat/Runtime,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bUC" = (/obj/machinery/computer/crew,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bUD" = (/obj/effect/decal/cleanable/blood,/obj/item/weapon/scalpel,/turf/simulated/floor/plating,/area/medical/cmo) -"bUE" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitegreen"},/area/medical/virology) +"bUE" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitegreen"},/area/medical/virology) "bUF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "whitegreen"},/area/medical/virology) "bUG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitegreen"},/area/medical/virology) "bUH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/glass_virology{name = "Isolation Room"; req_access_txt = "39"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) @@ -5132,22 +5132,22 @@ "bUJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bUK" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/virology) "bUL" = (/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitegreen"},/area/medical/virology) -"bUM" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) +"bUM" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) "bUN" = (/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitegreen"},/area/medical/virology) "bUO" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/solar/starboard) "bUP" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'BOMB RANGE"; name = "BOMB RANGE"},/turf/simulated/wall/r_wall,/area/toxins/test_area) "bUQ" = (/turf/simulated/wall/r_wall,/area/toxins/test_area) "bUR" = (/turf/simulated/wall,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) -"bUS" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 4; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) -"bUT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/binary/pump{dir = 8; on = 1},/obj/structure/sign/fire{pixel_y = -32},/obj/machinery/light/small,/turf/simulated/floor/engine,/area/toxins/mixing) +"bUS" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 4; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) +"bUT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/components/binary/pump{dir = 8; on = 1},/obj/structure/sign/fire{pixel_y = -32},/obj/machinery/light/small,/turf/simulated/floor/engine,/area/toxins/mixing) "bUU" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/meter,/obj/machinery/door_control{id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; req_access_txt = "7"},/obj/machinery/ignition_switch{id = "mixingsparker"; pixel_x = -25; pixel_y = -5},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/mixing) "bUV" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bUW" = (/obj/structure/stool/bed/chair/office/light,/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bUX" = (/obj/item/device/assembly/signaler{pixel_y = 8},/obj/item/device/assembly/signaler{pixel_x = -8; pixel_y = 5},/obj/item/device/assembly/signaler{pixel_x = 6; pixel_y = 5},/obj/item/device/assembly/signaler{pixel_x = -2; pixel_y = -2},/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/toxins/mixing) "bUY" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bUZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"bVa" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"bVb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) +"bVa" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"bVb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) "bVc" = (/obj/machinery/door/airlock/maintenance{name = "Genetics Research Maintenance"; req_access_txt = "5; 9"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bVd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/medical{desc = "Temporary storage for departed organisms, mostly the crew."; name = "Morgue"; req_access_txt = "6;5"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/genetics) "bVe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/medical{desc = "Temporary storage for departed organisms, mostly the crew."; name = "Morgue"; req_access_txt = "6;5"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) @@ -5165,7 +5165,7 @@ "bVq" = (/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Medical Officer's Desk"; departmentType = 5; name = "Chief Medical Officer Requests Console"; pixel_x = 32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bVr" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/virology) "bVs" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) -"bVt" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"bVt" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bVu" = (/obj/machinery/door/airlock/glass_virology{name = "Monkey Pen"; req_access_txt = "39"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) "bVv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bVw" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) @@ -5175,13 +5175,13 @@ "bVA" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'BOMB RANGE"; name = "BOMB RANGE"},/turf/simulated/wall,/area/mine/explored) "bVB" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 1},/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bVC" = (/obj/machinery/light/small{dir = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) -"bVD" = (/obj/machinery/camera{c_tag = "Toxins Launch Room Access"; dir = 9; network = list("SS13","RD")},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) +"bVD" = (/obj/machinery/camera{c_tag = "Toxins Launch Room Access"; dir = 9; network = list("SS13","RD")},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bVE" = (/obj/structure/cable/pink{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 8; name = "Toxins Launch Room APC"; pixel_x = -25},/turf/simulated/floor/plating,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bVF" = (/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bVG" = (/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/pink{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bVH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/toxins/mixing) "bVI" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/toxins/mixing) -"bVJ" = (/obj/machinery/atmospherics/binary/valve,/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/toxins/mixing) +"bVJ" = (/obj/machinery/atmospherics/components/binary/valve,/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/toxins/mixing) "bVK" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warnwhitecorner"},/area/toxins/mixing) "bVL" = (/obj/item/device/transfer_valve{pixel_x = -5},/obj/item/device/transfer_valve{pixel_x = -5},/obj/item/device/transfer_valve,/obj/item/device/transfer_valve,/obj/item/device/transfer_valve{pixel_x = 5},/obj/item/device/transfer_valve{pixel_x = 5},/obj/structure/table/glass,/obj/machinery/camera{c_tag = "Toxins Lab"; dir = 1; network = list("SS13","RD")},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bVM" = (/obj/structure/table/glass,/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) @@ -5204,7 +5204,7 @@ "bWd" = (/obj/structure/table/glass,/obj/item/device/camera,/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bWe" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay2) "bWf" = (/obj/structure/stool/bed/chair/office/light{dir = 1},/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) -"bWg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) +"bWg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bWh" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) "bWi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay2) "bWj" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/cyan{icon_state = "0-4"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/cmo) @@ -5213,7 +5213,7 @@ "bWm" = (/obj/structure/table/glass,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/item/weapon/stamp/cmo,/obj/structure/cable/cyan{icon_state = "1-2"},/obj/structure/cable/cyan{icon_state = "2-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bWn" = (/obj/structure/filingcabinet/filingcabinet,/obj/machinery/camera{c_tag = "Chief Medical Officer's Office"; dir = 8},/obj/machinery/keycard_auth{pixel_x = 32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bWo" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating,/area/medical/cmo) -"bWp" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitegreen"},/area/medical/virology) +"bWp" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitegreen"},/area/medical/virology) "bWq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) "bWr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitegreen"},/area/medical/virology) "bWs" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) @@ -5231,7 +5231,7 @@ "bWE" = (/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/explored) "bWF" = (/obj/machinery/door/airlock/external{name = "External Airlock"; req_access_txt = "0"},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bWG" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_y = -32},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) -"bWH" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) +"bWH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bWI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bWJ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bWK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) @@ -5240,7 +5240,7 @@ "bWN" = (/obj/structure/cable/pink{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bWO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bWP" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/mixing) -"bWQ" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/mixing) +"bWQ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/mixing) "bWR" = (/obj/machinery/door/airlock/glass_research{name = "Toxins Lab"; req_access_txt = "7"},/turf/simulated/floor/plasteel{icon_state = "whitepurplefull"},/area/toxins/mixing) "bWS" = (/obj/machinery/status_display,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bWT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) @@ -5259,21 +5259,21 @@ "bXg" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bXh" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bXi" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) -"bXj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) +"bXj" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bXk" = (/obj/machinery/door/airlock/medical{name = "Autopsy Room"; req_access_txt = "6"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bXl" = (/obj/machinery/newscaster{dir = 8; pixel_x = -32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay2) "bXm" = (/obj/structure/rack,/obj/item/weapon/aiModule/supplied/oxygen,/obj/item/clothing/mask/breath,/obj/structure/cable/white{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/cyan{icon_state = "1-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) -"bXn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/structure/cable/cyan{icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) +"bXn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/obj/structure/cable/cyan{icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bXo" = (/obj/structure/closet/secure_closet/CMO,/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bXp" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating,/area/medical/cmo) "bXq" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitegreen"},/area/medical/virology) "bXr" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor/plasteel{icon_state = "whitegreen"},/area/medical/virology) -"bXs" = (/obj/structure/table/glass,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitegreen"},/area/medical/virology) +"bXs" = (/obj/structure/table/glass,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitegreen"},/area/medical/virology) "bXt" = (/obj/structure/table/glass,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/clothing/gloves/color/latex,/obj/item/device/healthanalyzer,/obj/item/clothing/glasses/hud/health,/turf/simulated/floor/plasteel{icon_state = "whitegreencorner"},/area/medical/virology) "bXu" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/cold{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/bottle/flu_virion,/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/simulated/floor/plasteel{icon_state = "whitegreen"},/area/medical/virology) "bXv" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/item/weapon/hand_labeler,/obj/item/device/radio/headset/headset_med,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreencorner"},/area/medical/virology) "bXw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitegreen"},/area/medical/virology) -"bXx" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "whitegreen"},/area/medical/virology) +"bXx" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "whitegreen"},/area/medical/virology) "bXy" = (/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitegreen"},/area/medical/virology) "bXz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bXA" = (/turf/simulated/wall/r_wall,/area/maintenance/starboardsolar) @@ -5314,7 +5314,7 @@ "bYj" = (/turf/simulated/floor/plasteel/airless{icon_state = "warningcorner"},/area/toxins/test_area) "bYk" = (/turf/simulated/floor/plasteel/airless{dir = 1; icon_state = "warningcorner"},/area/toxins/test_area) "bYl" = (/obj/machinery/door/airlock/external{name = "Toxins Test Chamber"; req_access_txt = "0"},/turf/simulated/floor/plating/airless{icon_state = "warnplate"},/area/toxins/test_area) -"bYm" = (/obj/structure/table/glass,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) +"bYm" = (/obj/structure/table/glass,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bYn" = (/obj/structure/stool/bed/chair{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 22},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bYo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bYp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light_switch{dir = 1; pixel_y = 22},/obj/machinery/camera{c_tag = "Toxins Launch Room"; dir = 6; network = list("SS13","RD")},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) @@ -5332,7 +5332,7 @@ "bYB" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bYC" = (/obj/structure/noticeboard{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bYD" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"bYE" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"bYE" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bYF" = (/obj/item/clothing/head/ushanka,/obj/item/clothing/under/soviet,/turf/simulated/floor/plating,/area/hallway/primary/aft{name = "Aft Hallway"}) "bYG" = (/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka,/obj/item/toy/snappop,/turf/simulated/floor/plating,/area/hallway/primary/aft{name = "Aft Hallway"}) "bYH" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/bodybags{pixel_x = 3; pixel_y = 3},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) @@ -5344,7 +5344,7 @@ "bYN" = (/obj/machinery/firealarm{pixel_y = 25},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "bYO" = (/obj/structure/closet/coffin,/obj/machinery/camera{c_tag = "Chapel Coffin Storage"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/chapel/main) "bYP" = (/obj/structure/closet/coffin,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/chapel/main) -"bYQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) +"bYQ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bYR" = (/obj/structure/table/glass,/obj/item/weapon/crowbar,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bYS" = (/obj/structure/optable{desc = "Used to examine the departed for medical purposes."; name = "Autopsy Table"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bYT" = (/obj/structure/table/glass,/obj/item/weapon/scalpel,/obj/item/weapon/retractor,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) @@ -5383,7 +5383,7 @@ "bZA" = (/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bZB" = (/obj/machinery/door/airlock/research{desc = "Make sure to pack some snacks."; name = "Toxins Launch Room"; req_access_txt = "8"},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "bZC" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) -"bZD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"bZD" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bZE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) "bZF" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) "bZG" = (/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) @@ -5400,10 +5400,10 @@ "bZR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) "bZS" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/light_switch{dir = 4; pixel_x = 22},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) "bZT" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) -"bZU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"bZU" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "bZV" = (/obj/machinery/crema_switch{pixel_x = 25},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "bZW" = (/obj/machinery/camera{c_tag = "Chapel Office"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) -"bZX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/chapel/main) +"bZX" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/fancy/carpet,/area/chapel/main) "bZY" = (/obj/structure/stool/bed/chair/comfy/black,/obj/effect/landmark/start{name = "Chaplain"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/fancy/carpet,/area/chapel/main) "bZZ" = (/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/pen,/obj/structure/table/wood,/turf/simulated/floor/fancy/carpet,/area/chapel/main) "caa" = (/obj/machinery/door/airlock{name = "Coffin Storage"; req_access_txt = "27"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) @@ -5429,7 +5429,7 @@ "cau" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel/airless{dir = 6; icon_state = "warning"},/area/toxins/test_area) "cav" = (/obj/structure/table/glass,/obj/machinery/driver_button{id = "toxinsdriver"; pixel_x = -24},/obj/item/weapon/folder/white,/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "caw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/doppler_array,/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) -"cax" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) +"cax" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plasteel,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "cay" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "caz" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "caA" = (/obj/structure/table/glass,/obj/item/device/flashlight/lamp,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -5477,7 +5477,7 @@ "cbq" = (/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "cbr" = (/turf/simulated/floor/plasteel{icon_state = "whitered"; dir = 4},/area/medical/research{name = "Research Division"}) "cbs" = (/obj/structure/closet/secure_closet/security/science,/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/medical/research{name = "Research Division"}) -"cbt" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching various laboratories."; name = "Research Monitor"; network = list("RD"); pixel_y = 28},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/camera{c_tag = "Research Security Post"; network = list("SS13","RD")},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/medical/research{name = "Research Division"}) +"cbt" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching various laboratories."; name = "Research Monitor"; network = list("RD"); pixel_y = 28},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/camera{c_tag = "Research Security Post"; network = list("SS13","RD")},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/medical/research{name = "Research Division"}) "cbu" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/medical/research{name = "Research Division"}) "cbv" = (/obj/structure/table/glass,/obj/machinery/recharger{pixel_y = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/medical/research{name = "Research Division"}) "cbw" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/preopen{id = "Biohazard"; name = "Biohazard Containment Door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) @@ -5489,27 +5489,27 @@ "cbC" = (/obj/machinery/door/airlock{name = "Aft Emergency Storage"; req_access_txt = "0"},/turf/simulated/floor/plating,/area/hallway/primary/aft{name = "Aft Hallway"}) "cbD" = (/turf/simulated/floor/plating,/area/hallway/primary/aft{name = "Aft Hallway"}) "cbE" = (/obj/item/weapon/storage/box/lights/mixed,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/aft{name = "Aft Hallway"}) -"cbF" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"cbF" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cbG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cbH" = (/obj/machinery/door/airlock{name = "Crematorium"; req_access_txt = "27"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cbI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cbJ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/fancy/carpet,/area/chapel/main) "cbK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/fancy/carpet,/area/chapel/main) -"cbL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/fancy/carpet,/area/chapel/main) +"cbL" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/fancy/carpet,/area/chapel/main) "cbM" = (/obj/machinery/light_switch{dir = 4; pixel_x = 22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cbN" = (/obj/structure/cable/cyan{icon_state = "1-4"},/obj/structure/cable/cyan{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cbO" = (/obj/structure/cable/cyan{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cbP" = (/turf/simulated/wall/r_wall,/area/atmos) "cbQ" = (/obj/machinery/door/airlock/maintenance{name = "Firefighting equipment"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/asmaint) -"cbR" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/incinerator) -"cbS" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/incinerator) +"cbR" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/incinerator) +"cbS" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cbT" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/obj/machinery/camera{c_tag = "Incinerator"; dir = 6},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cbU" = (/turf/simulated/floor/plating,/area/maintenance/incinerator) "cbV" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plating,/area/maintenance/incinerator) -"cbW" = (/obj/machinery/doorButtons/airlock_controller{idExterior = "incinerator_airlock_exterior"; idSelf = "incinerator_access_control"; idInterior = "incinerator_airlock_interior"; name = "Incinerator Access Console"; pixel_x = 24; pixel_y = -8; req_access_txt = "12"},/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Gas Pump"},/turf/simulated/floor/plating{icon_state = "warnplatecorner"},/area/maintenance/incinerator) +"cbW" = (/obj/machinery/doorButtons/airlock_controller{idExterior = "incinerator_airlock_exterior"; idSelf = "incinerator_access_control"; idInterior = "incinerator_airlock_interior"; name = "Incinerator Access Console"; pixel_x = 24; pixel_y = -8; req_access_txt = "12"},/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Gas Pump"},/turf/simulated/floor/plating{icon_state = "warnplatecorner"},/area/maintenance/incinerator) "cbX" = (/obj/machinery/doorButtons/access_button{idDoor = "incinerator_airlock_exterior"; layer = 3.1; idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -24; pixel_y = -8},/obj/structure/sign/fire{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 6},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cbY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/wall/r_wall,/area/maintenance/incinerator) -"cbZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) +"cbZ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "cca" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_y = 32},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "ccb" = (/obj/machinery/door/poddoor{id = "disvent"; name = "Incinerator Vent"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "ccc" = (/obj/structure/lattice,/turf/space,/area/maintenance/incinerator) @@ -5522,7 +5522,7 @@ "ccj" = (/turf/simulated/floor/plating,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "cck" = (/obj/machinery/mass_driver{dir = 8; id = "toxinsdriver"},/turf/simulated/floor/plating,/area/maintenance/asmaint2{icon_state = "toxtest"; name = "Toxins Launch Room"}) "ccl" = (/obj/structure/closet/bombcloset,/obj/machinery/light{dir = 8},/obj/machinery/requests_console{department = "Research"; departmentType = 2; name = "Research Requests Console"; pixel_x = -30},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) -"ccm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 101.325; on = 1; pressure_checks = 0},/turf/simulated/floor/plasteel{icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) +"ccm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 101.325; on = 1; pressure_checks = 0},/turf/simulated/floor/plasteel{icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) "ccn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) "cco" = (/obj/structure/closet/emcloset,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) "ccp" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) @@ -5556,15 +5556,15 @@ "ccR" = (/obj/structure/closet/crate,/obj/item/device/assembly/prox_sensor,/turf/simulated/floor/plating,/area/maintenance/asmaint) "ccS" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plating,/area/maintenance/asmaint) "ccT" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/asmaint) -"ccU" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) +"ccU" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) "ccV" = (/turf/simulated/floor/plasteel,/area/atmos) -"ccW" = (/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) +"ccW" = (/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) "ccX" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint) "ccY" = (/obj/structure/closet,/turf/simulated/floor/plating,/area/maintenance/asmaint) -"ccZ" = (/obj/structure/sign/nosmoking_2{pixel_x = -28},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/incinerator) -"cda" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor/plating,/area/maintenance/incinerator) +"ccZ" = (/obj/structure/sign/nosmoking_2{pixel_x = -28},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/incinerator) +"cda" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cdb" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/incinerator) -"cdc" = (/obj/machinery/atmospherics/binary/pump{dir = 8},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/incinerator) +"cdc" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cdd" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,/obj/machinery/meter,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/incinerator) "cde" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/incinerator) "cdf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/turf/simulated/floor/plating,/area/maintenance/incinerator) @@ -5577,15 +5577,15 @@ "cdm" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) "cdn" = (/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cdo" = (/obj/structure/reagent_dispensers/peppertank{pixel_x = -32},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/medical/research{name = "Research Division"}) -"cdp" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "red"},/area/medical/research{name = "Research Division"}) +"cdp" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "red"},/area/medical/research{name = "Research Division"}) "cdq" = (/turf/simulated/floor/plasteel{icon_state = "red"},/area/medical/research{name = "Research Division"}) "cdr" = (/obj/structure/table/glass,/obj/machinery/firealarm{dir = 1; pixel_x = -3; pixel_y = -24},/obj/machinery/light_switch{name = "light switch "; pixel_x = 11; pixel_y = -22},/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "ResearchFoyer"; name = "Research Door Control"; normaldoorcontrol = 1; pixel_y = -4},/obj/machinery/door_control{id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_y = 6; req_access_txt = "47"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/medical/research{name = "Research Division"}) "cds" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "whitered"; dir = 8},/area/medical/research{name = "Research Division"}) "cdt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cdu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/medical/research{name = "Research Division"}) -"cdv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) +"cdv" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "cdw" = (/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) -"cdx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Research Divison Access"; dir = 1; network = list("SS13","RD")},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) +"cdx" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Research Divison Access"; dir = 1; network = list("SS13","RD")},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "cdy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"},/area/hallway/primary/aft{name = "Aft Hallway"}) "cdz" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/chapel/main) "cdA" = (/obj/machinery/door/airlock/glass{name = "Chapel Office"; req_access_txt = "22"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) @@ -5602,13 +5602,13 @@ "cdL" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,/turf/simulated/floor/plasteel,/area/atmos) "cdM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel,/area/atmos) "cdN" = (/obj/structure/rack,/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/aiModule/supplied/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/maintenance/asmaint) -"cdO" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plating,/area/maintenance/incinerator) +"cdO" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cdP" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/turf/simulated/floor/plating,/area/maintenance/incinerator) "cdQ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cdR" = (/obj/machinery/ignition_switch{id = "Incinerator"; pixel_x = 24; pixel_y = 8},/obj/machinery/door_control{id = "disvent"; name = "Incinerator Vent Control"; pixel_y = -24; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/meter,/obj/machinery/light/small,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 8},/area/maintenance/incinerator) "cdS" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/wall/r_wall,/area/maintenance/incinerator) "cdT" = (/obj/machinery/doorButtons/access_button{idDoor = "incinerator_airlock_interior"; idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = 24; pixel_y = 8},/obj/structure/sign/fire{pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/incinerator) -"cdU" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1443; id = "air_in"},/obj/machinery/sparker{id = "Incinerator"; pixel_x = -25},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) +"cdU" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1443; id = "air_in"},/obj/machinery/sparker{id = "Incinerator"; pixel_x = -25},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "cdV" = (/turf/simulated/floor/plasteel/airless{dir = 9; icon_state = "warning"},/area/toxins/test_area) "cdW" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel/airless{dir = 5; icon_state = "warning"},/area/toxins/test_area) "cdX" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/toxins/storage) @@ -5617,7 +5617,7 @@ "cea" = (/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/toxins/storage) "ceb" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "cec" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) -"ced" = (/obj/machinery/atmospherics/unary/vent_pump,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) +"ced" = (/obj/machinery/atmospherics/components/unary/vent_pump,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "cee" = (/obj/machinery/firealarm{pixel_y = 25},/obj/machinery/camera{c_tag = "Research Divison Aft Central"; network = list("SS13","RD")},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cef" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "ceg" = (/obj/machinery/door/airlock/glass_security{name = "Security Post"; req_access_txt = "63"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "whitered"; dir = 1},/area/medical/research{name = "Research Division"}) @@ -5634,15 +5634,15 @@ "cer" = (/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "ces" = (/obj/machinery/requests_console{department = "Chapel"; departmentType = 2; name = "Chapel Requests Console"; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cet" = (/obj/machinery/pipedispenser/disposal,/turf/simulated/floor/plasteel,/area/atmos) -"ceu" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Waste to Filter"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"ceu" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Waste to Filter"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "cev" = (/obj/structure/rack,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/gloves/color/black,/obj/item/clothing/gloves/color/black,/obj/item/clothing/gloves/color/black,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/simulated/floor/plasteel,/area/atmos) "cew" = (/obj/item/weapon/crowbar,/obj/item/weapon/wrench,/obj/item/device/multitool,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/structure/table,/turf/simulated/floor/plasteel,/area/atmos) "cex" = (/obj/machinery/space_heater,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) -"cey" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel,/area/atmos) -"cez" = (/obj/machinery/atmospherics/trinary/filter{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) -"ceA" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"ceB" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Main to Pumps"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) -"ceC" = (/obj/machinery/atmospherics/binary/pump{dir = 2; name = "Filters to Waste"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"cey" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel,/area/atmos) +"cez" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) +"ceA" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) +"ceB" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Main to Pumps"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"ceC" = (/obj/machinery/atmospherics/components/binary/pump{dir = 2; name = "Filters to Waste"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "ceD" = (/obj/machinery/camera{c_tag = "Atmospherics Fore Starboard"; dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel,/area/atmos) "ceE" = (/turf/simulated/wall/r_wall,/area/maintenance/asmaint) "ceF" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/solar/starboard) @@ -5675,7 +5675,7 @@ "cfg" = (/obj/machinery/camera{c_tag = "Chapel Port"; dir = 5},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cfh" = (/obj/structure/stool,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/chapel/main) "cfi" = (/obj/structure/stool,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/chapel/main) -"cfj" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"cfj" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cfk" = (/obj/structure/stool,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/chapel/main) "cfl" = (/obj/structure/stool,/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/chapel/main) "cfm" = (/turf/simulated/floor/fancy/carpet,/area/chapel/main) @@ -5684,7 +5684,7 @@ "cfp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "cfq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor/plasteel,/area/atmos) "cfr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 10; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) -"cfs" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) +"cfs" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) "cft" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 6},/turf/simulated/floor/plasteel,/area/atmos) "cfu" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "cfv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) @@ -5703,7 +5703,7 @@ "cfI" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cfJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research) "cfK" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"cfL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"cfL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cfM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cfN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cfO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) @@ -5719,7 +5719,7 @@ "cfY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/turf/simulated/floor/plasteel,/area/atmos) "cfZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) "cga" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel,/area/atmos) -"cgb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"cgb" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "cgc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/atmos) "cgd" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "cge" = (/obj/structure/grille,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/explored) @@ -5743,18 +5743,18 @@ "cgw" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/fancy/carpet,/area/chapel/main) "cgx" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/table/wood,/turf/simulated/floor/fancy/carpet,/area/chapel/main) "cgy" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/fancy/carpet,/area/chapel/main) -"cgz" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"cgz" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "cgA" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "cgB" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/atmos) "cgC" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "cgD" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/visible{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) "cgE" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/atmos) -"cgF" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Mix to Main"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"cgF" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Mix to Main"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "cgG" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) "cgH" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) "cgI" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/floor/plating,/area/atmos) "cgJ" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/floor/plating/asteroid/airless,/area/mine/explored) -"cgK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) +"cgK" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "cgL" = (/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "cgM" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/asmaint2) "cgN" = (/obj/machinery/hydroponics/soil,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/asmaint2) @@ -5776,7 +5776,7 @@ "chd" = (/turf/simulated/wall/r_wall,/area/toxins/explab) "che" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/research{name = "Experimentation Lab"; req_access_txt = "7"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "chf" = (/turf/simulated/wall/r_wall,/area/teleporter) -"chg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) +"chg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) "chh" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/aft{name = "Aft Hallway"}) "chi" = (/obj/machinery/door/airlock/glass{name = "Chapel Foyer"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "chj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/fancy/carpet,/area/chapel/main) @@ -5787,7 +5787,7 @@ "cho" = (/obj/machinery/camera{c_tag = "Chapel Starboard"; dir = 8},/turf/simulated/floor/fancy/carpet,/area/chapel/main) "chp" = (/obj/machinery/camera{c_tag = "Atmospherics Fore Port"; dir = 8},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel,/area/atmos) "chq" = (/turf/simulated/wall,/area/atmos) -"chr" = (/obj/machinery/atmospherics/unary/vent_pump,/turf/simulated/floor/plasteel,/area/atmos) +"chr" = (/obj/machinery/atmospherics/components/unary/vent_pump,/turf/simulated/floor/plasteel,/area/atmos) "chs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/atmos) "cht" = (/obj/machinery/computer/general_air_control/large_tank_control{input_tag = "waste_in"; name = "Gas Mix Tank Control"; output_tag = "waste_out"; sensors = list("waste_sensor" = "Tank")},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "chu" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/atmos) @@ -5822,14 +5822,14 @@ "chX" = (/obj/structure/stool,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/chapel/main) "chY" = (/obj/structure/stool,/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/chapel/main) "chZ" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plasteel,/area/atmos) -"cia" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) -"cib" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister,/obj/item/weapon/wrench,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) -"cic" = (/obj/machinery/atmospherics/unary/cold_sink/freezer,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) -"cid" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) +"cia" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) +"cib" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister,/obj/item/weapon/wrench,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) +"cic" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) +"cid" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) "cie" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/plasteel,/area/atmos) "cif" = (/obj/structure/fireaxecabinet{pixel_x = 32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/atmos) "cig" = (/obj/structure/table,/obj/item/device/t_scanner,/obj/item/device/t_scanner,/turf/simulated/floor/plasteel{dir = 9; icon_state = "yellow"},/area/atmos) -"cih" = (/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/atmos) +"cih" = (/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/atmos) "cii" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/atmos) "cij" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/atmos) "cik" = (/obj/structure/closet/secure_closet/atmospherics,/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/atmos) @@ -5841,7 +5841,7 @@ "ciq" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) "cir" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plating,/area/atmos) "cis" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plating/asteroid/airless,/area/mine/explored) -"cit" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "waste_in"; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) +"cit" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "waste_in"; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "ciu" = (/obj/machinery/seed_extractor,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/asmaint2) "civ" = (/obj/item/weapon/storage/backpack,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/asmaint2) "ciw" = (/obj/item/weapon/reagent_containers/glass/beaker,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/asmaint2) @@ -5863,12 +5863,12 @@ "ciM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/teleporter) "ciN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) "ciO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/hallway/primary/aft{name = "Aft Hallway"}) -"ciP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"ciP" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "ciQ" = (/obj/machinery/camera{c_tag = "Chapel Foyer"; dir = 8},/obj/machinery/light_switch{dir = 4; pixel_x = 22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "ciR" = (/obj/machinery/light_switch{dir = 8; pixel_x = -22},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "ciS" = (/obj/structure/stool,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/chapel/main) "ciT" = (/obj/structure/stool,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/chapel/main) -"ciU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"ciU" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "ciV" = (/obj/structure/stool,/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/chapel/main) "ciW" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) "ciX" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor/plasteel,/area/atmos) @@ -5876,22 +5876,22 @@ "ciZ" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/atmos) "cja" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/atmos) "cjb" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/atmos) -"cjc" = (/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 4; name = "Atmospherics Requests Console"; pixel_x = 32; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/atmos) +"cjc" = (/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 4; name = "Atmospherics Requests Console"; pixel_x = 32; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/atmos) "cjd" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/plasteel,/area/atmos) -"cje" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/binary/pump{dir = 1; name = "To Mix"},/turf/simulated/floor/plasteel,/area/atmos) +"cje" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "To Mix"},/turf/simulated/floor/plasteel,/area/atmos) "cjf" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/explored) "cjg" = (/obj/structure/table,/obj/item/weapon/storage/bag/plants,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/asmaint2) "cjh" = (/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/asmaint2) "cji" = (/turf/simulated/wall,/area/toxins/xenobiology) "cjj" = (/obj/machinery/camera{c_tag = "Xenobiology Pens"; dir = 4; network = list("SS13","RD")},/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/xenobiology) -"cjk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) +"cjk" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "cjl" = (/obj/machinery/light{dir = 4},/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/xenobiology) "cjm" = (/obj/structure/table,/obj/item/weapon/folder,/obj/item/weapon/folder,/obj/item/clothing/glasses/science,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "cjn" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "cjo" = (/obj/structure/closet/radiation,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "cjp" = (/obj/item/device/radio/beacon,/turf/simulated/wall/r_wall,/area/toxins/explab) "cjq" = (/obj/machinery/camera{c_tag = "Teleporter Room"; dir = 5; network = list("SS13","RD")},/turf/simulated/floor/plasteel,/area/teleporter) -"cjr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/teleporter) +"cjr" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/teleporter) "cjs" = (/obj/machinery/teleport/hub,/obj/item/weapon/crowbar,/turf/simulated/floor/plating,/area/teleporter) "cjt" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/chapel/main) "cju" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) @@ -5902,7 +5902,7 @@ "cjz" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cjA" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel,/area/atmos) "cjB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) -"cjC" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Connector Ports"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"cjC" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Connector Ports"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "cjD" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 9},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) "cjE" = (/obj/machinery/door/airlock/glass_atmos{desc = "The Atmos storage area, with all the gear you could want."; name = "Atmospherics Storage"; req_access_txt = "24"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowfull"},/area/atmos) "cjF" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/atmos) @@ -5918,7 +5918,7 @@ "cjP" = (/obj/structure/grille,/obj/machinery/door/poddoor/preopen{id = "xenobio4"; name = "Containment Door"},/obj/structure/cable/pink{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/toxins/xenobiology) "cjQ" = (/obj/structure/table,/obj/item/device/radio/off,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "cjR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) -"cjS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"cjS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "cjT" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/teleporter) "cjU" = (/turf/simulated/floor/plasteel,/area/teleporter) "cjV" = (/obj/machinery/teleport/station,/turf/simulated/floor/plating,/area/teleporter) @@ -5944,7 +5944,7 @@ "ckp" = (/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 0; pixel_y = 6},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "ckq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/book/manual/experimentor,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "ckr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/computer/rdconsole/experiment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) -"cks" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/door_control{id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"cks" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/door_control{id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "ckt" = (/obj/machinery/computer/teleporter,/turf/simulated/floor/plating,/area/teleporter) "cku" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/secondary/exit) "ckv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) @@ -5968,16 +5968,16 @@ "ckN" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "ckO" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor/plasteel,/area/atmos) "ckP" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) -"ckQ" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) -"ckR" = (/obj/machinery/atmospherics/unary/heat_reservoir/heater{dir = 1; on = 1; tag = ""},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) +"ckQ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) +"ckR" = (/obj/machinery/atmospherics/components/unary/heat_reservoir/heater{dir = 1; on = 1; tag = ""},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) "ckS" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/atmos) "ckT" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor/plasteel,/area/atmos) "ckU" = (/obj/machinery/computer/general_air_control{frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; pixel_y = -2; sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop")},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/atmos) "ckV" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"ckW" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "To Mix"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"ckW" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "To Mix"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "ckX" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/simulated/floor/plasteel,/area/atmos) "ckY" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) -"ckZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) +"ckZ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "cla" = (/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "clb" = (/obj/machinery/light/small,/obj/machinery/door_control{id = "bar1"; name = "Bolts Control"; normaldoorcontrol = 1; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/maintenance/asmaint2) "clc" = (/obj/machinery/door/airlock/hatch{id_tag = "bar1"; name = "Private Room 1"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -5994,7 +5994,7 @@ "cln" = (/obj/structure/grille,/obj/machinery/door/poddoor/preopen{id = "xenobio4"; name = "Containment Door"},/obj/structure/cable/pink,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/toxins/xenobiology) "clo" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "telelab"; name = "test chamber blast door"},/turf/simulated/floor/plating,/area/toxins/explab) "clp" = (/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/preopen{id = "telelab"; name = "test chamber blast door"},/turf/simulated/floor/engine,/area/toxins/explab) -"clq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/teleporter) +"clq" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/teleporter) "clr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/teleporter) "cls" = (/obj/machinery/door/airlock/command{name = "Teleporter Room"; req_access_txt = "17"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/teleporter) "clt" = (/obj/structure/disposalpipe/junction{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/hallway/secondary/exit) @@ -6006,13 +6006,13 @@ "clz" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "clA" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 9},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/hallway/secondary/exit) "clB" = (/obj/machinery/door/airlock/atmos{desc = "The station's Atmospherics department, responsible for keeping air in your lungs and fire out."; name = "Atmospherics"; req_access_txt = "24"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowfull"},/area/atmos) -"clC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/atmos) +"clC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/atmos) "clD" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) -"clE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"clE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/atmos) "clF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/atmos) "clG" = (/obj/machinery/door/airlock/atmos{desc = "The station's Atmospherics department, responsible for keeping air in your lungs and fire out."; name = "Atmospherics"; req_access_txt = "24"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowfull"},/area/atmos) "clH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor/plasteel,/area/atmos) -"clI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/plasteel,/area/atmos) +"clI" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/plasteel,/area/atmos) "clJ" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/atmos) "clK" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel,/area/atmos) "clL" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor/plasteel,/area/atmos) @@ -6036,7 +6036,7 @@ "cmd" = (/turf/simulated/wall,/area/hallway/secondary/exit) "cme" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/secondary/exit) "cmf" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/hallway/secondary/exit) -"cmg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"cmg" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "cmh" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/hallway/secondary/exit) "cmi" = (/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 10},/area/atmos) "cmj" = (/obj/machinery/camera{c_tag = "Atmospherics Access"; dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/atmos) @@ -6051,14 +6051,14 @@ "cms" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/atmos) "cmt" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 10},/area/atmos) "cmu" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/atmos) -"cmv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/atmos) +"cmv" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/atmos) "cmw" = (/obj/machinery/computer/general_air_control{frequency = 1441; name = "Tank Monitor"; sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank")},/turf/simulated/floor/plasteel{dir = 6; icon_state = "yellow"},/area/atmos) -"cmx" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 1; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"cmx" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 1; filter_type = 1; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "cmy" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) "cmz" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) "cmA" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plating,/area/atmos) "cmB" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plating/asteroid/airless,/area/mine/explored) -"cmC" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "o2_in"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) +"cmC" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "o2_in"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "cmD" = (/obj/structure/stool,/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/maintenance/asmaint2) "cmE" = (/obj/machinery/light/small{dir = 1},/obj/machinery/door_control{id = "bar2"; name = "Bolts Control"; normaldoorcontrol = 1; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "cmF" = (/obj/machinery/door/airlock/hatch{id_tag = "bar2"; name = "Private Room 2"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -6070,13 +6070,13 @@ "cmL" = (/obj/machinery/light{dir = 1},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/status_display{pixel_y = 32},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"},/area/toxins/xenobiology) "cmM" = (/obj/structure/cable/pink{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/xenobiology) "cmN" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) -"cmO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) +"cmO" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "cmP" = (/obj/structure/table/reinforced,/obj/structure/sign/electricshock{pixel_y = 32},/obj/machinery/door_control{id = "xenobio5"; name = "Containment Blast Doors"; req_access_txt = "55"},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/toxins/xenobiology) "cmQ" = (/obj/structure/grille,/obj/machinery/door/poddoor/preopen{id = "xenobio5"; name = "Containment Door"},/obj/structure/cable/pink{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/toxins/xenobiology) "cmR" = (/obj/machinery/r_n_d/experimentor,/turf/simulated/floor/engine,/area/toxins/explab) "cmS" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/engine,/area/toxins/explab) "cmT" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/obj/machinery/camera{c_tag = "Escape Hallway Central"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/hallway/secondary/exit) -"cmU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"cmU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "cmV" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 4},/area/hallway/secondary/exit) "cmW" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "cmX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/hallway/secondary/exit) @@ -6095,7 +6095,7 @@ "cnk" = (/obj/structure/table/reinforced,/obj/machinery/computer/security/telescreen{dir = 4; name = "Test Chamber Monitor"; network = list("Xeno"); pixel_y = 2},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/xenobiology) "cnl" = (/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "cnm" = (/obj/structure/table/glass,/obj/machinery/reagentgrinder,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) -"cnn" = (/obj/structure/table/glass,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/item/weapon/extinguisher{pixel_x = 4; pixel_y = 3},/obj/item/weapon/extinguisher,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) +"cnn" = (/obj/structure/table/glass,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/obj/item/weapon/extinguisher{pixel_x = 4; pixel_y = 3},/obj/item/weapon/extinguisher,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "cno" = (/obj/structure/table/glass,/obj/item/stack/sheet/mineral/plasma,/obj/item/stack/sheet/mineral/plasma,/obj/item/stack/sheet/mineral/plasma,/obj/item/stack/sheet/mineral/plasma,/obj/item/weapon/storage/box/monkeycubes,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "cnp" = (/obj/structure/cable/pink{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/xenobiology) "cnq" = (/obj/machinery/door/window/northleft{dir = 4; name = "Containment Pen"; req_access_txt = "55"},/obj/machinery/door/poddoor/preopen{id = "xenobio5"; name = "Containment Door"},/obj/structure/cable/pink{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/pink{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/engine,/area/toxins/xenobiology) @@ -6111,9 +6111,9 @@ "cnA" = (/obj/machinery/alarm{pixel_y = 20},/turf/simulated/floor/plasteel,/area/atmos) "cnB" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/atmos) "cnC" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/atmos) -"cnD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/atmos) +"cnD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/atmos) "cnE" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"cnF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"cnF" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "cnG" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 6},/turf/simulated/floor/plasteel,/area/atmos) "cnH" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "cnI" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -6137,9 +6137,9 @@ "coa" = (/obj/machinery/newscaster,/turf/simulated/wall,/area/hallway/secondary/exit) "cob" = (/obj/structure/table/reinforced,/obj/machinery/door/window/northleft{dir = 4; layer = 2.9; name = "Atmospherics Desk"; req_access_txt = "24"},/obj/item/weapon/folder/yellow,/obj/item/weapon/pen,/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "coc" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor/plasteel,/area/atmos) -"cod" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/atmos) +"cod" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/atmos) "coe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/atmos) -"cof" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "To Mix"},/turf/simulated/floor/plasteel,/area/atmos) +"cof" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "To Mix"},/turf/simulated/floor/plasteel,/area/atmos) "cog" = (/obj/structure/toilet{cistern = 1; desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one has a heart drawn on the cistern."; dir = 4},/obj/machinery/door_control{id = "barbath"; name = "Bolts Control"; normaldoorcontrol = 1; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/maintenance/asmaint2) "coh" = (/obj/structure/sink{pixel_y = 32},/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/maintenance/asmaint2) "coi" = (/obj/machinery/door/airlock/maintenance_hatch{id_tag = "barbath"; name = "Bathroom"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -6148,7 +6148,7 @@ "col" = (/obj/structure/rack,/obj/effect/landmark/costume,/turf/simulated/floor/plasteel,/area/maintenance/asmaint2) "com" = (/obj/machinery/sparker{id = "Xenobio"; pixel_x = -25},/turf/simulated/floor/engine,/area/toxins/xenobiology) "con" = (/obj/item/device/radio/beacon,/turf/simulated/floor/engine,/area/toxins/xenobiology) -"coo" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; unacidable = 1},/turf/simulated/floor/engine,/area/toxins/xenobiology) +"coo" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; unacidable = 1},/turf/simulated/floor/engine,/area/toxins/xenobiology) "cop" = (/obj/machinery/door/window/northleft{dir = 8; name = "Containment Pen"; req_access_txt = "55"},/obj/machinery/door/poddoor/preopen{id = "Xenolab"; name = "Test Chamber Containment Door"},/obj/structure/cable/pink{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/pink{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/engine,/area/toxins/xenobiology) "coq" = (/obj/machinery/door/window/northleft{dir = 4; name = "Containment Pen"; req_access_txt = "55"},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/xenobiology) "cor" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/cable/pink{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/pink{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) @@ -6177,14 +6177,14 @@ "coO" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/atmos) "coP" = (/obj/machinery/door/window/eastright{dir = 2},/turf/simulated/floor/plasteel,/area/atmos) "coQ" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/atmos) -"coR" = (/obj/machinery/atmospherics/trinary/filter{dir = 4; filter_type = 3; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"coR" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4; filter_type = 3; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "coS" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) "coT" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) "coU" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) "coV" = (/obj/machinery/door/window/eastright{dir = 2},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) -"coW" = (/obj/machinery/atmospherics/trinary/filter{dir = 4; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) -"coX" = (/obj/machinery/atmospherics/trinary/filter{dir = 4; filter_type = 4; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) -"coY" = (/obj/machinery/atmospherics/trinary/filter{dir = 4; filter_type = 2; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"coW" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"coX" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4; filter_type = 4; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"coY" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4; filter_type = 2; flipped = 0; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "coZ" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) "cpa" = (/obj/machinery/door/airlock/external{name = "Atmosphereics External Access"; req_access_txt = "24"},/turf/simulated/floor/plating,/area/atmos) "cpb" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -6226,8 +6226,8 @@ "cpL" = (/turf/simulated/wall/r_wall,/area/maintenance/portsolar) "cpM" = (/obj/structure/grille,/obj/machinery/door/poddoor/preopen{id = "Xenolab"; name = "Test Chamber Containment Door"},/obj/structure/cable/pink,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/toxins/xenobiology) "cpN" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/xenobiology) -"cpO" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Gas Pump"},/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) -"cpP" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Gas Pump"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) +"cpO" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Gas Pump"},/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) +"cpP" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Gas Pump"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "cpQ" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "cpR" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "cpS" = (/obj/machinery/door/airlock/maintenance{name = "Maintenance Access"; req_access_txt = "0"; req_one_access_txt = "7; 8; 12; 17; 29; 30; 42; 47; 55; 63"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/asmaint2) @@ -6253,11 +6253,11 @@ "cqm" = (/obj/machinery/light,/turf/simulated/floor/engine,/area/toxins/xenobiology) "cqn" = (/obj/machinery/shieldwallgen{req_access = list(55)},/obj/structure/cable/pink{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 5},/area/toxins/xenobiology) "cqo" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/cable/pink{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/toxins/xenobiology) -"cqp" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/obj/structure/cable/pink{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/toxins/xenobiology) -"cqq" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"},/area/toxins/xenobiology) +"cqp" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/obj/structure/cable/pink{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "warnwhite"},/area/toxins/xenobiology) +"cqq" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"},/area/toxins/xenobiology) "cqr" = (/obj/item/device/radio/intercom{pixel_x = -25},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/exit) -"cqs" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) -"cqt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/item/device/radio/beacon,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"cqs" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"cqt" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/item/device/radio/beacon,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "cqu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/hallway/secondary/exit) "cqv" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/simulated/floor/plating,/area/atmos) "cqw" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/plating,/area/atmos) @@ -6294,18 +6294,18 @@ "crb" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 1},/area/hallway/secondary/exit) "crc" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/hallway/secondary/exit) "crd" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/hallway/secondary/exit) -"cre" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "co2_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) +"cre" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "co2_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) "crf" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) -"crg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) -"crh" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "tox_in"; pixel_y = 1},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) +"crg" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) +"crh" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "tox_in"; pixel_y = 1},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "cri" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "tox_sensor"},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) -"crj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) -"crk" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "n2o_in"; pixel_y = 1},/turf/simulated/floor/engine/n20,/area/atmos) +"crj" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) +"crk" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "n2o_in"; pixel_y = 1},/turf/simulated/floor/engine/n20,/area/atmos) "crl" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2o_sensor"},/turf/simulated/floor/engine/n20,/area/atmos) -"crm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/n20,/area/atmos) -"crn" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "n2_in"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) +"crm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/n20,/area/atmos) +"crn" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "n2_in"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) "cro" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) -"crp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) +"crp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) "crq" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 8},/area/hallway/secondary/exit) "crr" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 4},/area/hallway/secondary/exit) "crs" = (/turf/simulated/floor/plating,/area/hallway/secondary/exit) diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index 728a10b1545..9cae8d18343 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -38,9 +38,9 @@ "aaL" = (/obj/structure/stool/bed/chair{dir = 1},/obj/item/device/radio/intercom{pixel_x = 25},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/pod_2) "aaM" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/security/prison) "aaN" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/ambrosiavulgarisseed,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"aaO" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"aaO" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaP" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"aaQ" = (/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"aaQ" = (/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaR" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/glowshroom,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaS" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/security/prison) "aaT" = (/turf/simulated/wall,/area/security/prison) @@ -65,7 +65,7 @@ "abm" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/security/prison) "abn" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/security/prison) "abo" = (/turf/simulated/wall/r_wall,/area/prison/solitary{name = "Prisoner Education Chamber"}) -"abp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHWEST)"; icon_state = "warndark"; dir = 9},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"abp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHWEST)"; icon_state = "warndark"; dir = 9},/area/prison/solitary{name = "Prisoner Education Chamber"}) "abq" = (/obj/machinery/computer/arcade,/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abr" = (/obj/machinery/camera{c_tag = "Prison Chamber"; network = list("SS13","Prison")},/obj/item/device/radio/intercom{desc = "Talk through this. It looks like it has been modified to not broadcast."; dir = 2; name = "Prison Intercom (General)"; pixel_x = 0; pixel_y = 24; prison_radio = 1},/turf/simulated/floor/plasteel,/area/security/prison) "abs" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) @@ -94,7 +94,7 @@ "abP" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/security/prison) "abQ" = (/turf/simulated/floor/plating,/area/security/prison) "abR" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{tag = "icon-warndark"; icon_state = "warndark"; dir = 2},/area/prison/solitary{name = "Prisoner Education Chamber"}) -"abS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{tag = "icon-warndark (SOUTHWEST)"; icon_state = "warndark"; dir = 10},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"abS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{tag = "icon-warndark (SOUTHWEST)"; icon_state = "warndark"; dir = 10},/area/prison/solitary{name = "Prisoner Education Chamber"}) "abT" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxstarboard) "abU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxstarboard) "abV" = (/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxstarboard) @@ -103,7 +103,7 @@ "abY" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxstarboard) "abZ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxstarboard) "aca" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxport) -"acb" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 2; name = "justice injector"},/turf/simulated/floor/plasteel{tag = "icon-warndark (SOUTHEAST)"; icon_state = "warndark"; dir = 6},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"acb" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 2; name = "justice injector"},/turf/simulated/floor/plasteel{tag = "icon-warndark (SOUTHEAST)"; icon_state = "warndark"; dir = 6},/area/prison/solitary{name = "Prisoner Education Chamber"}) "acc" = (/obj/machinery/door/airlock{name = "Unisex Restroom"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/security/prison) "acd" = (/obj/structure/table,/obj/item/weapon/book/manual/chef_recipes{pixel_x = 2; pixel_y = 6},/obj/item/clothing/head/chefhat,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "ace" = (/obj/structure/stool,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) @@ -120,7 +120,7 @@ "acp" = (/obj/structure/cable,/obj/machinery/power/solar{id = "forestarboard"; name = "Fore-Starboard Solar Array"},/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/solar/auxstarboard) "acq" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "executionfireblast"; layer = 2.9; name = "blast door"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 4; icon_state = "darkredfull"; tag = "icon-whitehall (WEST)"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "acr" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/poddoor/preopen{id = "executionfireblast"; layer = 2.9; name = "blast door"},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 4; icon_state = "darkredfull"; tag = "icon-whitehall (WEST)"},/area/prison/solitary{name = "Prisoner Education Chamber"}) -"acs" = (/obj/machinery/door/window/brigdoor{dir = 2; name = "Justice Chamber"; req_access_txt = "3"},/obj/machinery/atmospherics/pipe/simple/general/hidden,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/brigdoor{dir = 1; name = "Justice Chamber"; req_access_txt = "3"},/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/preopen{id = "executionfireblast"; layer = 2.9; name = "blast door"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "darkredfull"; tag = "icon-whitehall (WEST)"},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"acs" = (/obj/machinery/door/window/brigdoor{dir = 2; name = "Justice Chamber"; req_access_txt = "3"},/obj/machinery/atmospherics/pipe/simple/general/hidden,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/brigdoor{dir = 1; name = "Justice Chamber"; req_access_txt = "3"},/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/preopen{id = "executionfireblast"; layer = 2.9; name = "blast door"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "darkredfull"; tag = "icon-whitehall (WEST)"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "act" = (/obj/machinery/light/small{dir = 4},/obj/structure/toilet{dir = 4},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/security/prison) "acu" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "acv" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/flora/kirbyplants{tag = "icon-plant-13"; icon_state = "plant-13"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) @@ -140,17 +140,17 @@ "acJ" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/security/prison) "acK" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "acL" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = -5; pixel_y = 6},/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitered"},/area/security/prison) -"acM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light,/turf/simulated/floor/plasteel,/area/security/prison) +"acM" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light,/turf/simulated/floor/plasteel,/area/security/prison) "acN" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "acO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "acP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "acQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) "acR" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"acS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"acS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "acT" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/glass/bottle/morphine{pixel_y = 6},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitered"},/area/security/prison) "acU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "acV" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/obj/structure/reagent_dispensers/peppertank{pixel_x = -29; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) -"acW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"acW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "acX" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "acY" = (/turf/simulated/wall,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "acZ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxport) @@ -165,13 +165,13 @@ "adi" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/security/prison) "adj" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "adk" = (/obj/structure/stool/bed,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/glasses/sunglasses/blindfold,/obj/item/clothing/mask/muzzle,/obj/machinery/camera{c_tag = "Prison Sanitatium"; dir = 4; network = list("SS13","Prison"); pixel_x = 0; pixel_y = 0},/obj/effect/landmark{name = "revenantspawn"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) -"adl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHEAST)"; icon_state = "warndark"; dir = 5},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"adl" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHEAST)"; icon_state = "warndark"; dir = 5},/area/prison/solitary{name = "Prisoner Education Chamber"}) "adm" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/simulated/wall/shuttle{icon_state = "swall_f6"; dir = 2},/area/shuttle/pod_3) "adn" = (/obj/structure/closet/emcloset,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ado" = (/turf/simulated/wall/shuttle{icon_state = "swall12"; dir = 2},/area/shuttle/pod_3) "adp" = (/turf/simulated/wall/shuttle{icon_state = "swall_s10"; dir = 2},/area/shuttle/pod_3) "adq" = (/obj/structure/stool/bed,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/glasses/sunglasses/blindfold,/obj/item/clothing/mask/muzzle,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark{name = "revenantspawn"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) -"adr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkred"; tag = "icon-darkblue"; temperature = 273.15},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"adr" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkred"; tag = "icon-darkblue"; temperature = 273.15},/area/prison/solitary{name = "Prisoner Education Chamber"}) "ads" = (/obj/structure/stool/bed,/obj/machinery/camera{c_tag = "Prison Cell 3"; network = list("SS13","Prison")},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "adt" = (/obj/structure/stool,/obj/machinery/light/small{dir = 1},/obj/machinery/door_control{id = "permabolt3"; name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_x = 0; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "adu" = (/obj/structure/stool/bed,/obj/machinery/camera{c_tag = "Prison Cell 2"; network = list("SS13","Prison")},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) @@ -188,20 +188,20 @@ "adF" = (/obj/structure/stool/bed/chair{dir = 4},/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/pod_3) "adG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/firealarm{dir = 4; pixel_x = 28},/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkred"; tag = "icon-darkblue"; temperature = 273.15},/area/prison/solitary{name = "Prisoner Education Chamber"}) "adH" = (/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/security/prison) -"adI" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 3"; pixel_x = -28},/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/security/prison) -"adJ" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"adI" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 3"; pixel_x = -28},/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/security/prison) +"adJ" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "adK" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/wall,/area/security/prison) -"adL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/flasher{id = "PCell 2"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"adL" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/flasher{id = "PCell 2"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "adM" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"adN" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"adO" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 1"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"adN" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"adO" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 1"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "adP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) -"adQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) +"adQ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "adR" = (/turf/simulated/wall/r_wall,/area/security/warden) "adS" = (/turf/simulated/wall/r_wall,/area/security/hos) -"adT" = (/obj/machinery/flasher{id = "insaneflash"; pixel_x = 26},/obj/machinery/atmospherics/unary/vent_pump{dir = 7; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) +"adT" = (/obj/machinery/flasher{id = "insaneflash"; pixel_x = 26},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 7; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "adU" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/obj/machinery/meter,/obj/machinery/door/window/westleft{base_state = "left"; dir = 1; icon_state = "left"; name = "gas ports"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) -"adV" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"adV" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "adW" = (/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "adX" = (/obj/machinery/door_control{id = "prisonereducation"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 0; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/structure/closet/secure_closet/injection{name = "educational injections"; pixel_x = 2},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "darkredfull"; tag = "icon-whitehall (WEST)"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "adY" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/simulated/floor/plating,/area/shuttle/pod_3) @@ -213,7 +213,7 @@ "aee" = (/obj/machinery/door/airlock/glass_security{name = "Long-Term Cell 1"; req_access_txt = "2"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aef" = (/obj/machinery/door/airlock/external{name = "Escape Pod Two"},/turf/simulated/floor/plating,/area/security/prison) "aeg" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/auxsolarport) -"aeh" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "justice gas pump"},/obj/machinery/door/window/westleft{base_state = "right"; dir = 1; icon_state = "right"; name = "gas ports"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"aeh" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "justice gas pump"},/obj/machinery/door/window/westleft{base_state = "right"; dir = 1; icon_state = "right"; name = "gas ports"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "aei" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/prison/solitary{name = "Prisoner Education Chamber"}) "aej" = (/obj/machinery/light_switch{pixel_x = 26; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "darkredfull"; tag = "icon-whitehall (WEST)"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "aek" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitered"},/area/security/prison) @@ -238,7 +238,7 @@ "aeD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/auxsolarport) "aeE" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/door/poddoor/preopen{id = "hosspace"; name = "space shutters"},/turf/simulated/floor/plating,/area/security/hos) "aeF" = (/obj/item/weapon/tank/internals/oxygen/red{pixel_x = -4; pixel_y = -1},/obj/item/weapon/tank/internals/oxygen/red{pixel_x = 4; pixel_y = -1},/obj/item/weapon/tank/internals/anesthetic{pixel_x = 2},/obj/item/weapon/storage/toolbox/mechanical,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/machinery/atmospherics/pipe/manifold/general/visible,/obj/item/weapon/wrench,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/prison/solitary{name = "Prisoner Education Chamber"}) -"aeG" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/prison/solitary{name = "Prisoner Education Chamber"}) +"aeG" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "aeH" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/obj/machinery/space_heater,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "aeI" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "redcorner"},/area/security/prison) "aeJ" = (/obj/machinery/door_control{id = "permacell3"; name = "Cell 3 Lockdown"; pixel_x = -4; pixel_y = 25; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/flasher_button{id = "PCell 3"; pixel_x = 6; pixel_y = 24},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "redcorner"},/area/security/prison) @@ -256,16 +256,16 @@ "aeV" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Insanity Ward"; req_access_txt = "2"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/prison) "aeW" = (/obj/structure/closet/secure_closet{name = "contraband locker"; req_access_txt = "3"},/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/obj/effect/spawner/lootdrop/armory_contraband{loot = list(/obj/item/weapon/gun/projectile/automatic/pistol = 5, /obj/item/weapon/gun/projectile/shotgun/automatic/combat = 5, /obj/item/weapon/gun/projectile/revolver/mateba, /obj/item/weapon/gun/projectile/automatic/pistol/deagle, /obj/item/weapon/storage/box/throwing_stars = 3)},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/warden) "aeX" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"aeY" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/secure/safe{name = "armory safe A"; pixel_x = 6; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) +"aeY" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/secure/safe{name = "armory safe A"; pixel_x = 6; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) "aeZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) "afa" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) -"afb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/secure/safe{name = "armory safe B"; pixel_x = 6; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) +"afb" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/secure/safe{name = "armory safe B"; pixel_x = 6; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) "afc" = (/obj/structure/closet/secure_closet/hos,/obj/machinery/light{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29; pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) -"afd" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) +"afd" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 32},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) "afe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) "aff" = (/obj/structure/stool/bed/chair/comfy/black,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) "afg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) -"afh" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) +"afh" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 32},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) "afi" = (/obj/structure/table/wood,/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = 32},/obj/item/weapon/folder/red,/obj/item/weapon/folder/red,/obj/machinery/keycard_auth{pixel_x = -26; pixel_y = 23},/obj/machinery/door_control{id = "hosspace"; name = "Space Shutters Control"; pixel_x = -26; pixel_y = 34},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) "afj" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/security/range) "afk" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/security/range) @@ -304,7 +304,7 @@ "afR" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/prison) "afS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/prison) "afT" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/obj/machinery/light,/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/prison) -"afU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/prison) +"afU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/prison) "afV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "redcorner"},/area/security/prison) "afW" = (/obj/machinery/flasher/portable,/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/machinery/flasher/portable,/turf/simulated/floor/plasteel{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/warden) "afX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) @@ -376,7 +376,7 @@ "ahl" = (/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ahm" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ahn" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"aho" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) +"aho" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ahp" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ahq" = (/obj/effect/decal/cleanable/cobweb2,/obj/structure/table,/obj/item/weapon/stock_parts/manipulator,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fore) "ahr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = "0"},/turf/simulated/wall,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) @@ -385,7 +385,7 @@ "ahu" = (/obj/structure/closet,/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/disposal) "ahv" = (/obj/item/weapon/soap/deluxe,/obj/item/weapon/storage/secure/safe{pixel_x = 6; pixel_y = 28},/obj/item/weapon/kitchen/rollingpin,/obj/structure/closet/crate,/obj/item/clothing/suit/xenos,/obj/item/clothing/suit/monkeysuit,/obj/item/clothing/head/xenos,/obj/item/clothing/mask/gas/monkeymask,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "ahw" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) -"ahx" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) +"ahx" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "ahy" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/terminal,/obj/machinery/light/small{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "ahz" = (/turf/simulated/wall/r_wall,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "ahA" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) @@ -404,7 +404,7 @@ "ahN" = (/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Armory APC"; pixel_x = 1; pixel_y = -24},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/light,/obj/machinery/camera/motion{c_tag = "Armory - Internal"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/warden) "ahO" = (/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/warden) "ahP" = (/turf/simulated/floor/plasteel{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/security/warden) -"ahQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/effect/landmark{name = "secequipment"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/main) +"ahQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/effect/landmark{name = "secequipment"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/main) "ahR" = (/obj/machinery/disposal,/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/obj/machinery/light_switch{pixel_x = -24; pixel_y = -20},/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/computer/security/telescreen{desc = "Used for watching certain areas."; dir = 1; name = "Head of Security's Monitor"; network = list("Prison","MiniSat","tcomm"); pixel_x = 0; pixel_y = -30},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/hos) "ahS" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/hos) "ahT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/carpet,/area/security/hos) @@ -416,7 +416,7 @@ "ahZ" = (/obj/item/weapon/cigbutt,/turf/simulated/floor/plating,/area/maintenance/fore) "aia" = (/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/fore) "aib" = (/obj/structure/closet{name = "Evidence Closet 1"},/obj/item/weapon/storage/backpack{name = "Evidence Bag 1"},/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plasteel{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/warden) -"aic" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small{dir = 1},/obj/effect/landmark{name = "blobstart"},/obj/machinery/camera{c_tag = "Evidence Storage"; dir = 2; network = list("SS13")},/obj/item/weapon/storage/secure/safe{name = "evidence safe"; pixel_x = 6; pixel_y = 28},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/warden) +"aic" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small{dir = 1},/obj/effect/landmark{name = "blobstart"},/obj/machinery/camera{c_tag = "Evidence Storage"; dir = 2; network = list("SS13")},/obj/item/weapon/storage/secure/safe{name = "evidence safe"; pixel_x = 6; pixel_y = 28},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/warden) "aid" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "aie" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/eastright{base_state = "right"; dir = 8; icon_state = "right"; name = "Fitness Ring"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "aif" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) @@ -426,11 +426,11 @@ "aij" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "aik" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ail" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light/small{dir = 1},/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"aim" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) +"aim" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ain" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark{name = "secequipment"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/main) "aio" = (/obj/machinery/door/poddoor{id = "trash"; name = "disposal bay door"},/turf/simulated/floor/plating,/area/maintenance/disposal) "aip" = (/obj/machinery/mass_driver{dir = 8; id = "trash"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/disposal) -"aiq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/landmark{name = "secequipment"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/main) +"aiq" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/landmark{name = "secequipment"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/main) "air" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id = "garbage"; name = "disposal coveyor"},/turf/simulated/floor/plating,/area/maintenance/disposal) "ais" = (/turf/simulated/floor/plating,/area/maintenance/disposal) "ait" = (/obj/item/weapon/vending_refill/coffee,/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/disposal) @@ -471,7 +471,7 @@ "ajc" = (/obj/structure/table,/obj/item/clothing/under/sl_suit{desc = "Whoever wears this makes the rules."; name = "referee suit"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ajd" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "aje" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"ajf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) +"ajf" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ajg" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ajh" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "aji" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) @@ -484,7 +484,7 @@ "ajp" = (/obj/machinery/conveyor{dir = 2; id = "garbage"; layer = 2.7},/obj/machinery/door/poddoor/preopen{id = "Disposal Exit"; layer = 3.1; name = "disposal exit vent"},/turf/simulated/floor/plating,/area/maintenance/disposal) "ajq" = (/obj/machinery/door_control{id = "Disposal Exit"; name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; req_access_txt = "12"},/obj/machinery/driver_button{id = "trash"; pixel_x = -26; pixel_y = -6},/obj/structure/stool,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/disposal) "ajr" = (/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/disposal) -"ajs" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plating,/area/maintenance/disposal) +"ajs" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plating,/area/maintenance/disposal) "ajt" = (/obj/effect/decal/cleanable/oil,/obj/machinery/light_switch{pixel_x = 25; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/disposal) "aju" = (/obj/machinery/door/airlock/engineering{icon_state = "door_closed"; locked = 0; name = "Fore Port Solar Access"; req_access_txt = "10"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "ajv" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/maintenance/auxsolarport) @@ -500,7 +500,7 @@ "ajF" = (/obj/structure/closet,/obj/item/clothing/gloves/color/fyellow,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/fore) "ajG" = (/obj/machinery/deployable/barrier,/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/security/warden) "ajH" = (/obj/machinery/deployable/barrier,/obj/machinery/alarm{pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/security/warden) -"ajI" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/warden) +"ajI" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/warden) "ajJ" = (/obj/structure/closet/bombcloset,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/security/warden) "ajK" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/maintenance/fore) "ajL" = (/obj/structure/table,/obj/item/weapon/paper{desc = ""; info = "Brusies sustained in the holodeck can be healed simply by sleeping."; name = "Holodeck Disclaimer"},/obj/item/weapon/storage/firstaid/regular{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) @@ -517,9 +517,9 @@ "ajW" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/main) "ajX" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/main) "ajY" = (/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/machinery/magnetic_controller{autolink = 1; pixel_y = 3},/obj/item/clothing/ears/earmuffs,/obj/item/clothing/glasses/sunglasses{pixel_x = 3; pixel_y = 3},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/security/range) -"ajZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/security/range) +"ajZ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/security/range) "aka" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light/small{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/security/range) -"akb" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/air,/obj/item/weapon/tank/internals/air,/turf/simulated/floor/plating,/area/maintenance/fore) +"akb" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/air,/obj/item/weapon/tank/internals/air,/turf/simulated/floor/plating,/area/maintenance/fore) "akc" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "akd" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "ake" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/warden) @@ -547,7 +547,7 @@ "akA" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "akB" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "akC" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/book/manual/chef_recipes,/obj/item/weapon/book/manual/barman_recipes,/obj/item/weapon/firealarm_electronics,/obj/item/weapon/grenade/smokebomb,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"akD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"akD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "akE" = (/obj/item/clothing/head/cone,/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "akF" = (/obj/structure/closet{name = "Evidence Closet 3"},/obj/item/weapon/storage/backpack{name = "Evidence Bag 3"},/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plasteel{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/warden) "akG" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/gravity_generator) @@ -558,7 +558,7 @@ "akL" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/brig) "akM" = (/obj/machinery/light{dir = 4},/obj/structure/reagent_dispensers/peppertank{pixel_x = 30; pixel_y = 0},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 29},/obj/machinery/suit_storage_unit/hos,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) "akN" = (/obj/structure/closet{name = "Evidence Closet 4"},/obj/item/weapon/storage/backpack{name = "Evidence Bag 4"},/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plasteel{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/warden) -"akO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/closet/secure_closet/security/sec,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) +"akO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/closet/secure_closet/security/sec,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "akP" = (/obj/machinery/deployable/barrier,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/camera{c_tag = "Security - Secure Gear Storage"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/security/warden) "akQ" = (/obj/machinery/deployable/barrier,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/security/warden) "akR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/warden) @@ -566,7 +566,7 @@ "akT" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/engine/gravity_generator) "akU" = (/obj/machinery/light_construct/small{dir = 4},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/secure/briefcase,/obj/item/weapon/disk/data,/obj/item/weapon/storage/secure/safe{pixel_x = 35; pixel_y = 0},/obj/item/weapon/grenade/flashbang,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "akV" = (/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) -"akW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/closet/wardrobe/red,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) +"akW" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/closet/wardrobe/red,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "akX" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/gravity_generator) "akY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/main) "akZ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/main) @@ -585,21 +585,21 @@ "alm" = (/obj/structure/rack{pixel_y = 2},/obj/item/weapon/gun/energy/laser/practice{pixel_x = 2; pixel_y = -2},/obj/item/weapon/gun/energy/laser/practice{pixel_x = -3; pixel_y = 3},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/camera{c_tag = "Firing Range"; dir = 8; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/security/range) "aln" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plating,/area/maintenance/fore) "alo" = (/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fore) -"alp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fore) +"alp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fore) "alq" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fore) -"alr" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fore) +"alr" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fore) "als" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "alt" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "alu" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"alv" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) +"alv" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "alw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "alx" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "aly" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "alz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "alA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "alB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/camera{c_tag = "Holodeck"; dir = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/obj/machinery/light/small,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"alC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"alD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/rack,/obj/item/clothing/mask/gas/sechailer{pixel_x = 3; pixel_y = 3},/obj/item/clothing/mask/gas/sechailer,/obj/item/clothing/mask/gas/sechailer{pixel_x = -3; pixel_y = -3},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) +"alC" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) +"alD" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/rack,/obj/item/clothing/mask/gas/sechailer{pixel_x = 3; pixel_y = 3},/obj/item/clothing/mask/gas/sechailer,/obj/item/clothing/mask/gas/sechailer{pixel_x = -3; pixel_y = -3},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "alE" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "alF" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/engine/gravity_generator) "alG" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) @@ -621,7 +621,7 @@ "alW" = (/turf/simulated/wall,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "alX" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/fore) "alY" = (/obj/structure/closet/crate,/obj/item/clothing/gloves/color/fyellow,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"alZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteredcorner"},/area/security/brig) +"alZ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteredcorner"},/area/security/brig) "ama" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/brig) "amb" = (/obj/machinery/door/window/westleft{base_state = "left"; dir = 4; icon_state = "left"; name = "Infirmary"; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitered"; tag = "icon-whitehall (WEST)"},/area/security/brig) "amc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/brig) @@ -650,7 +650,7 @@ "amz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/sortjunction{dir = 4; icon_state = "pipe-j2s"; sortType = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/main) "amA" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/sortjunction{dir = 4; icon_state = "pipe-j2s"; sortType = 7},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/main) "amB" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Firing Range"; req_access_txt = "0"; req_one_access_txt = "1;4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/range) -"amC" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/range) +"amC" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/range) "amD" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "redcorner"},/area/security/range) "amE" = (/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/structure/closet/crate/secure{desc = "A secure crate containing various materials for building a customised test-site."; name = "Firing Range Gear Crate"; req_access_txt = "1"},/obj/machinery/power/apc{cell_type = 2500; dir = 4; name = "Shooting Range APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/security/range) "amF" = (/obj/structure/rack,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/maintenance/fore) @@ -671,7 +671,7 @@ "amU" = (/obj/machinery/gravity_generator/main/station,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/engine/gravity_generator) "amV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/engine/gravity_generator) "amW" = (/obj/machinery/camera{c_tag = "Gravity Generator Room"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) -"amX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/camera{c_tag = "Labor Shuttle Control Desk"; dir = 4},/obj/machinery/computer/shuttle/labor,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"amX" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/camera{c_tag = "Labor Shuttle Control Desk"; dir = 4},/obj/machinery/computer/shuttle/labor,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "amY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/auxsolarstarboard) "amZ" = (/obj/machinery/light/small{dir = 8},/obj/machinery/conveyor{dir = 2; id = "garbage"},/turf/simulated/floor/plating,/area/maintenance/disposal) "ana" = (/obj/machinery/conveyor{dir = 4; id = "garbage"},/turf/simulated/floor/plating,/area/maintenance/disposal) @@ -683,7 +683,7 @@ "ang" = (/turf/simulated/wall/shuttle{icon_state = "swall_s9"; dir = 2},/area/shuttle/pod_3) "anh" = (/obj/structure/flora/kirbyplants{icon_state = "applebush"; layer = 4.1; tag = "icon-applebush"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/security/prison) "ani" = (/obj/structure/table/reinforced,/obj/item/weapon/folder,/obj/item/weapon/folder,/obj/machinery/door/window/westleft{base_state = "right"; dir = 2; icon_state = "right"; name = "windoor"; req_access_txt = "0"},/obj/item/weapon/book/manual/wiki/engineering_hacking,/obj/item/device/tape/random,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"anj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/prison) +"anj" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/prison) "ank" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "anl" = (/obj/structure/rack{dir = 1},/obj/item/clothing/under/rank/mailman,/obj/item/clothing/under/rank/vice{pixel_x = 4; pixel_y = -3},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "anm" = (/turf/space,/turf/simulated/wall/shuttle{icon_state = "swall_f6"; dir = 2},/area/shuttle/labor) @@ -696,11 +696,11 @@ "ant" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/security/brig) "anu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/security/brig) "anv" = (/obj/structure/table,/obj/item/weapon/storage/box/evidence,/obj/item/weapon/storage/box/evidence,/obj/item/weapon/storage/box/evidence,/obj/item/weapon/hand_labeler,/turf/simulated/floor/plasteel{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/security/warden) -"anw" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/warden) +"anw" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/security/warden) "anx" = (/obj/structure/filingcabinet/security{pixel_x = 4},/obj/machinery/firealarm{dir = 4; pixel_x = 28},/turf/simulated/floor/plasteel{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/security/warden) "any" = (/obj/structure/table/reinforced,/obj/machinery/door/window/westleft{base_state = "right"; dir = 2; icon_state = "right"; name = "Reception Window"; req_access_txt = "0"},/obj/machinery/door/window/brigdoor{dir = 1; name = "Brig Control Desk"; req_access_txt = "3"},/obj/item/weapon/paper,/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "anz" = (/obj/structure/rack,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/security/warden) -"anA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/warden) +"anA" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/security/warden) "anB" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/security/warden) "anC" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/security/main) "anD" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) @@ -719,7 +719,7 @@ "anQ" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/maintenance/starboard) "anR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fore) "anS" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light_switch{pixel_x = -26},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"anT" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) +"anT" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "anU" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "anV" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "anW" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) @@ -730,10 +730,10 @@ "aob" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/starboard) "aoc" = (/turf/simulated/wall,/area/maintenance/starboard) "aod" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/security/main) -"aoe" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) +"aoe" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "aof" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "aog" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) -"aoh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) +"aoh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "aoi" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/security/main) "aoj" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/fore) "aok" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/fore) @@ -741,7 +741,7 @@ "aom" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/conveyor{dir = 8; id = "garbage"},/obj/structure/disposaloutlet{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/disposal) "aon" = (/obj/machinery/conveyor{dir = 8; id = "garbage"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/disposal) "aoo" = (/obj/machinery/conveyor{dir = 8; id = "garbage"},/obj/machinery/recycler,/turf/simulated/floor/plating,/area/maintenance/disposal) -"aop" = (/obj/machinery/conveyor{dir = 8; id = "garbage"},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plating,/area/maintenance/disposal) +"aop" = (/obj/machinery/conveyor{dir = 8; id = "garbage"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plating,/area/maintenance/disposal) "aoq" = (/obj/machinery/door/window/eastright{dir = 4; name = "Danger: Conveyor Access"; req_access_txt = "12"},/obj/machinery/conveyor{dir = 10; icon_state = "conveyor0"; id = "garbage"},/turf/simulated/floor/plating,/area/maintenance/disposal) "aor" = (/obj/machinery/power/apc{dir = 2; name = "Disposal APC"; pixel_x = 0; pixel_y = -24},/obj/structure/cable/yellow,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/disposal) "aos" = (/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -749,9 +749,9 @@ "aou" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "aov" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "aow" = (/obj/machinery/space_heater,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"aox" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"aox" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "aoy" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"aoz" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"aoz" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "aoA" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/simulated/floor/plating,/area/shuttle/labor) "aoB" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/fore) "aoC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/fore) @@ -760,7 +760,7 @@ "aoF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aoG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light/small,/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitered"},/area/security/brig) "aoH" = (/obj/machinery/door/airlock/maintenance{icon = 'icons/obj/doors/Doorint.dmi'; name = "Brig Emergency Storage"; req_access_txt = "63"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/security/brig) -"aoI" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/rack,/obj/item/weapon/storage/firstaid/regular,/obj/item/device/healthanalyzer{pixel_y = -2},/obj/machinery/camera{c_tag = "Brig - Infirmary"; dir = 1; network = list("SS13")},/obj/item/clothing/under/rank/medical/purple{pixel_y = -4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitered"},/area/security/brig) +"aoI" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/rack,/obj/item/weapon/storage/firstaid/regular,/obj/item/device/healthanalyzer{pixel_y = -2},/obj/machinery/camera{c_tag = "Brig - Infirmary"; dir = 1; network = list("SS13")},/obj/item/clothing/under/rank/medical/purple{pixel_y = -4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitered"},/area/security/brig) "aoJ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/brig) "aoK" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/security/brig) "aoL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/security/brig) @@ -820,7 +820,7 @@ "apN" = (/obj/structure/table,/obj/item/weapon/tank/internals/emergency_oxygen{pixel_x = -8; pixel_y = 0},/obj/item/weapon/tank/internals/emergency_oxygen{pixel_x = -8; pixel_y = 0},/obj/item/clothing/mask/breath{pixel_x = 4; pixel_y = 0},/obj/item/clothing/mask/breath{pixel_x = 4; pixel_y = 0},/obj/effect/decal/cleanable/cobweb,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/maintenance/starboard) "apO" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "apP" = (/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"apQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"apQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "apR" = (/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "apS" = (/obj/machinery/light_construct/small{dir = 4},/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "apT" = (/obj/item/weapon/cigbutt,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -874,7 +874,7 @@ "aqP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/engine/gravity_generator) "aqQ" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/simulated/floor/plating,/area/shuttle/mining) "aqR" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) -"aqS" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) +"aqS" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "aqT" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/terminal,/obj/machinery/light/small{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "aqU" = (/obj/machinery/space_heater,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "aqV" = (/obj/machinery/space_heater,/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -902,7 +902,7 @@ "arr" = (/obj/machinery/computer/security{name = "Labor Camp Monitoring"; network = list("Labor")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "ars" = (/obj/structure/table,/obj/item/weapon/storage/box/prisoner,/obj/item/weapon/razor{pixel_x = -6},/obj/item/weapon/paper{desc = ""; info = "Labor Camp Facility Operation Guide

Hello there, proud operator of an NT-Sec Prisoner Rehabilitation Center. A solution to rising crime rates and falling productivity, these facilities are specifically designed for the safe, productive imprisonment of your most dangerous criminals.

To press a long-term prisoner into the service of the station, replace his equipment with prisoners' garb at one of the prison lockers, as per normal operating procedure. Before assigning a prisoner his ID, insert the ID into a prisoner management console and assign the prisoner a quota, based on the severity of his crime.
A single sheet of most materials produces five points for the prisoner, and points can be expected to be produced at a rate of about 100 per minute, though punishments as severe as forced labor should be reserved for serious crimes of sentences not less than five minutes long.
Once you have prepared the prisoner, place him in the secure northern half of the labor shuttle, and send him to the station. Once he meets his quota by feeding sheets to the stacker, he will be allowed to return to the station, and will be able to open the secure door to the prisoner release area.

In the case of dangerous prisoners, surveilance may be needed. To that end, there is a prisoner monitoring room on the mining station, equipped with a remote flasher and a lockdown button. The mine itself is patrolled by a securibot, so the nearby security records console can also be used to secure hostile prisoners on the mine."; name = "Labor Camp Operating Guide"},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "art" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Brig Control"; req_access_txt = "3"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/security/warden) -"aru" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) +"aru" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "arv" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "arw" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "arx" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) @@ -940,25 +940,25 @@ "asd" = (/obj/structure/table,/obj/machinery/newscaster/security_unit{pixel_x = 32; pixel_y = 1},/obj/machinery/recharger{pixel_y = 4},/obj/item/weapon/melee/baton/loaded,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "ase" = (/obj/structure/closet,/obj/item/weapon/contraband/poster,/obj/item/weapon/contraband/poster,/obj/item/weapon/contraband/poster,/obj/item/weapon/contraband/poster,/obj/item/weapon/contraband/poster,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/starboard) "asf" = (/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/starboard) -"asg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/starboard) +"asg" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/starboard) "ash" = (/obj/structure/closet,/obj/item/weapon/storage/box/lights/mixed,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/starboard) "asi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/engine/gravity_generator) "asj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/engine/gravity_generator) -"ask" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/engine/gravity_generator) +"ask" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/engine/gravity_generator) "asl" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/engine/gravity_generator) -"asm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/power/terminal,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/engine/gravity_generator) +"asm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/power/terminal,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/engine/gravity_generator) "asn" = (/obj/machinery/firealarm{dir = 4; pixel_x = 28},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/stool/bed/chair/office/light,/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/engine/gravity_generator) "aso" = (/obj/machinery/power/apc{dir = 8; name = "Fore Starboard Solar APC"; pixel_x = -25; pixel_y = 3},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/auxsolarstarboard) "asp" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"; tag = "icon-warnplate (NORTH)"},/area/maintenance/auxsolarstarboard) "asq" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes,/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "asr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"ass" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"ass" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "ast" = (/obj/machinery/door/airlock/glass{name = "space-bridge access"},/obj/machinery/door_control{id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; pixel_x = 0; pixel_y = 27; req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "asu" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "asv" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "asw" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "asx" = (/obj/machinery/door/airlock/glass{name = "space-bridge access"},/obj/machinery/door_control{id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; pixel_x = 0; pixel_y = 27; req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"asy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light,/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"asy" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light,/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "asz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "asA" = (/obj/machinery/door/airlock/maintenance_hatch{name = "Supply Bay Bridge Access"; req_access_txt = "0"; req_one_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "asB" = (/obj/structure/rack,/obj/effect/landmark/costume,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -982,7 +982,7 @@ "asT" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "asU" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "asV" = (/obj/machinery/vending/security,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) -"asW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/main) +"asW" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/main) "asX" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/main) "asY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/main) "asZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/main) @@ -992,7 +992,7 @@ "atd" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/main) "ate" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/main) "atf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/main) -"atg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/main) +"atg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/main) "ath" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/main) "ati" = (/obj/structure/stool/bed/chair,/obj/machinery/computer/security/telescreen{desc = "Used for watching proceedings in the interrogation room."; dir = 1; layer = 4; name = "interrogation monitor"; network = list("interrogation"); pixel_x = 0; pixel_y = -30},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/main) "atj" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/structure/table/wood,/obj/item/device/radio/intercom{anyai = 1; broadcasting = 0; freerange = 1; frequency = 1424; listening = 1; name = "Interrogation Intercom"; pixel_x = 0; pixel_y = -31},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/main) @@ -1000,14 +1000,14 @@ "atl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fore) "atm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{dir = 8; icon_state = "warnplate"; tag = ""},/area/maintenance/fore) "atn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/fore) -"ato" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light/small{dir = 1},/obj/structure/table/wood,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/item/weapon/lighter,/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"ato" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light/small{dir = 1},/obj/structure/table/wood,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/item/weapon/lighter,/turf/simulated/floor/wood,/area/crew_quarters/sleep) "atp" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/machinery/alarm{pixel_y = 23},/obj/item/clothing/under/assistantformal,/turf/simulated/floor/wood,/area/crew_quarters/sleep) -"atq" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id = "Cabin3"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"atq" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id = "Cabin3"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "atr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/sleep) "ats" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "att" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "atu" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep) -"atv" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/cobweb,/obj/machinery/door_control{id = "Cabin4"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/carpet,/area/crew_quarters/sleep) +"atv" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/cobweb,/obj/machinery/door_control{id = "Cabin4"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "atw" = (/obj/structure/dresser,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "atx" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/machinery/alarm{pixel_y = 23},/obj/item/clothing/under/suit_jacket/burgundy,/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "aty" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/starboard) @@ -1050,7 +1050,7 @@ "auj" = (/obj/structure/grille,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window/reinforced/tinted{dir = 5; health = 120; icon_state = "twindow"; reinf = 0},/turf/simulated/floor/plating,/area/security/detectives_office) "auk" = (/obj/machinery/computer/prisoner,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aul" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) -"aum" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/security/brig) +"aum" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/security/brig) "aun" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/prison) "auo" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Brig Control"; req_access_txt = "3"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/security/warden) "aup" = (/obj/machinery/door/airlock/shuttle{name = "Labor Shuttle Airlock"; req_access_txt = "2"},/turf/simulated/floor/plasteel/shuttle{icon = 'icons/turf/floors.dmi'; icon_state = "dark"},/area/shuttle/labor) @@ -1067,10 +1067,10 @@ "auA" = (/obj/machinery/firealarm{dir = 4; pixel_x = 28},/obj/machinery/light/small{dir = 4},/obj/machinery/camera{c_tag = "Labor Shuttle Dock"; dir = 8; network = list("SS13")},/obj/machinery/flasher{id = "PRelease"; pixel_x = 24; pixel_y = 20},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) "auB" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted{dir = 5; health = 120; icon_state = "twindow"; reinf = 0},/turf/simulated/floor/plating,/area/security/main) "auC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fore) -"auD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plating,/area/maintenance/fore) +"auD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plating,/area/maintenance/fore) "auE" = (/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/fore) "auF" = (/obj/structure/stool/bed/chair/wood/normal{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) -"auG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"auG" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "auH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "auI" = (/obj/machinery/door/airlock{id_tag = "Cabin3"; name = "Cabin 6"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "auJ" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) @@ -1079,10 +1079,10 @@ "auM" = (/obj/machinery/door/airlock{id_tag = "Cabin4"; name = "Cabin 5"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "auN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "auO" = (/turf/simulated/floor/carpet,/area/crew_quarters/sleep) -"auP" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) +"auP" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "auQ" = (/obj/structure/mopbucket,/obj/item/weapon/mop,/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/starboard) "auR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"auS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/starboard) +"auS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/starboard) "auT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/starboard) "auU" = (/obj/structure/closet,/obj/item/weapon/stock_parts/matter_bin,/turf/simulated/floor/plating,/area/maintenance/starboard) "auV" = (/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/starboard) @@ -1128,10 +1128,10 @@ "avJ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/security/brig) "avK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/security/brig) "avL" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/brig) -"avM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"avM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "avN" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "avO" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) -"avP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) +"avP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "avQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "avR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/sleep) "avS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall,/area/crew_quarters/sleep) @@ -1179,16 +1179,16 @@ "awI" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) "awJ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/junction{dir = 4; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)"},/turf/simulated/floor/plasteel,/area/security/brig) "awK" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) -"awL" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) +"awL" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) "awM" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) "awN" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/junction{dir = 4; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)"},/turf/simulated/floor/plasteel,/area/security/brig) "awO" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) -"awP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) +"awP" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/brig) "awQ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel,/area/security/brig) "awR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/security/brig) "awS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/brig) "awT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/brig) -"awU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/brig) +"awU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/brig) "awV" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel,/area/security/brig) "awW" = (/turf/simulated/floor/plasteel,/area/security/brig) "awX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) @@ -1200,11 +1200,11 @@ "axd" = (/obj/machinery/camera{c_tag = "Interrogation"; dir = 8; network = list("interrogation")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "axe" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/plating,/area/maintenance/fore) "axf" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/maintenance/fore) -"axg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light/small{dir = 1},/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/dresser,/turf/simulated/floor/carpet,/area/crew_quarters/sleep) -"axh" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id = "Cabin2"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) +"axg" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light/small{dir = 1},/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/dresser,/turf/simulated/floor/carpet,/area/crew_quarters/sleep) +"axh" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id = "Cabin2"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "axi" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/machinery/alarm{pixel_y = 23},/obj/item/clothing/under/suit_jacket/tan,/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "axj" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/camera{c_tag = "Dormitories - Fore"; dir = 8},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep) -"axk" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id = "Cabin5"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"axk" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id = "Cabin5"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "axl" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/table/wood,/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/crew_quarters/sleep) "axm" = (/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/starboard) "axn" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/starboard) @@ -1255,16 +1255,16 @@ "ayg" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "ayh" = (/obj/structure/table,/obj/item/weapon/folder/red,/obj/item/device/taperecorder{pixel_y = 0},/obj/item/device/radio/intercom{anyai = 1; broadcasting = 1; freerange = 1; frequency = 1424; listening = 0; name = "Interrogation Intercom"; pixel_x = 0; pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "ayi" = (/obj/structure/stool/bed/chair{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) -"ayj" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"ayj" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "ayk" = (/turf/simulated/wall,/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "ayl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) -"aym" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) +"aym" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "ayn" = (/obj/machinery/door/airlock{id_tag = "Cabin2"; name = "Cabin 4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "ayo" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "ayp" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "ayq" = (/obj/machinery/door/airlock{id_tag = "Cabin5"; name = "Cabin 3"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "ayr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/sleep) -"ays" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light/small,/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"ays" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light/small,/turf/simulated/floor/wood,/area/crew_quarters/sleep) "ayt" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/starboard) "ayu" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/starboard) "ayv" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -1301,7 +1301,7 @@ "aza" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; luminosity = 2},/area/security/nuke_storage) "azb" = (/obj/structure/filingcabinet,/obj/item/weapon/folder/documents,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/nuke_storage) "azc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; luminosity = 2},/area/security/nuke_storage) -"azd" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/security/nuke_storage) +"azd" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/security/nuke_storage) "aze" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; luminosity = 2},/area/security/nuke_storage) "azf" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/construction/Storage{name = "Storage Wing"}) "azg" = (/turf/simulated/wall,/area/prison/solitary{name = "Prisoner Education Chamber"}) @@ -1327,7 +1327,7 @@ "azA" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/hallway/primary/fore) "azB" = (/turf/simulated/wall,/area/security/detectives_office) "azC" = (/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) -"azD" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 26},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"azD" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 26},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "azE" = (/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "azF" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "azG" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) @@ -1336,7 +1336,7 @@ "azJ" = (/obj/item/weapon/wrench,/turf/simulated/floor/plating,/area/maintenance/starboard) "azK" = (/obj/structure/table,/obj/item/stack/packageWrap,/obj/item/weapon/wrench,/obj/machinery/light{dir = 8},/obj/item/weapon/hand_labeler,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) "azL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/engineering) -"azM" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"azM" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "azN" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/engine/engineering) "azO" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/turf/simulated/floor/plating,/area/engine/engineering) "azP" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/machinery/light/small{dir = 2},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) @@ -1365,7 +1365,7 @@ "aAm" = (/obj/machinery/alarm{pixel_y = 28},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "aAn" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "aAo" = (/obj/machinery/nuclearbomb/selfdestruct{layer = 2},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/nuke_storage) -"aAp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/security/nuke_storage) +"aAp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/security/nuke_storage) "aAq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; luminosity = 2},/area/security/nuke_storage) "aAr" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/stack/sheet/mineral/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/mineral/gold{pixel_y = 2},/obj/item/stack/sheet/mineral/gold{pixel_x = 1; pixel_y = -2},/obj/item/weapon/storage/belt/champion,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/security/nuke_storage) "aAs" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; luminosity = 2},/area/security/nuke_storage) @@ -1373,11 +1373,11 @@ "aAu" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/storage/primary) "aAv" = (/obj/item/weapon/wrench,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/space) "aAw" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/space) -"aAx" = (/obj/machinery/flasher{id = "Cell 1"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"aAx" = (/obj/machinery/flasher{id = "Cell 1"; pixel_x = -28},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "aAy" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) -"aAz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) -"aAA" = (/obj/machinery/flasher{id = "Cell 2"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) -"aAB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/flasher{id = "Cell 3"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"aAz" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"aAA" = (/obj/machinery/flasher{id = "Cell 2"; pixel_x = -28},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"aAB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/flasher{id = "Cell 3"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "aAC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/brig) "aAD" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/brig) "aAE" = (/obj/machinery/light/small{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/brig) @@ -1426,7 +1426,7 @@ "aBv" = (/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) "aBw" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/obj/item/clothing/glasses/sunglasses,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/starboard) "aBx" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock{name = "\improper Mining Office"}) -"aBy" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) +"aBy" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) "aBz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) "aBA" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) "aBB" = (/obj/machinery/door_control{id = "qm_mine_warehouse"; name = "Warehouse Door Control"; pixel_x = 24; pixel_y = 28; req_access_txt = "48"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/miningdock{name = "\improper Mining Office"}) @@ -1451,11 +1451,11 @@ "aBU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/brig) "aBV" = (/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/brig) "aBW" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/brig) -"aBX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"aBX" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "aBY" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "aBZ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "aCa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) -"aCb" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"aCb" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "aCc" = (/obj/structure/closet/secure_closet/detective,/obj/effect/landmark{name = "blobstart"},/obj/machinery/camera{c_tag = "Detective's Office"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "aCd" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "aCe" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/carpet,/area/security/detectives_office) @@ -1466,7 +1466,7 @@ "aCj" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/fore) "aCk" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/fore) "aCl" = (/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) -"aCm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"aCm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aCn" = (/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aCo" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "aCp" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) @@ -1498,7 +1498,7 @@ "aCP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) "aCQ" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/turret_protected/ai_upload) "aCR" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) -"aCS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) +"aCS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "aCT" = (/obj/machinery/door/airlock/glass_mining{name = "Mining Dock"; req_access_txt = "48"},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) "aCU" = (/obj/structure/closet/crate,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/ore/glass,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "aCV" = (/obj/structure/closet/crate,/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) @@ -1518,9 +1518,9 @@ "aDj" = (/obj/structure/table,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/aiModule/supplied/quarantine,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aDk" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/turret_protected/ai_upload) "aDl" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/courtroom) -"aDm" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/flasher_button{id = "holdingflash"; name = "holding cell flasher button"; pixel_x = 23; pixel_y = 23; req_access_txt = "1"},/obj/machinery/camera{c_tag = "Brig - Desk"; dir = 8; network = list("SS13")},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"aDm" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/flasher_button{id = "holdingflash"; name = "holding cell flasher button"; pixel_x = 23; pixel_y = 23; req_access_txt = "1"},/obj/machinery/camera{c_tag = "Brig - Desk"; dir = 8; network = list("SS13")},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aDn" = (/obj/machinery/door/airlock/security{name = "Court Cell"; req_access = null; req_access_txt = "63"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) -"aDo" = (/obj/structure/table/wood,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/power/apc{dir = 8; name = "Detective APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/item/device/taperecorder{pixel_x = 3; pixel_y = 0},/obj/item/weapon/storage/box/evidence,/obj/item/device/flashlight/seclite,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) +"aDo" = (/obj/structure/table/wood,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/power/apc{dir = 8; name = "Detective APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/item/device/taperecorder{pixel_x = 3; pixel_y = 0},/obj/item/weapon/storage/box/evidence,/obj/item/device/flashlight/seclite,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "aDp" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "aDq" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/carpet,/area/security/detectives_office) "aDr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/carpet,/area/security/detectives_office) @@ -1537,7 +1537,7 @@ "aDC" = (/obj/structure/stool{pixel_y = 8},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/crew_quarters/sleep) "aDD" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "aDE" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep) -"aDF" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id = "Cabin6"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/effect/decal/cleanable/cobweb,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) +"aDF" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id = "Cabin6"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/effect/decal/cleanable/cobweb,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "aDG" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/machinery/alarm{pixel_y = 23},/obj/item/clothing/under/suit_jacket/navy,/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "aDH" = (/obj/structure/closet/crate,/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "aDI" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -1546,7 +1546,7 @@ "aDL" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/engine/engineering) "aDM" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/engine/engineering) "aDN" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating,/area/crew_quarters/courtroom) -"aDO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) +"aDO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) "aDP" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/engine/engineering) "aDQ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "aDR" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/engine/engineering) @@ -1568,7 +1568,7 @@ "aEh" = (/obj/structure/closet/crate/freezer,/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "aEi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/landmark/start{name = "Cargo Technician"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "aEj" = (/obj/item/stack/sheet/cardboard,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) -"aEk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light_construct/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) +"aEk" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light_construct/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "aEl" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/construction/Storage{name = "Storage Wing"}) "aEm" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/security/nuke_storage) "aEn" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/cable/yellow,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/construction/Storage{name = "Storage Wing"}) @@ -1591,10 +1591,10 @@ "aEE" = (/obj/structure/filingcabinet/chestdrawer{pixel_y = 3},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aEF" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aEG" = (/obj/machinery/requests_console{department = "Detective's office"; pixel_x = -30; pixel_y = 0},/obj/structure/table/wood,/obj/machinery/light/small{dir = 8},/obj/item/weapon/book/manual/wiki/security_space_law,/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detective's camera"; pictures_left = 30},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) -"aEH" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) +"aEH" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "aEI" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "aEJ" = (/obj/machinery/light/small,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -26},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) -"aEK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) +"aEK" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "aEL" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase{pixel_x = -3; pixel_y = 2},/obj/item/weapon/storage/secure/briefcase{pixel_x = 2; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "aEM" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/fore) "aEN" = (/obj/structure/toilet{pixel_y = 8},/obj/machinery/light/small{dir = 8},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -32},/obj/machinery/door_control{id = "Toilet3"; name = "Lock Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) @@ -1614,11 +1614,11 @@ "aFb" = (/obj/machinery/door/airlock{id_tag = "Cabin6"; name = "Cabin 2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "aFc" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "aFd" = (/obj/machinery/light/small,/turf/simulated/floor/carpet,/area/crew_quarters/sleep) -"aFe" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) +"aFe" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/sleep) "aFf" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/engine/engineering) "aFg" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/engineering) -"aFh" = (/obj/effect/landmark/start{name = "Station Engineer"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) -"aFi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) +"aFh" = (/obj/effect/landmark/start{name = "Station Engineer"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"aFi" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "aFj" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/engine/engineering) "aFk" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Storage"; req_access_txt = "32"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/engine/engineering) "aFl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/engineering) @@ -1637,7 +1637,7 @@ "aFy" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/table,/obj/item/weapon/folder/yellow,/obj/item/weapon/folder/yellow,/obj/item/weapon/paper,/obj/item/weapon/paper,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/quartermaster/storage) "aFz" = (/obj/machinery/computer/security/mining,/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) "aFA" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) -"aFB" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) +"aFB" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) "aFC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock{name = "\improper Mining Office"}) "aFD" = (/obj/item/clothing/glasses/meson,/obj/structure/closet/crate,/obj/item/weapon/contraband/poster,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/starboard) "aFE" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "loadingarea"},/area/quartermaster/sorting{name = "\improper Warehouse"}) @@ -1652,7 +1652,7 @@ "aFN" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/storage/primary) "aFO" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aFP" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=1.5-Fore-Central"; location = "1-BrigCells"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) -"aFQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) +"aFQ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aFR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aFS" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aFT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) @@ -1660,12 +1660,12 @@ "aFV" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aFW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aFX" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) -"aFY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=1-BrigCells"; location = "0-SecurityDesk"},/obj/machinery/bot/secbot/beepsky{desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey, and with a sturdier reinforced chassis, too. "; health = 45; maxhealth = 45; name = "Officer Beepsky"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) +"aFY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=1-BrigCells"; location = "0-SecurityDesk"},/obj/machinery/bot/secbot/beepsky{desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey, and with a sturdier reinforced chassis, too. "; health = 45; maxhealth = 45; name = "Officer Beepsky"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aFZ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aGa" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/gloves/color/fyellow,/obj/machinery/light/small,/turf/simulated/floor/plasteel{dir = 2; icon_state = "brown"},/area/storage/primary) "aGb" = (/obj/structure/table/reinforced,/obj/machinery/door/window/westleft{base_state = "right"; dir = 8; icon_state = "right"; name = "Outer Window"; req_access_txt = "0"},/obj/machinery/door/window/brigdoor{dir = 4; name = "Security Desk"; req_access_txt = "1"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/item/device/radio/off,/obj/machinery/door/poddoor/shutters/preopen{id = "briglockdown"; name = "brig shutters"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aGc" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) -"aGd" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"aGd" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aGe" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/hallway/primary/central) "aGf" = (/obj/machinery/door/window{dir = 1; name = "glass door"; pixel_y = 0; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/detectives_office) "aGg" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) @@ -1673,7 +1673,7 @@ "aGi" = (/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aGj" = (/obj/machinery/light/small,/obj/machinery/power/apc{dir = 2; name = "Restrooms APC"; pixel_x = 0; pixel_y = -26},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aGk" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) -"aGl" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"aGl" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aGm" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aGn" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Unisex Restrooms"; req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aGo" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) @@ -1687,7 +1687,7 @@ "aGw" = (/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/engine/engineering) "aGx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/engine/engineering) "aGy" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/engine/engineering) -"aGz" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/turretid{control_area = "\improper AI Upload Chamber"; icon_state = "control_stun"; name = "AI Upload turret control"; pixel_x = 0; pixel_y = 28},/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = -24; pixel_y = 24},/obj/effect/landmark/start{name = "Cyborg"},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 2; name = "AI Upload Access APC"; pixel_x = 0; pixel_y = -27},/obj/machinery/light/small{dir = 8},/obj/machinery/computer/security/telescreen{desc = "Used for watching the AI Upload."; dir = 4; name = "AI Upload Monitor"; network = list("AIUpload"); pixel_x = -29; pixel_y = 0},/turf/simulated/floor/plasteel{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/turret_protected/ai_upload_foyer) +"aGz" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/turretid{control_area = "\improper AI Upload Chamber"; icon_state = "control_stun"; name = "AI Upload turret control"; pixel_x = 0; pixel_y = 28},/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = -24; pixel_y = 24},/obj/effect/landmark/start{name = "Cyborg"},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 2; name = "AI Upload Access APC"; pixel_x = 0; pixel_y = -27},/obj/machinery/light/small{dir = 8},/obj/machinery/computer/security/telescreen{desc = "Used for watching the AI Upload."; dir = 4; name = "AI Upload Monitor"; network = list("AIUpload"); pixel_x = -29; pixel_y = 0},/turf/simulated/floor/plasteel{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/turret_protected/ai_upload_foyer) "aGA" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/engineering) "aGB" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/engine/engineering) "aGC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/engine/engineering) @@ -1725,7 +1725,7 @@ "aHi" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/engine/chiefs_office) "aHj" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/machinery/camera{c_tag = "Storage Wing - Security Access Door"; dir = 4; network = list("SS13")},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) "aHk" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) -"aHl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) +"aHl" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) "aHm" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/security{name = "Security-Storage Backroom"; req_access = null; req_access_txt = "63"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) "aHn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "aHo" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) @@ -1768,7 +1768,7 @@ "aHZ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "aIa" = (/obj/machinery/door/airlock{id_tag = "Cabin7"; name = "Cabin 1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "aIb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep) -"aIc" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/alarm{pixel_y = 23},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"aIc" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/alarm{pixel_y = 23},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "aId" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/clothing/under/assistantformal,/turf/simulated/floor/wood,/area/crew_quarters/sleep) "aIe" = (/obj/structure/table,/obj/item/stack/rods{amount = 50},/obj/item/weapon/wrench,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/engine/engineering) "aIf" = (/obj/structure/closet/crate/internals,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) @@ -1808,9 +1808,9 @@ "aIN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aIO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aIP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) -"aIQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) +"aIQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aIR" = (/obj/machinery/vending/cigarette,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel,/area/construction/Storage{name = "Storage Wing"}) -"aIS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) +"aIS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) "aIT" = (/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) "aIU" = (/obj/structure/table,/obj/machinery/recharger,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) "aIV" = (/turf/simulated/wall/r_wall,/area/hallway/primary/fore) @@ -1823,17 +1823,17 @@ "aJc" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/security{name = "Court Cell"; req_access = null; req_access_txt = "63"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aJd" = (/turf/simulated/wall,/area/lawoffice) "aJe" = (/obj/machinery/door/poddoor{density = 1; icon_state = "closed"; id = "QMLoaddoor2"; name = "Supply Dock Loading Door"; opacity = 1},/obj/machinery/conveyor{dir = 8; id = "QMLoad2"; movedir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage) -"aJf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light_switch{pixel_x = -26},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"aJf" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light_switch{pixel_x = -26},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aJg" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aJh" = (/obj/machinery/door/airlock{id_tag = "Toilet4"; name = "Unit 4"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aJi" = (/obj/machinery/door/airlock{name = "Unit B"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aJj" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light/small{dir = 8},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=14.9-CrewQuarters-Central"; location = "14.8-Dorms-Lockers"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) -"aJk" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) +"aJk" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "aJl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "aJm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/sign/map/left{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; pixel_y = 32},/turf/simulated/floor/plasteel{tag = "icon-warningcorner (EAST)"; icon_state = "warningcorner"; dir = 4},/area/hallway/secondary/entry{name = "Arrivals"}) "aJn" = (/obj/structure/closet/secure_closet/personal,/obj/item/clothing/under/assistantformal,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/obj/item/clothing/suit/hooded/wintercoat,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/crew_quarters/sleep) "aJo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/closet/wardrobe/pjs,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/crew_quarters/sleep) -"aJp" = (/obj/machinery/door_control{id = "Cabin7"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"aJp" = (/obj/machinery/door_control{id = "Cabin7"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "aJq" = (/obj/structure/stool/bed/chair/wood/normal{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "aJr" = (/obj/structure/table/wood,/obj/machinery/newscaster{pixel_x = 29; pixel_y = 1},/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/crew_quarters/sleep) "aJs" = (/obj/structure/closet,/obj/item/weapon/storage/box/donkpockets,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -1862,7 +1862,7 @@ "aJP" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/glass_mining{glass = 0; icon = 'icons/obj/doors/Doormining.dmi'; name = "Cargo Bay"; opacity = 1; req_access_txt = "0"; req_one_access_txt = "48;50"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/construction/Storage{name = "Storage Wing"}) "aJQ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/construction/Storage{name = "Storage Wing"}) "aJR" = (/obj/machinery/camera{c_tag = "Cargo Bay - Storage Wing Entrance"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"; tag = "icon-warnwhite (NORTHEAST)"},/area/construction/Storage{name = "Storage Wing"}) -"aJS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/power/apc{dir = 2; name = "Storage Wing APC"; pixel_x = 0; pixel_y = -27},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) +"aJS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/power/apc{dir = 2; name = "Storage Wing APC"; pixel_x = 0; pixel_y = -27},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aJT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aJU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aJV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -26},/obj/machinery/camera{c_tag = "Storage Wing"; dir = 1; network = list("SS13")},/obj/machinery/light,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) @@ -1876,7 +1876,7 @@ "aKd" = (/obj/machinery/light/small,/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/fore) "aKe" = (/obj/structure/rack,/obj/machinery/power/apc{dir = 2; name = "Cargo Bay APC"; pixel_x = 1; pixel_y = -24},/obj/structure/cable/yellow,/obj/machinery/light,/obj/item/weapon/hand_labeler,/obj/item/weapon/hand_labeler,/obj/item/weapon/screwdriver{pixel_y = 10},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/quartermaster/storage) "aKf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) -"aKg" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) +"aKg" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aKh" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "redcorner"},/area/hallway/primary/fore) "aKi" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/weapon/firealarm_electronics,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "aKj" = (/obj/structure/stool/bed/chair{name = "Bailiff"},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) @@ -1993,7 +1993,7 @@ "aMq" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "lawyer_blast"; name = "privacy shutters"},/turf/simulated/floor/plating,/area/lawoffice) "aMr" = (/obj/structure/plasticflaps{opacity = 1},/obj/machinery/conveyor{backwards = 1; dir = 2; forwards = 2; id = "packageSort2"},/turf/simulated/floor/plasteel{icon_state = "loadingarea"; tag = "loading"},/area/quartermaster/office{name = "\improper Cargo Office"}) "aMs" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/quartermaster/storage) -"aMt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) +"aMt" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "aMu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage) "aMv" = (/obj/structure/closet/crate,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/item/weapon/ore/glass,/obj/item/weapon/ore/iron,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/quartermaster/storage) "aMw" = (/obj/machinery/conveyor{dir = 10; id = "QMLoad2"},/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -2018,9 +2018,9 @@ "aMP" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/space,/area/space) "aMQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) "aMR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/porta_turret{ai = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) -"aMS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/flasher{pixel_x = 0; pixel_y = 24; id = "AI"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) +"aMS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/flasher{pixel_x = 0; pixel_y = 24; id = "AI"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aMT" = (/obj/structure/sign/kiddieplaque{pixel_y = 32},/obj/structure/table,/obj/machinery/camera/motion{c_tag = "AI Upload Chamber - Fore"; network = list("SS13","RD","AIUpload")},/obj/structure/flora/kirbyplants{icon_state = "plant-07"; name = "Photosynthetic Potted plant"; pixel_y = 10; tag = "icon-plant-07"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) -"aMU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) +"aMU" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aMV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/porta_turret{ai = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aMW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) "aMX" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/space,/area/space) @@ -2030,26 +2030,26 @@ "aNb" = (/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/crew_quarters/courtroom) "aNc" = (/obj/effect/landmark/start{name = "Lawyer"},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) "aNd" = (/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 4},/area/crew_quarters/courtroom) -"aNe" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/wood,/area/lawoffice) +"aNe" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/wood,/area/lawoffice) "aNf" = (/obj/structure/table/wood,/obj/item/weapon/folder/red,/obj/item/weapon/folder/red,/obj/item/weapon/folder/red,/obj/item/clothing/glasses/sunglasses/big,/turf/simulated/floor/wood,/area/lawoffice) -"aNg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/lawoffice) +"aNg" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/lawoffice) "aNh" = (/obj/machinery/photocopier,/obj/machinery/camera{c_tag = "Law Office"; dir = 8; network = list("SS13")},/turf/simulated/floor/wood,/area/lawoffice) "aNi" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/crew_quarters/locker) "aNj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/quartermaster/storage) "aNk" = (/obj/structure/closet/secure_closet/personal,/obj/item/clothing/under/assistantformal,/obj/item/clothing/suit/hooded/wintercoat,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/crew_quarters/locker) "aNl" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aNm" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/locker) -"aNn" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/locker) -"aNo" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/pump,/obj/machinery/light/small{dir = 1},/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/locker) -"aNp" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/locker) -"aNq" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/scrubber,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 26},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/locker) +"aNn" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/locker) +"aNo" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/pump,/obj/machinery/light/small{dir = 1},/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/locker) +"aNp" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/locker) +"aNq" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/scrubber,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 26},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/locker) "aNr" = (/obj/machinery/disposal{pixel_x = 0; pixel_y = 0},/obj/structure/disposalpipe/trunk,/obj/machinery/camera{c_tag = "Locker Room Starboard"; dir = 2; network = list("SS13")},/obj/structure/sign/pods{pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/locker) "aNs" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aNt" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/crew_quarters/locker) "aNu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aNv" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/machinery/light_switch{pixel_x = -26},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 9},/area/hallway/secondary/construction{name = "\improper Garden"}) "aNw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/hallway/secondary/construction{name = "\improper Garden"}) -"aNx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 5},/area/hallway/secondary/construction{name = "\improper Garden"}) +"aNx" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 5},/area/hallway/secondary/construction{name = "\improper Garden"}) "aNy" = (/turf/simulated/floor/grass,/area/hallway/secondary/construction{name = "\improper Garden"}) "aNz" = (/obj/machinery/door/firedoor/border_only{density = 1; dir = 8; icon_state = "door_closed"; name = "Animal Pen A"; opacity = 1},/turf/simulated/floor/grass,/area/hallway/secondary/construction{name = "\improper Garden"}) "aNA" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/starboard) @@ -2075,7 +2075,7 @@ "aNU" = (/turf/simulated/floor/plasteel,/area/quartermaster/storage) "aNV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "aNW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/landmark/start{name = "Cargo Technician"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/quartermaster/storage) -"aNX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "loadingarea"; tag = "loading"},/area/quartermaster/storage) +"aNX" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "loadingarea"; tag = "loading"},/area/quartermaster/storage) "aNY" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #3"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/bot/mulebot{home_destination = "QM #3"; suffix = "#3"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/quartermaster/storage) "aNZ" = (/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/obj/structure/rack,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/storage/primary) "aOa" = (/turf/simulated/floor/plasteel,/area/storage/primary) @@ -2107,7 +2107,7 @@ "aOA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aOB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/junction{dir = 4; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aOC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/structure/disposalpipe/junction{icon_state = "pipe-j1"; dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/locker) -"aOD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) +"aOD" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aOE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=14.5-Recreation"; location = "14.3-Lockers-Dorms"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aOF" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/engine/chiefs_office) "aOG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/hallway/secondary/construction{name = "\improper Garden"}) @@ -2130,7 +2130,7 @@ "aOX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/engine/chiefs_office) "aOY" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/engine/engineering) "aOZ" = (/obj/machinery/door/airlock/shuttle{id_tag = "prisonshuttle"; name = "Labor Shuttle Airlock"},/obj/docking_port/mobile{dir = 8; dwidth = 2; height = 5; id = "laborcamp"; name = "labor camp shuttle"; travelDir = 90; width = 9},/obj/docking_port/stationary{dir = 8; dwidth = 2; height = 5; id = "laborcamp_home"; name = "fore bay 1"; width = 9},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/labor) -"aPa" = (/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/construction) +"aPa" = (/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/construction) "aPb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/construction) "aPc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/construction) "aPd" = (/obj/machinery/pipedispenser/disposal,/turf/simulated/floor/plasteel,/area/construction) @@ -2145,13 +2145,13 @@ "aPm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 8; icon_state = "loadingarea"; tag = "loading"},/area/quartermaster/storage) "aPn" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/window/southleft,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/quartermaster/storage) "aPo" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/hallway/primary/port) -"aPp" = (/obj/structure/closet/secure_closet/quartermaster,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "brown"},/area/quartermaster/qm) +"aPp" = (/obj/structure/closet/secure_closet/quartermaster,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "brown"},/area/quartermaster/qm) "aPq" = (/obj/machinery/camera/autoname{dir = 2; network = list("SS13")},/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/power/apc{dir = 1; name = "Quartermaster's Office APC"; pixel_x = 0; pixel_y = 30},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/quartermaster/qm) "aPr" = (/obj/structure/filingcabinet/chestdrawer,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/quartermaster/qm) "aPs" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/quartermaster/qm) "aPt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/spawner/lootdrop{loot = list("/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/item/weapon/cigbutt","/obj/item/trash/cheesie","/obj/item/trash/candy","/obj/item/trash/chips","/obj/item/trash/deadmouse","/obj/item/trash/pistachios","/obj/item/trash/plate","/obj/item/trash/popcorn","/obj/item/trash/raisins","/obj/item/trash/sosjerky","/obj/item/trash/syndi_cakes"); name = "maint grille or trash spawner"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "aPu" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/obj/structure/closet/crate/internals,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/storage/primary) -"aPv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/storage/primary) +"aPv" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/storage/primary) "aPw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/storage/primary) "aPx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/storage/primary) "aPy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/storage/primary) @@ -2163,14 +2163,14 @@ "aPE" = (/obj/machinery/computer/upload/ai,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/westleft{base_state = "right"; dir = 2; icon_state = "right"; layer = 3.1; name = "Upload Console Window"; req_access_txt = "16"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aPF" = (/obj/machinery/porta_turret{ai = 1; dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aPG" = (/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage) -"aPH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) +"aPH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) "aPI" = (/obj/structure/stool/bed/chair{dir = 4; name = "Prosecution"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/crew_quarters/courtroom) "aPJ" = (/obj/structure/table/wood,/obj/item/weapon/paper,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 10},/area/crew_quarters/courtroom) "aPK" = (/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/courtroom) "aPL" = (/obj/item/device/radio/beacon,/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/courtroom) "aPM" = (/obj/structure/table/wood,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 6},/area/crew_quarters/courtroom) "aPN" = (/obj/structure/stool/bed/chair{dir = 8; name = "Defense"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 6},/area/crew_quarters/courtroom) -"aPO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) +"aPO" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) "aPP" = (/obj/structure/closet/crate,/turf/simulated/floor/plasteel/shuttle,/area/shuttle/mining) "aPQ" = (/obj/structure/ore_box,/turf/simulated/floor/plasteel/shuttle,/area/shuttle/mining) "aPR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/lawoffice) @@ -2324,7 +2324,7 @@ "aSJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aSK" = (/obj/structure/rack,/obj/effect/landmark/costume,/obj/effect/landmark/costume,/obj/item/clothing/mask/balaclava,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aSL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{dir = 10; icon_state = "neutral"},/area/hallway/secondary/construction{name = "\improper Garden"}) -"aSM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/secondary/construction{name = "\improper Garden"}) +"aSM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aSN" = (/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aSO" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aSP" = (/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 6},/area/hallway/secondary/construction{name = "\improper Garden"}) @@ -2350,7 +2350,7 @@ "aTj" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window{dir = 2; name = "MiniSat Walkway Access"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "aTk" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "aTl" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced,/obj/machinery/light/small,/obj/machinery/camera{c_tag = "MiniSat Exterior Fore-Port"; dir = 1; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"aTm" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced,/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) +"aTm" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "aTn" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced,/obj/machinery/light/small,/obj/machinery/camera{c_tag = "MiniSat Exterior Fore-Starboard"; dir = 1; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "aTo" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/machinery/door/window{dir = 2; name = "MiniSat Walkway Access"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "aTp" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/lattice,/turf/space,/area/space) @@ -2358,7 +2358,7 @@ "aTr" = (/obj/item/weapon/paper,/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor{dir = 2; name = "Arrivals Security Checkpoint"; pixel_y = -8; req_access_txt = "1"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/checkpoint2{name = "Customs"}) "aTs" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/checkpoint2{name = "Customs"}) "aTt" = (/obj/structure/disposaloutlet{dir = 4},/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/office{name = "\improper Cargo Office"}) -"aTu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/construction) +"aTu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/construction) "aTv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/construction) "aTw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/construction) "aTx" = (/obj/machinery/power/apc{dir = 8; name = "Custodial Closet APC"; pixel_x = -24},/obj/structure/table,/obj/item/clothing/gloves/color/orange,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/janitor) @@ -2366,18 +2366,18 @@ "aTz" = (/obj/machinery/conveyor{dir = 9; id = "QMLoad"; movedir = 2},/turf/simulated/floor/plating,/area/quartermaster/storage) "aTA" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "bridge blast"; layer = 2.9; name = "bridge blast door"},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/bridge) "aTB" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor/plasteel{dir = 10; icon_state = "brown"},/area/quartermaster/qm) -"aTC" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = -28},/turf/simulated/floor/plasteel{dir = 2; icon_state = "brown"},/area/quartermaster/qm) +"aTC" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = -28},/turf/simulated/floor/plasteel{dir = 2; icon_state = "brown"},/area/quartermaster/qm) "aTD" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "brown"},/area/quartermaster/qm) "aTE" = (/obj/structure/safe,/obj/item/weapon/storage/secure/briefcase{contents = newlist(/obj/item/clothing/suit/armor/vest,/obj/item/weapon/gun/projectile/automatic/pistol,/obj/item/weapon/suppressor,/obj/item/weapon/melee/classic_baton/telescopic,/obj/item/clothing/mask/balaclava,/obj/item/bodybag,/obj/item/weapon/soap/nanotrasen)},/obj/item/weapon/storage/backpack/dufflebag{contents = newlist(/obj/item/clothing/under/lawyer/blacksuit,/obj/item/clothing/tie/waistcoat,/obj/item/clothing/suit/toggle/lawyer/black,/obj/item/clothing/shoes/laceup,/obj/item/clothing/gloves/color/black,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/fedora); desc = "A large dufflebag for holding extra things. There is a NanoTrasen logo on the back."; icon_state = "duffle-syndieammo"; item_state = "duffle-syndieammo"},/obj/item/weapon/card/id/silver{access = list(12); assignment = "Reaper"; name = "Thirteen's ID Card (Reaper)"; registered_name = "Thirteen"},/obj/item/weapon/lazarus_injector,/obj/item/weapon/gun/energy/gun/advtaser,/obj/item/weapon/gun/projectile/revolver/russian,/obj/item/ammo_box/a357,/obj/item/clothing/tie/stethoscope,/obj/item/weapon/book{desc = "An undeniably handy book."; icon_state = "bookknock"; name = "A Simpleton's Guide to Safe-cracking with Stethoscopes"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/security/nuke_storage) "aTF" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/obj/machinery/disposal/deliveryChute{dir = 4; name = "Crate Disposal Chute"; pixel_x = -5; pixel_y = 2},/obj/machinery/door/window/westleft{base_state = "right"; dir = 4; icon_state = "right"; name = "Crate Disposal Chute"; req_access_txt = "0"},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/storage/primary) "aTG" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/storage/primary) "aTH" = (/obj/structure/disposalpipe/junction{icon_state = "pipe-j1"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/storage/primary) "aTI" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/storage/primary) -"aTJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/storage/primary) +"aTJ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/storage/primary) "aTK" = (/obj/machinery/flasher{id = "AI"; pixel_x = 0; pixel_y = -24},/obj/machinery/porta_turret{ai = 1; dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aTL" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aTM" = (/obj/machinery/porta_turret{ai = 1; dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) -"aTN" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) +"aTN" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aTO" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/centcom{name = "Courtroom"; opacity = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aTP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aTQ" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=16-Fore"; location = "15-Court"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) @@ -2386,7 +2386,7 @@ "aTT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/crew_quarters/locker) "aTU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aTV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/sign/map/right{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-right-MS"; pixel_y = 32},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitecorner"},/area/hallway/secondary/entry{name = "Arrivals"}) -"aTW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) +"aTW" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aTX" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aTY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/crew_quarters/locker) "aTZ" = (/obj/structure/rack,/obj/item/weapon/storage/briefcase,/obj/item/weapon/storage/briefcase{pixel_x = 4; pixel_y = -2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/locker) @@ -2401,7 +2401,7 @@ "aUi" = (/obj/machinery/power/terminal,/obj/structure/cable,/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/engine/engineering) "aUj" = (/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/door/airlock/glass_engineering{name = "Power Monitoring"; req_access_txt = "32"},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/engine/engineering) "aUk" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/engineering) -"aUl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) +"aUl" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) "aUm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "aUn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/engine/engineering) "aUo" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) @@ -2452,13 +2452,13 @@ "aVh" = (/obj/machinery/computer/crew,/turf/simulated/floor/plasteel{dir = 1; icon_state = "darkgreen"},/area/bridge) "aVi" = (/obj/machinery/door/airlock/highsecurity{icon_state = "door_closed"; locked = 0; name = "AI Upload"; req_access_txt = "16"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "aVj" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) -"aVk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) +"aVk" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aVl" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aVm" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aVn" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = -32},/obj/machinery/light,/obj/machinery/camera{c_tag = "Courtroom - Gallery"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aVo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aVp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) -"aVq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) +"aVq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aVr" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aVs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=14.3-Lockers-Dorms"; location = "14.2-Central-CrewQuarters"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aVt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/locker) @@ -2514,12 +2514,12 @@ "aWr" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload_foyer) "aWs" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plasteel{dir = 1; icon_state = "darkbrown"},/area/bridge) "aWt" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/turret_protected/ai_upload_foyer) -"aWu" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark/start{name = "Cyborg"},/obj/machinery/light/small{dir = 4},/obj/machinery/computer/security/telescreen{desc = "Used for watching areas on the MiniSat."; dir = 8; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); pixel_x = 29; pixel_y = 0},/obj/machinery/camera/motion{c_tag = "AI Upload Foyer"; network = list("SS13","RD","AIUpload")},/obj/machinery/alarm{pixel_y = 26},/turf/simulated/floor/plasteel{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/turret_protected/ai_upload_foyer) +"aWu" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark/start{name = "Cyborg"},/obj/machinery/light/small{dir = 4},/obj/machinery/computer/security/telescreen{desc = "Used for watching areas on the MiniSat."; dir = 8; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); pixel_x = 29; pixel_y = 0},/obj/machinery/camera/motion{c_tag = "AI Upload Foyer"; network = list("SS13","RD","AIUpload")},/obj/machinery/alarm{pixel_y = 26},/turf/simulated/floor/plasteel{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/turret_protected/ai_upload_foyer) "aWv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Fore Primary Hallway"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "aWw" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Fore Primary Hallway"},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "aWx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Fore Primary Hallway"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "redcorner"},/area/hallway/primary/fore) "aWy" = (/obj/machinery/power/apc{cell_type = 2500; dir = 2; name = "Courtroom APC"; pixel_x = 1; pixel_y = -24},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) -"aWz" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) +"aWz" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aWA" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aWB" = (/obj/structure/table,/obj/item/weapon/book/manual/wiki/security_space_law{pixel_x = -3; pixel_y = 5},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/item/weapon/book/manual/wiki/security_space_law{pixel_x = -3; pixel_y = 5},/obj/item/weapon/book/manual/wiki/security_space_law{pixel_x = -3; pixel_y = 5},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "aWC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) @@ -2543,7 +2543,7 @@ "aWU" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/engine/engineering) "aWV" = (/obj/machinery/computer/secure_data,/turf/simulated/floor/plasteel{dir = 1; icon_state = "darkred"; tag = "icon-darkblue"; temperature = 273.15},/area/bridge) "aWW" = (/obj/machinery/light_switch,/turf/simulated/wall,/area/engine/engineering) -"aWX" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"aWX" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "aWY" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/engine/engineering) "aWZ" = (/obj/item/weapon/wrench,/turf/simulated/floor/plating/airless,/area/engine/engineering) "aXa" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/door/poddoor/preopen{id = "bridge blast"; layer = 2.9; name = "bridge blast door"},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/bridge) @@ -2552,7 +2552,7 @@ "aXd" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 21},/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "aXe" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "aXf" = (/obj/structure/stool/bed/chair,/obj/machinery/camera{c_tag = "Arrivals - Fore Arm - Far"; dir = 2; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) -"aXg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) +"aXg" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "aXh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "aXi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "aXj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) @@ -2570,7 +2570,7 @@ "aXv" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Security Post - Cargo"; req_access_txt = "63"},/turf/simulated/floor/plasteel,/area/security/checkpoint/supply{name = "Security Post - Cargo"}) "aXw" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/supply{name = "Security Post - Cargo"}) "aXx" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/security/checkpoint/supply{name = "Security Post - Cargo"}) -"aXy" = (/obj/structure/stool/bed/chair/office/dark,/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark/start/depsec/supply,/turf/simulated/floor/plasteel,/area/security/checkpoint/supply{name = "Security Post - Cargo"}) +"aXy" = (/obj/structure/stool/bed/chair/office/dark,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark/start/depsec/supply,/turf/simulated/floor/plasteel,/area/security/checkpoint/supply{name = "Security Post - Cargo"}) "aXz" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/computer/security/mining,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/supply{name = "Security Post - Cargo"}) "aXA" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/engine/break_room) "aXB" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/wall/shuttle{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/shuttle/pod_1) @@ -2621,12 +2621,12 @@ "aYu" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/engine/engineering) "aYv" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/emitter{anchored = 1; dir = 1; state = 2},/turf/simulated/floor/plating/airless,/area/engine/engineering) "aYw" = (/obj/machinery/light,/obj/structure/grille,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/turf/simulated/floor/plating/airless,/area/engine/engineering) -"aYx" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light/small{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) +"aYx" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light/small{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "aYy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) "aYz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai) "aYA" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/wall/r_wall,/area/turret_protected/ai) "aYB" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"aYC" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) +"aYC" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "aYD" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/door/poddoor/preopen{id = "bridge blast"; layer = 2.9; name = "bridge blast door"},/turf/simulated/floor/plating,/area/bridge) "aYE" = (/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "aYF" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) @@ -2645,7 +2645,7 @@ "aYS" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/computer/prisoner,/turf/simulated/floor/plasteel{dir = 5; icon_state = "darkred"; tag = "icon-darkblue"; temperature = 273.15},/area/bridge) "aYT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "aYU" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/quartermaster/storage) -"aYV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) +"aYV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "aYW" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/quartermaster/storage) "aYX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/security/checkpoint/supply{name = "Security Post - Cargo"}) "aYY" = (/obj/machinery/recharger{pixel_y = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/table/reinforced,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/checkpoint/supply{name = "Security Post - Cargo"}) @@ -2705,7 +2705,7 @@ "baa" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) "bab" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) "bac" = (/obj/item/weapon/storage/secure/safe{pixel_x = 6; pixel_y = 30},/obj/machinery/camera{c_tag = "Chief Engineer's Office"; dir = 2; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) -"bad" = (/obj/structure/disposalpipe/segment,/obj/machinery/power/apc{dir = 4; name = "CE Office APC"; pixel_x = 28; pixel_y = 0},/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light_switch{pixel_x = 26; pixel_y = 26},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) +"bad" = (/obj/structure/disposalpipe/segment,/obj/machinery/power/apc{dir = 4; name = "CE Office APC"; pixel_x = 28; pixel_y = 0},/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light_switch{pixel_x = 26; pixel_y = 26},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) "bae" = (/obj/structure/sign/securearea{pixel_y = 32},/obj/structure/closet/radiation,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) "baf" = (/obj/structure/closet/radiation,/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 32},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) "bag" = (/turf/simulated/wall,/area/security/checkpoint/engineering) @@ -2725,7 +2725,7 @@ "bau" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA"; pixel_y = 0},/turf/simulated/wall,/area/hallway/secondary/entry{name = "Arrivals"}) "bav" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "baw" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/entry{name = "Arrivals"}) -"bax" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) +"bax" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bay" = (/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "baz" = (/obj/structure/table,/obj/item/weapon/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/weapon/cartridge/quartermaster,/obj/item/weapon/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/item/device/gps{gpstag = "QM0"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "brown"},/area/quartermaster/qm) "baA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) @@ -2746,13 +2746,13 @@ "baP" = (/obj/machinery/conveyor{dir = 1; id = "packageExternal"},/obj/structure/plasticflaps{opacity = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/office{name = "\improper Cargo Office"}) "baQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/maintenance{req_access_txt = "0"; req_one_access_txt = "12;63;48;50"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "baR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/hallway/primary/central) -"baS" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"baS" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "baT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "baU" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "baV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "baW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/central) "baX" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"baY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"baY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "baZ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bba" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bbb" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "L2"},/area/hallway/primary/central) @@ -2763,18 +2763,18 @@ "bbg" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "L12"},/area/hallway/primary/central) "bbh" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{desc = ""; icon_state = "L14"},/area/hallway/primary/central) "bbi" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"bbj" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bbj" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bbk" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bbl" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=15-Court"; location = "14.9-CrewQuarters-Central"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bbm" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"bbn" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bbn" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bbo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) "bbp" = (/turf/simulated/wall,/area/storage/tools) "bbq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/starboard) "bbr" = (/turf/simulated/wall/r_wall,/area/storage/tech) "bbs" = (/obj/machinery/power/apc{dir = 8; name = "Tech Storage APC"; pixel_x = -27; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "bbt" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) -"bbu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) +"bbu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "bbv" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "bbw" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = -3; pixel_y = 3},/obj/item/stack/cable_coil,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/storage/tech) "bbx" = (/obj/machinery/door_control{desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -5; req_access_txt = "10"},/obj/machinery/door_control{id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 5; req_access_txt = "24"},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) @@ -2783,9 +2783,9 @@ "bbA" = (/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/paper/monitorkey,/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/engine/chiefs_office) "bbB" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/engine/chiefs_office) "bbC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) -"bbD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/engine/engineering) +"bbD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/engine/engineering) "bbE" = (/obj/effect/landmark{name = "lightsout"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/engine/engineering) -"bbF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/engine/engineering) +"bbF" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/engine/engineering) "bbG" = (/obj/structure/filingcabinet,/obj/structure/reagent_dispensers/peppertank{pixel_x = 0; pixel_y = 30},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/checkpoint/engineering) "bbH" = (/obj/structure/table,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 29},/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint/engineering) "bbI" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -1; pixel_y = 5},/obj/item/weapon/pen,/obj/machinery/newscaster/security_unit{pixel_x = 30; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/checkpoint/engineering) @@ -2826,7 +2826,7 @@ "bcr" = (/obj/item/weapon/stamp{pixel_x = -3; pixel_y = 3},/obj/item/weapon/stamp/denied{pixel_x = 4; pixel_y = -2},/obj/structure/table/reinforced,/obj/structure/noticeboard{desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; name = "requests board"; pixel_x = 32; pixel_y = 32},/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{dir = 9; icon_state = "brown"},/area/quartermaster/office{name = "\improper Cargo Office"}) "bcs" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen/red,/obj/structure/table/reinforced,/turf/simulated/floor/plasteel{dir = 5; icon_state = "brown"},/area/quartermaster/office{name = "\improper Cargo Office"}) "bct" = (/obj/machinery/computer/ordercomp,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/primary/port) -"bcu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/status_display{density = 0; pixel_x = 0; pixel_y = 32; supply_display = 1},/obj/structure/table,/obj/item/weapon/folder/yellow,/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/hallway/primary/port) +"bcu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/status_display{density = 0; pixel_x = 0; pixel_y = 32; supply_display = 1},/obj/structure/table,/obj/item/weapon/folder/yellow,/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/hallway/primary/port) "bcv" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/hallway/primary/port) "bcw" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/hallway/primary/port) "bcx" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor/plasteel{dir = 5; icon_state = "brown"},/area/hallway/primary/port) @@ -2859,7 +2859,7 @@ "bcY" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/storage/tools) "bcZ" = (/obj/structure/closet/toolcloset,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/storage/tools) "bda" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/storage/tools) -"bdb" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) +"bdb" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) "bdc" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/item/weapon/cigbutt,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/starboard) "bdd" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/starboard) "bde" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/borgupload{pixel_x = -1; pixel_y = 1},/obj/item/weapon/circuitboard/aiupload{pixel_x = 2; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/storage/tech) @@ -2911,7 +2911,7 @@ "bdY" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/quartermaster/office{name = "\improper Cargo Office"}) "bdZ" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/light_switch{pixel_x = -25; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "brown"},/area/quartermaster/office{name = "\improper Cargo Office"}) "bea" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/quartermaster/office{name = "\improper Cargo Office"}) -"beb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/status_display{density = 0; pixel_x = 0; pixel_y = 32; supply_display = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/quartermaster/office{name = "\improper Cargo Office"}) +"beb" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/status_display{density = 0; pixel_x = 0; pixel_y = 32; supply_display = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/quartermaster/office{name = "\improper Cargo Office"}) "bec" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "browncorner"},/area/quartermaster/office{name = "\improper Cargo Office"}) "bed" = (/obj/effect/landmark/start{name = "Cargo Technician"},/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/office{name = "\improper Cargo Office"}) "bee" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/yellow,/obj/machinery/door/firedoor,/obj/machinery/door/window/westleft{dir = 8; name = "Cargo Desk"; req_access_txt = "50"},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) @@ -2935,23 +2935,23 @@ "bew" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/central) "bex" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) "bey" = (/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/door_control{id = "hop"; name = "Privacy Shutters Control"; pixel_x = 0; pixel_y = 25; req_access_txt = "28"},/obj/structure/table/wood,/turf/simulated/floor/wood,/area/crew_quarters/heads) -"bez" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/storage/tools) +"bez" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/storage/tools) "beA" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/storage/tools) -"beB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/storage/tools) +"beB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/storage/tools) "beC" = (/obj/machinery/camera{c_tag = "Auxiliary Tool Storage"; dir = 8; network = list("SS13")},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/storage/tools) "beD" = (/obj/effect/landmark{name = "blobstart"},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/starboard) -"beE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plating,/area/maintenance/starboard) +"beE" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plating,/area/maintenance/starboard) "beF" = (/obj/machinery/recharger,/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = 24},/obj/item/weapon/storage/secure/safe{pixel_x = 34; pixel_y = 0},/obj/item/device/flash/handheld,/obj/structure/table/wood,/turf/simulated/floor/wood,/area/crew_quarters/heads) "beG" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/crew{pixel_x = -1; pixel_y = 1},/obj/item/weapon/circuitboard/card{pixel_x = 2; pixel_y = -2},/obj/item/weapon/circuitboard/communications{pixel_x = 5; pixel_y = -5},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "beH" = (/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "beI" = (/obj/machinery/door/airlock/highsecurity{name = "Secure Tech Storage"; req_access_txt = "19;23"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "beJ" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) -"beK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) +"beK" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "beL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "beM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "beN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/tech) "beO" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/structure/flora/kirbyplants{icon_state = "plant-16"; layer = 4.1; tag = "icon-plant-16"},/turf/simulated/floor/plasteel{dir = 5; icon_state = "neutral"},/area/hallway/primary/central) -"beP" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) +"beP" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) "beQ" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Head of Personnel's Desk"; departmentType = 5; name = "Head of Personnel RC"; pixel_y = 30},/obj/machinery/light{dir = 1},/obj/item/weapon/storage/secure/briefcase,/obj/structure/table/wood,/turf/simulated/floor/wood,/area/crew_quarters/heads) "beR" = (/obj/machinery/door/airlock{name = "Central Emergency Storage"; req_access_txt = "0"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/maintcentral{name = "Central Maintenance"}) "beS" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Bridge"; departmentType = 5; name = "Bridge RC"; pixel_x = 32; pixel_y = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/computer/ordercomp,/turf/simulated/floor/plasteel{dir = 5; icon_state = "darkblue"},/area/bridge) @@ -2974,16 +2974,16 @@ "bfj" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/machinery/ai_slipper{icon_state = "motion0"},/obj/machinery/door/window{dir = 8; icon_state = "left"; name = "Tertiary AI Core Access"; pixel_x = 0; req_access_txt = "16"},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) "bfk" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) "bfl" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "MiniSat Exterior Starboard-Fore"; dir = 4; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"bfm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) +"bfm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "bfn" = (/obj/structure/window/reinforced,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkblue"; tag = "icon-darkbluecorners (WEST)"},/area/bridge) "bfo" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/bridge) "bfp" = (/obj/structure/window/reinforced,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkblue"; tag = "icon-darkbluecorners (WEST)"},/area/bridge) "bfq" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/window/brigdoor{dir = 2; name = "Command Desk"; req_access_txt = "19"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkblue"; tag = "icon-darkbluecorners (WEST)"},/area/bridge) "bfr" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "darkbluecorners"; tag = "icon-darkbluecorners"; temperature = 273.15},/area/bridge) -"bfs" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry{name = "Arrivals"}) +"bfs" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry{name = "Arrivals"}) "bft" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/security/checkpoint2{name = "Customs"}) "bfu" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/obj/structure/table/reinforced,/obj/item/weapon/book/manual/wiki/security_space_law{pixel_x = -3; pixel_y = 5},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/checkpoint2{name = "Customs"}) -"bfv" = (/obj/machinery/power/apc{dir = 1; name = "Customs APC"; pixel_y = 24},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint2{name = "Customs"}) +"bfv" = (/obj/machinery/power/apc{dir = 1; name = "Customs APC"; pixel_y = 24},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint2{name = "Customs"}) "bfw" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/computer/security,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint2{name = "Customs"}) "bfx" = (/obj/machinery/computer/card,/obj/machinery/light{dir = 1},/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_y = 30},/obj/machinery/camera{c_tag = "Customs Checkpoint"; dir = 2; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint2{name = "Customs"}) "bfy" = (/obj/machinery/computer/secure_data,/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint2{name = "Customs"}) @@ -3001,10 +3001,10 @@ "bfK" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) "bfL" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) "bfM" = (/obj/machinery/computer/supplycomp,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/office{name = "\improper Cargo Office"}) -"bfN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) +"bfN" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "bfO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/hallway/primary/port) "bfP" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/hallway/primary/port) -"bfQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port) +"bfQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bfR" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bfS" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/hallway/primary/port) "bfT" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/storage/art) @@ -3048,8 +3048,8 @@ "bgF" = (/obj/structure/filingcabinet/chestdrawer,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/parrot/Poly,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) "bgG" = (/obj/structure/closet/secure_closet/engineering_chief{req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/chiefs_office) "bgH" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/engineering{name = "Engine Room"; req_access_txt = "10"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/engine/engineering) -"bgI" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/obj/machinery/door_control{desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -6; req_access_txt = "1"},/obj/machinery/door_control{id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 5; req_access_txt = "1"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/checkpoint/engineering) -"bgJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/checkpoint/engineering) +"bgI" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/obj/machinery/door_control{desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -6; req_access_txt = "1"},/obj/machinery/door_control{id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 5; req_access_txt = "1"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/checkpoint/engineering) +"bgJ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/checkpoint/engineering) "bgK" = (/obj/structure/closet/secure_closet/security/engine,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/checkpoint/engineering) "bgL" = (/turf/simulated/wall,/area/engine/break_room) "bgM" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 0},/turf/simulated/wall/r_wall,/area/space) @@ -3057,10 +3057,10 @@ "bgO" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/turf/space,/area/space) "bgP" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/turf/space,/area/space) "bgQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/turret_protected/ai) -"bgR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) +"bgR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) "bgS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/flasher{id = "AI"; layer = 2.9; pixel_x = 24; pixel_y = -8},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) "bgT" = (/obj/item/device/radio/intercom{anyai = 1; broadcasting = 0; freerange = 1; frequency = 1447; name = "Private Channel"; pixel_x = 28; pixel_y = 5},/obj/item/device/radio/intercom{anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_x = -27; pixel_y = 4},/obj/effect/landmark/start{name = "AI"},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 1; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Primary AI Base"},/area/turret_protected/ai) -"bgU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/camera{c_tag = "AI Chamber - Starboard"; dir = 8; network = list("SS13","MiniSat","RD")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) +"bgU" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/camera{c_tag = "AI Chamber - Starboard"; dir = 8; network = list("SS13","MiniSat","RD")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) "bgV" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai) "bgW" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/turf/space,/area/space) "bgX" = (/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko,/obj/structure/table/glass,/turf/simulated/floor/plasteel,/area/engine/break_room) @@ -3078,7 +3078,7 @@ "bhj" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/checkpoint2{name = "Customs"}) "bhk" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/security/checkpoint2{name = "Customs"}) "bhl" = (/obj/structure/stool/bed/chair/office/dark,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/checkpoint2{name = "Customs"}) -"bhm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/security/checkpoint2{name = "Customs"}) +"bhm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/security/checkpoint2{name = "Customs"}) "bhn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint2{name = "Customs"}) "bho" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plating,/area/maintenance/maintcentral{name = "Central Maintenance"}) "bhp" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -3101,7 +3101,7 @@ "bhG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "browncorner"},/area/hallway/primary/central) "bhH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "bhI" = (/obj/item/weapon/restraints/legcuffs/beartrap,/obj/item/weapon/restraints/legcuffs/beartrap,/obj/structure/table,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; pixel_x = -29; pixel_y = 0},/obj/item/weapon/reagent_containers/spray/cleaner,/obj/machinery/camera{c_tag = "Custodial Closet"; dir = 4; network = list("SS13")},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/janitor) -"bhJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/janitor) +"bhJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/janitor) "bhK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/janitor) "bhL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/janitor) "bhM" = (/obj/machinery/door/airlock/maintenance{name = "Security Maintenance"; req_access_txt = "1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/security/checkpoint2{name = "Customs"}) @@ -3177,7 +3177,7 @@ "bje" = (/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 8},/obj/structure/table/glass,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "bjf" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/window/eastleft{name = "Mail"; req_access_txt = "50"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/quartermaster/office{name = "\improper Cargo Office"}) "bjg" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "loadingarea"; tag = "loading"},/area/quartermaster/office{name = "\improper Cargo Office"}) -"bjh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) +"bjh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) "bji" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) "bjj" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) "bjk" = (/obj/machinery/status_display{density = 0; pixel_x = 0; pixel_y = 32; supply_display = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) @@ -3215,9 +3215,9 @@ "bjQ" = (/obj/structure/fireaxecabinet{pixel_y = -32},/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 7},/obj/item/weapon/pen{pixel_y = 3},/obj/machinery/light_switch{pixel_x = 28; pixel_y = 0},/obj/structure/table/glass,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "bjR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 6; icon_state = "darkblue"},/area/bridge) "bjS" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/break_room) -"bjT" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) +"bjT" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bjU" = (/obj/machinery/light_switch{pixel_y = -25},/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/item/weapon/reagent_containers/food/drinks/flask{pixel_x = 8},/obj/item/weapon/razor{pixel_x = -4; pixel_y = 2},/obj/item/clothing/mask/cigarette/cigar,/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) -"bjV" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) +"bjV" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bjW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bjX" = (/obj/machinery/door/airlock/command{name = "Captain's Quarters"; req_access = null; req_access_txt = "20"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bjY" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) @@ -3282,7 +3282,7 @@ "blf" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id = "packageExternal"; pixel_y = 18},/turf/simulated/floor/plasteel{dir = 4; icon_state = "loadingarea"; tag = "loading"},/area/quartermaster/office{name = "\improper Cargo Office"}) "blg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) "blh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) -"bli" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) +"bli" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) "blj" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/office{name = "\improper Cargo Office"}) "blk" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/heads) "bll" = (/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/folder/yellow,/obj/item/device/multitool,/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/office{name = "\improper Cargo Office"}) @@ -3291,7 +3291,7 @@ "blo" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/hallway/primary/port) "blp" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "blq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/port) -"blr" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/port) +"blr" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bls" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/hallway/primary/port) "blt" = (/obj/structure/table,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/janitor) "blu" = (/obj/structure/janitorialcart,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/janitor) @@ -3319,17 +3319,17 @@ "blQ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "blR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "blS" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) -"blT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) +"blT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "blU" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "blV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "blW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/junction{dir = 2; icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "blX" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) -"blY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) +"blY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "blZ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bma" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bmb" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bmc" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) -"bmd" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) +"bmd" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bme" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bmf" = (/obj/machinery/firealarm{dir = 4; pixel_x = 28},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "cautioncorner"},/area/hallway/primary/starboard) "bmg" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/light_switch{pixel_x = -22; pixel_y = 0},/turf/simulated/floor/plasteel,/area/engine/break_room) @@ -3348,7 +3348,7 @@ "bmt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bmu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bmv" = (/turf/simulated/floor/carpet,/area/hallway/primary/port) -"bmw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) +"bmw" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bmx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitecorner"},/area/hallway/secondary/entry{name = "Arrivals"}) "bmy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 5},/area/hallway/secondary/entry{name = "Arrivals"}) "bmz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/primary/port) @@ -3359,7 +3359,7 @@ "bmE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 9},/area/hallway/primary/port) "bmF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/structure/sign/map/left{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/hallway/primary/port) "bmG" = (/obj/structure/extinguisher_cabinet{pixel_x = 30; pixel_y = 0},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/sign/map/right{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-right-MS"; pixel_y = 32},/turf/simulated/floor/plasteel{dir = 5; icon_state = "neutral"},/area/hallway/primary/port) -"bmH" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/turretid{control_area = "\improper MiniSat West Wing"; enabled = 0; icon_state = "control_stun"; name = "MiniSat West Wing turret control"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) +"bmH" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/turretid{control_area = "\improper MiniSat West Wing"; enabled = 0; icon_state = "control_stun"; name = "MiniSat West Wing turret control"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bmI" = (/obj/structure/table,/obj/item/weapon/module/power_control,/obj/item/weapon/airlock_electronics,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/storage/tech) "bmJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/stool/bed/chair/office/dark,/obj/effect/landmark/start{name = "Cargo Technician"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "arrival"},/area/quartermaster/office{name = "\improper Cargo Office"}) "bmK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "arrival"},/area/quartermaster/office{name = "\improper Cargo Office"}) @@ -3390,7 +3390,7 @@ "bnj" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/item/clothing/gloves/color/fyellow,/obj/item/clothing/suit/hazardvest,/obj/item/device/multitool,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/storage/tools) "bnk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/bridge) "bnl" = (/obj/machinery/door/airlock/command{name = "Command Desk"; req_access = null; req_access_txt = "19"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/bridge) -"bnm" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/machinery/door/window/westright{dir = 4},/obj/item/weapon/soap/deluxe,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) +"bnm" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/machinery/door/window/westright{dir = 4},/obj/item/weapon/soap/deluxe,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bnn" = (/obj/structure/mirror{pixel_y = 28},/obj/structure/sink{pixel_y = 17},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/landmark{name = "revenantspawn"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bno" = (/obj/structure/toilet{pixel_y = 13},/obj/machinery/light{dir = 2; icon_state = "tube1"},/obj/effect/landmark/start{name = "Captain"},/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bnp" = (/obj/machinery/door/airlock/silver{name = "Bathroom"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) @@ -3419,7 +3419,7 @@ "bnM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "cautioncorner"},/area/hallway/primary/starboard) "bnN" = (/obj/structure/stool/bed/chair/comfy/black{dir = 1},/turf/simulated/floor/carpet,/area/bridge) "bnO" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/engine/break_room) -"bnP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/engine/break_room) +"bnP" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/engine/break_room) "bnQ" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/engine/break_room) "bnR" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/engine/break_room) "bnS" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/plasteel,/area/engine/break_room) @@ -3442,7 +3442,7 @@ "boj" = (/turf/simulated/wall/r_wall,/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bok" = (/obj/machinery/power/port_gen/pacman,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 31},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bol" = (/obj/machinery/computer/security/telescreen{dir = 2; name = "MiniSat Camera Monitor"; network = list("MiniSat","tcomm"); pixel_x = 0; pixel_y = 29},/obj/machinery/computer/station_alert,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) -"bom" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1; name = "Auxiliary MiniSat Distribution Port"},/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 31},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) +"bom" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1; name = "Auxiliary MiniSat Distribution Port"},/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 31},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bon" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -26; pixel_y = 0},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/bridge) "boo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "bop" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/camera{c_tag = "Bridge - Port Access"; dir = 8; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 1; icon_state = "darkbluecorners"; tag = "icon-darkbluecorners"; temperature = 273.15},/area/bridge) @@ -3456,7 +3456,7 @@ "box" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 10; icon_state = "neutral"},/area/hallway/primary/port) "boy" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/primary/port) "boz" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=5-Customs"; location = "4-Customs"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/primary/port) -"boA" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/primary/port) +"boA" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/primary/port) "boB" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 6},/area/hallway/primary/port) "boC" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 10},/area/hallway/primary/port) "boD" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/port) @@ -3473,13 +3473,13 @@ "boO" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/door/poddoor/preopen{id = "ceprivacy"; name = "privacy shutter"},/turf/simulated/floor/plating,/area/engine/chiefs_office) "boP" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/junction{dir = 2; icon_state = "pipe-j1"},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "boQ" = (/obj/structure/sign/pods,/turf/simulated/wall,/area/security/checkpoint2{name = "Customs"}) -"boR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/light/small,/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/obj/structure/stool/bed/chair/janicart,/obj/item/key/janitor,/turf/simulated/floor/plating,/area/janitor) +"boR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/light/small,/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/obj/structure/stool/bed/chair/janicart,/obj/item/key/janitor,/turf/simulated/floor/plating,/area/janitor) "boS" = (/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/table/wood,/turf/simulated/floor/wood,/area/library) "boT" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "boU" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "boV" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/maintcentral{name = "Central Maintenance"}) "boW" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "arrival"},/area/quartermaster/office{name = "\improper Cargo Office"}) -"boX" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/maintcentral{name = "Central Maintenance"}) +"boX" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/maintcentral{name = "Central Maintenance"}) "boY" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plasteel{dir = 10; icon_state = "brown"},/area/hallway/primary/port) "boZ" = (/obj/structure/table/wood,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/machinery/light_switch{pixel_x = 28; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "bpa" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id = "council blast"; layer = 2.9; name = "Council Blast Doors"; opacity = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/bridge) @@ -3526,7 +3526,7 @@ "bpP" = (/obj/structure/transit_tube{tag = "icon-D-NW"; icon_state = "D-NW"},/turf/space,/area/space) "bpQ" = (/obj/structure/transit_tube{tag = "icon-D-NE"; icon_state = "D-NE"},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/turf/space,/area/space) "bpR" = (/obj/structure/transit_tube{tag = "icon-S-NW"; icon_state = "S-NW"},/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"bpS" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/alarm{pixel_y = 28},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) +"bpS" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/alarm{pixel_y = 28},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bpT" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bpU" = (/obj/machinery/door/window{dir = 1; name = "MiniSat Walkway Access"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bpV" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 30},/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 8; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 30; pixel_y = 0},/obj/machinery/camera{c_tag = "MiniSat Exterior Access Fore"; dir = 2; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/construction/hallway{name = "\improper MiniSat Exterior"}) @@ -3536,11 +3536,11 @@ "bpZ" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 31},/obj/item/weapon/folder,/obj/item/weapon/folder,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "bqa" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table,/obj/machinery/alarm{pixel_y = 26},/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "bqb" = (/obj/machinery/light/small{dir = 4},/obj/machinery/power/apc{aidisabled = 0; cell_type = 5000; dir = 4; name = "MiniSat West Wing APC"; pixel_x = 29; pixel_y = 0},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 2; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = 0; pixel_y = 20},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) -"bqc" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 4; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2},/obj/machinery/alarm{pixel_y = 26},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) +"bqc" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 4; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2},/obj/machinery/alarm{pixel_y = 26},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "bqd" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) -"bqe" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/camera/autoname{dir = 2; network = list("MiniSat")},/obj/machinery/power/apc{aidisabled = 0; dir = 4; name = "MiniSat Central Foyer APC"; pixel_x = 28; pixel_y = 0},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 8; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 29},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) +"bqe" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/camera/autoname{dir = 2; network = list("MiniSat")},/obj/machinery/power/apc{aidisabled = 0; dir = 4; name = "MiniSat Central Foyer APC"; pixel_x = 28; pixel_y = 0},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 8; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 29},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "bqf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) -"bqg" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 2; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = 0; pixel_y = 20},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) +"bqg" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 2; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = 0; pixel_y = 20},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bqh" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bqi" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bqj" = (/obj/machinery/door_control{id = "hop"; name = "Privacy Shutters Control"; pixel_x = -24; pixel_y = -6; req_access_txt = "28"},/obj/machinery/light_switch{pixel_x = -25; pixel_y = 5},/turf/simulated/floor/carpet,/area/crew_quarters/heads) @@ -3585,7 +3585,7 @@ "bqW" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bqX" = (/obj/effect/landmark/start{name = "Bartender"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bqY" = (/obj/item/weapon/book/manual/wiki/security_space_law{pixel_x = -3; pixel_y = 5},/obj/structure/table/wood,/turf/simulated/floor/wood,/area/security/vacantoffice) -"bqZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/heads) +"bqZ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/heads) "bra" = (/obj/structure/table/wood,/turf/simulated/floor/wood,/area/library) "brb" = (/obj/item/device/camera_film{pixel_y = 9},/obj/item/device/camera_film{pixel_x = -3; pixel_y = 5},/obj/structure/table/wood,/turf/simulated/floor/wood,/area/library) "brc" = (/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/table/wood,/turf/simulated/floor/wood,/area/library) @@ -3600,9 +3600,9 @@ "brl" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) "brm" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "brn" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/storage/art) -"bro" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/storage/art) +"bro" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/storage/art) "brp" = (/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/photocopier,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel,/area/storage/art) -"brq" = (/obj/machinery/light/small,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"brq" = (/obj/machinery/light/small,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/wood,/area/crew_quarters/bar) "brr" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "brs" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 1; icon_state = "darkbluecorners"; tag = "icon-darkbluecorners"; temperature = 273.15},/area/bridge) "brt" = (/obj/machinery/door/airlock/maintenance{name = "Bar Maintenance"; req_access_txt = "25"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/bar) @@ -3629,7 +3629,7 @@ "brO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/engine/break_room) "brP" = (/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id = "transittube"; name = "Transit Tube Blast Door"; opacity = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/break_room) "brQ" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/hatch{name = "MiniSat Transit Tube"; req_one_access_txt = "32;19"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/break_room) -"brR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/engine/break_room) +"brR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/engine/break_room) "brS" = (/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "Head of Personnel APC"; pixel_y = 24},/obj/machinery/light{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/heads) "brT" = (/obj/structure/transit_tube{tag = "icon-D-NW"; icon_state = "D-NW"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area/space) "brU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area/space) @@ -3658,17 +3658,17 @@ "bsr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/hatch{name = "MiniSat East Wing"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bss" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bst" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) -"bsu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) +"bsu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bsv" = (/obj/structure/table,/obj/machinery/camera/autoname{dir = 8; network = list("MiniSat")},/obj/item/weapon/folder,/obj/item/weapon/folder,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{aidisabled = 0; cell_type = 5000; dir = 4; name = "MiniSat East Wing APC"; pixel_x = 28; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bsw" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"bsx" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/camera{c_tag = "MiniSat Exterior Starboard"; dir = 4; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) +"bsx" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/camera{c_tag = "MiniSat Exterior Starboard"; dir = 4; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bsy" = (/obj/structure/table/wood,/obj/structure/noticeboard{desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; name = "requests board"; pixel_x = 32; pixel_y = 0},/obj/machinery/computer/libraryconsole/bookmanagement,/turf/simulated/floor/wood,/area/library) "bsz" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/teleporter{name = "\improper Teleporter Room"}) "bsA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bsB" = (/obj/machinery/hologram/holopad,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals"}) "bsC" = (/obj/machinery/power/apc{dir = 4; name = "Arrivals APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry{name = "Arrivals"}) "bsD" = (/obj/structure/stool/bed/chair/comfy/beige{dir = 4},/obj/machinery/camera{c_tag = "Arrivals - Lounge"; dir = 4; network = list("SS13")},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/hallway/primary/port) -"bsE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/heads) +"bsE" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/heads) "bsF" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/carpet,/area/bridge) "bsG" = (/obj/structure/stool/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/hallway/primary/port) "bsH" = (/obj/machinery/vending/cola,/obj/machinery/newscaster{pixel_x = -28; pixel_y = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/port) @@ -3681,19 +3681,19 @@ "bsO" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bsP" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bsQ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/port) -"bsR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port) +"bsR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bsS" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j1s"; sortType = 3},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bsT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/port) -"bsU" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/primary/port) +"bsU" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bsV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bsW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Port Primary Hallway"},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "bsX" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"bsY" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bsY" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bsZ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "bta" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/gateway) "btb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "btc" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/gateway) -"btd" = (/obj/machinery/door_control{id = "bridge blast"; name = "Bridge Access Blast Door Control"; pixel_x = -1; pixel_y = -24; req_access_txt = "19"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/machinery/door_control{id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -1; pixel_y = -34; req_access_txt = "19"},/obj/machinery/camera{c_tag = "Bridge - Command Chair"; dir = 1; network = list("SS13")},/turf/simulated/floor/carpet,/area/bridge) +"btd" = (/obj/machinery/door_control{id = "bridge blast"; name = "Bridge Access Blast Door Control"; pixel_x = -1; pixel_y = -24; req_access_txt = "19"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/machinery/door_control{id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -1; pixel_y = -34; req_access_txt = "19"},/obj/machinery/camera{c_tag = "Bridge - Command Chair"; dir = 1; network = list("SS13")},/turf/simulated/floor/carpet,/area/bridge) "bte" = (/obj/item/weapon/storage/box/lights/mixed,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/starboard) "btf" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "btg" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/gateway) @@ -3715,14 +3715,14 @@ "btw" = (/obj/structure/table/wood,/obj/item/weapon/stamp/captain,/obj/machinery/computer/security/wooden_tv,/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "btx" = (/obj/effect/landmark/start{name = "Captain"},/obj/structure/stool/bed/chair/comfy/brown,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bty" = (/obj/machinery/computer/card,/obj/machinery/light/small{dir = 4},/obj/machinery/requests_console{announcementConsole = 1; department = "Captain's Desk"; departmentType = 5; name = "Captain RC"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) -"btz" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"btz" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/central) "btA" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) "btB" = (/obj/structure/table,/obj/item/weapon/storage/crayons,/obj/item/weapon/storage/crayons,/obj/machinery/power/apc{cell_type = 2500; dir = 8; name = "Art Storage APC"; pixel_x = -25; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plasteel,/area/storage/art) -"btC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/storage/art) +"btC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/storage/art) "btD" = (/obj/structure/table,/obj/item/weapon/airlock_painter,/turf/simulated/floor/plasteel,/area/storage/art) "btE" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/wood,/area/crew_quarters/bar) "btF" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"btG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"btG" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "btH" = (/obj/structure/sign/directions/security{desc = "A direction sign, pointing out which way the security department is."; dir = 1; icon_state = "direction_sec"; pixel_x = 0; pixel_y = 8; tag = "icon-direction_sec (NORTH)"},/obj/structure/sign/directions/engineering{desc = "A direction sign, pointing out which way the engineering department is."; dir = 4; icon_state = "direction_eng"; pixel_y = 0; tag = "icon-direction_eng (EAST)"},/obj/structure/sign/directions/engineering{desc = "A direction sign, pointing out which way the bridge is."; dir = 2; icon_state = "direction_bridge"; name = "bridge"; pixel_y = -8; tag = "icon-direction_bridge (EAST)"},/turf/simulated/wall/r_wall,/area/hallway/primary/port) "btI" = (/obj/machinery/door/airlock/maintenance{name = "Engineering Foyer Maintenance"; req_access_txt = "0"; req_one_access_txt = "32;19"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/engine/break_room) "btJ" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/gateway) @@ -3748,7 +3748,7 @@ "bud" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/power/apc{dir = 2; name = "Engineering Foyer APC"; pixel_x = -1; pixel_y = -26},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/light,/turf/simulated/floor/plasteel,/area/engine/break_room) "bue" = (/obj/structure/stool/bed/chair/comfy/beige{dir = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/hallway/primary/port) "buf" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/break_room) -"bug" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/engine/break_room) +"bug" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/engine/break_room) "buh" = (/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id = "transittube"; name = "Transit Tube Blast Door"; opacity = 0},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/break_room) "bui" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/hatch{name = "MiniSat Transit Tube"; req_one_access_txt = "32;19"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/break_room) "buj" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/engine/break_room) @@ -3771,7 +3771,7 @@ "buA" = (/obj/machinery/door/airlock/hatch{icon_state = "door_closed"; name = "MiniSat Central Foyer"; req_one_access_txt = "32;19"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "buB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "buC" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) -"buD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/door_control{id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 0; pixel_y = -24; req_access_txt = "19"},/obj/machinery/door_control{id = "gateshutter"; name = "Gateway Shutter Control"; pixel_x = 0; pixel_y = -34; req_access_txt = "19"},/turf/simulated/floor/carpet,/area/bridge) +"buD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/door_control{id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 0; pixel_y = -24; req_access_txt = "19"},/obj/machinery/door_control{id = "gateshutter"; name = "Gateway Shutter Control"; pixel_x = 0; pixel_y = -34; req_access_txt = "19"},/turf/simulated/floor/carpet,/area/bridge) "buE" = (/obj/machinery/door/airlock/hatch{name = "MiniSat East Wing"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "buF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "buG" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) @@ -3852,14 +3852,14 @@ "bwd" = (/obj/structure/transit_tube{tag = "icon-N-SW"; icon_state = "N-SW"},/obj/structure/lattice,/turf/space,/area/space) "bwe" = (/obj/structure/transit_tube{tag = "icon-D-SE"; icon_state = "D-SE"},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/turf/space,/area/space) "bwf" = (/obj/structure/transit_tube{tag = "icon-N-SW"; icon_state = "N-SW"},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"bwg" = (/obj/structure/window/reinforced,/obj/machinery/power/apc{aidisabled = 0; dir = 2; name = "MiniSat Exterior APC"; pixel_y = -24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/obj/machinery/light,/obj/structure/cable/yellow,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) +"bwg" = (/obj/structure/window/reinforced,/obj/machinery/power/apc{aidisabled = 0; dir = 2; name = "MiniSat Exterior APC"; pixel_y = -24},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/obj/machinery/light,/obj/structure/cable/yellow,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bwh" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bwi" = (/obj/machinery/door/window{dir = 2; name = "MiniSat Walkway Access"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bwj" = (/obj/machinery/computer/slot_machine{pixel_y = 2},/turf/simulated/floor/carpet,/area/crew_quarters/bar) "bwk" = (/obj/machinery/computer/slot_machine{pixel_y = 2},/obj/structure/sign/barsign{pixel_y = 32},/turf/simulated/floor/carpet,/area/crew_quarters/bar) -"bwl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) +"bwl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "bwm" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) -"bwn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) +"bwn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "bwo" = (/obj/machinery/porta_turret{ai = 1; dir = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "bwp" = (/obj/machinery/light/small{dir = 4},/obj/machinery/camera/autoname{dir = 1; network = list("MiniSat")},/obj/structure/rack,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "bwq" = (/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/porta_turret{ai = 1; dir = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) @@ -3868,7 +3868,7 @@ "bwt" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/porta_turret{ai = 1; dir = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bwu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bwv" = (/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) -"bww" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) +"bww" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bwx" = (/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bwy" = (/obj/machinery/newscaster/security_unit{pixel_x = 32; pixel_y = 0},/obj/item/weapon/storage/box/PDAs{pixel_x = 4; pixel_y = 4},/obj/structure/table/wood,/obj/item/weapon/storage/box/silver_ids,/obj/item/weapon/storage/box/ids,/turf/simulated/floor/wood,/area/crew_quarters/heads) "bwz" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) @@ -3924,13 +3924,13 @@ "bxx" = (/obj/structure/flora/kirbyplants{icon_state = "plant-08"; layer = 4.1; tag = "icon-plant-08"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/hallway/primary/port) "bxy" = (/obj/structure/table,/obj/machinery/chem_dispenser/drinks/beer,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bxz" = (/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"bxA" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/starboard) +"bxA" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/starboard) "bxB" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/starboard) "bxC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/starboard) "bxD" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/starboard) "bxE" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) "bxF" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/hallway/primary/starboard) -"bxG" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) +"bxG" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bxH" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard) "bxI" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) "bxJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -3943,7 +3943,7 @@ "bxQ" = (/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id = "atmos"; name = "Atmos Blast Door"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/break_room) "bxR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/engine/break_room) "bxS" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/gateway) -"bxT" = (/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/machinery/light_switch{pixel_x = -8; pixel_y = -24},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -26},/obj/structure/rack,/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/break_room) +"bxT" = (/obj/machinery/light/small,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/machinery/light_switch{pixel_x = -8; pixel_y = -24},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -26},/obj/structure/rack,/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/break_room) "bxU" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/gateway) "bxV" = (/obj/structure/transit_tube{tag = "icon-E-NW"; icon_state = "E-NW"},/obj/structure/window/reinforced{dir = 8},/obj/structure/lattice,/turf/space,/area/space) "bxW" = (/obj/structure/transit_tube{tag = "icon-W-NE"; icon_state = "W-NE"},/obj/structure/lattice,/turf/space,/area/space) @@ -4018,7 +4018,7 @@ "bzn" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "bzo" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/portsolar) "bzp" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) -"bzq" = (/obj/machinery/camera{c_tag = "Council Chamber"; dir = 2; network = list("SS13")},/obj/machinery/light{dir = 1},/obj/machinery/ai_status_display{pixel_y = 32},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) +"bzq" = (/obj/machinery/camera{c_tag = "Council Chamber"; dir = 2; network = list("SS13")},/obj/machinery/light{dir = 1},/obj/machinery/ai_status_display{pixel_y = 32},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "bzr" = (/obj/machinery/light{dir = 4},/obj/machinery/camera/autoname{dir = 8; network = list("SS13")},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/carpet,/area/library) "bzs" = (/obj/machinery/door/airlock/command{name = "Emergency Escape"; req_access = null; req_access_txt = "20"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bzt" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -4028,7 +4028,7 @@ "bzx" = (/obj/structure/stool/bed/chair/comfy/teal{tag = "icon-comfychair (EAST)"; icon_state = "comfychair"; dir = 4},/obj/structure/stool/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/carpet,/area/bridge) "bzy" = (/obj/machinery/door_control{id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = 5; pixel_y = -28; req_access_txt = "19"},/turf/simulated/floor/carpet,/area/bridge) "bzz" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bzA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bzA" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bzB" = (/turf/simulated/wall/r_wall,/area/atmos) "bzC" = (/turf/simulated/wall,/area/atmos) "bzD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/wall,/area/atmos) @@ -4051,8 +4051,8 @@ "bzU" = (/mob/living/carbon/monkey{name = "Pun Pun"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bzV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark/start{name = "Bartender"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bzW" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Bar Access"; req_access_txt = "25"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"bzX" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1},/turf/simulated/floor/plating/airless,/area/space) -"bzY" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/obj/machinery/power/apc{aidisabled = 0; cell_type = 5000; dir = 1; name = "MiniSat Teleporter APC"; pixel_x = 0; pixel_y = 29},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) +"bzX" = (/obj/machinery/atmospherics/components/unary/outlet_injector{dir = 1},/turf/simulated/floor/plating/airless,/area/space) +"bzY" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/obj/machinery/power/apc{aidisabled = 0; cell_type = 5000; dir = 1; name = "MiniSat Teleporter APC"; pixel_x = 0; pixel_y = 29},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bzZ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bAa" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/wood/poker,/obj/item/clothing/head/fedora,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bAb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) @@ -4067,7 +4067,7 @@ "bAk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bAl" = (/obj/machinery/light,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bAm" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -25},/obj/machinery/camera{c_tag = "Arrivals - Middle Arm - Far"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) -"bAn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) +"bAn" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bAo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bAp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bAq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) @@ -4080,7 +4080,7 @@ "bAx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 6},/area/hallway/secondary/entry{name = "Arrivals"}) "bAy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{dir = 10; icon_state = "neutral"},/area/hallway/primary/port) "bAz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 2; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/primary/port) -"bAA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/primary/port) +"bAA" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/primary/port) "bAB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/primary/port) "bAC" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 6},/area/hallway/primary/port) "bAD" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/primary/port) @@ -4089,7 +4089,7 @@ "bAG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 6},/area/hallway/primary/port) "bAH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Auxiliary Bathrooms"; req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) "bAI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) -"bAJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) +"bAJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) "bAK" = (/obj/machinery/vending/cigarette,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) "bAL" = (/obj/item/weapon/cigbutt,/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Port Maintenance APC"; pixel_y = -24},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bAM" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -4132,7 +4132,7 @@ "bBx" = (/obj/machinery/space_heater,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/atmos) "bBy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/atmos) "bBz" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 8},/obj/machinery/meter{frequency = 1443; id = "wloop_atm_meter"; name = "Waste Loop"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) -"bBA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/carpet{tag = "icon-carpet5-1"; icon_state = "carpet5-1"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) +"bBA" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/carpet{tag = "icon-carpet5-1"; icon_state = "carpet5-1"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bBB" = (/obj/machinery/light,/obj/machinery/computer/security/telescreen{dir = 1; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); pixel_x = 0; pixel_y = -29},/mob/living/simple_animal/pet/fox/Renault,/turf/simulated/floor/carpet{tag = "icon-carpetside"; icon_state = "carpetside"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bBC" = (/turf/simulated/floor/carpet{tag = "icon-carpetside"; icon_state = "carpetside"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bBD" = (/obj/machinery/power/apc{dir = 1; name = "Theatre APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/table/wood,/obj/item/clothing/glasses/monocle,/turf/simulated/floor/wood,/area/crew_quarters/theatre) @@ -4142,10 +4142,10 @@ "bBH" = (/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard) "bBI" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "bBJ" = (/obj/machinery/atmospherics/pipe/manifold/supply/visible{dir = 2; tag = "icon-manifold-b"},/obj/machinery/meter{frequency = 1443; id = "dloop_atm_meter"; name = "Distribution Loop"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) -"bBK" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Distro to Waste"; on = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) -"bBL" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Air to Distro"; on = 1; target_pressure = 101},/obj/machinery/alarm{pixel_y = 25},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/camera{c_tag = "Atmospherics - Distro Loop"; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) +"bBK" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Distro to Waste"; on = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) +"bBL" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Air to Distro"; on = 1; target_pressure = 101},/obj/machinery/alarm{pixel_y = 25},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/camera{c_tag = "Atmospherics - Distro Loop"; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) "bBM" = (/obj/machinery/atmospherics/pipe/manifold/supply/visible{dir = 1; tag = "icon-manifold-b (NORTH)"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) -"bBN" = (/obj/machinery/atmospherics/unary/heat_reservoir/heater{dir = 2; on = 1; tag = ""},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) +"bBN" = (/obj/machinery/atmospherics/components/unary/heat_reservoir/heater{dir = 2; on = 1; tag = ""},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) "bBO" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 10; initialize_directions = 10},/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) "bBP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/maintcentral{name = "Central Maintenance"}) "bBQ" = (/obj/structure/table/reinforced,/obj/item/weapon/lighter,/obj/machinery/computer/security/telescreen/entertainment{pixel_x = -31; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -4164,7 +4164,7 @@ "bCd" = (/obj/item/device/radio/beacon,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bCe" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 29; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bCf" = (/obj/machinery/computer/telecomms/traffic{network = "tcommsat"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) -"bCg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/stool/bed/chair/office/dark{dir = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) +"bCg" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/stool/bed/chair/office/dark{dir = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "bCh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "bCi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "bCj" = (/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) @@ -4181,7 +4181,7 @@ "bCu" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bCv" = (/obj/machinery/photocopier{pixel_y = 3},/turf/simulated/floor/wood,/area/library) "bCw" = (/turf/simulated/floor/wood,/area/library) -"bCx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/carpet{tag = "icon-carpet9-4"; icon_state = "carpet9-4"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) +"bCx" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/carpet{tag = "icon-carpet9-4"; icon_state = "carpet9-4"},/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bCy" = (/obj/machinery/door/morgue{name = "Study #1"; req_access_txt = "0"},/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/library) "bCz" = (/obj/machinery/door/morgue{name = "Study #2"; req_access_txt = "0"},/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/library) "bCA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/light{dir = 8},/obj/machinery/camera{c_tag = "Central Primary Hallway - Port"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/central) @@ -4204,14 +4204,14 @@ "bCR" = (/obj/structure/closet/secure_closet/medical3,/obj/item/weapon/screwdriver{pixel_y = 6},/obj/structure/sign/nosmoking_2{pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "bCS" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/closet/l3closet,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "bCT" = (/obj/machinery/light_switch{pixel_x = -26; pixel_y = 0},/obj/machinery/light/small{dir = 8},/obj/structure/closet/l3closet,/turf/simulated/floor/plasteel{dir = 10; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) -"bCU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/machinery/vending/coffee{pixel_x = -3},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) -"bCV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) +"bCU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/machinery/vending/coffee{pixel_x = -3},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) +"bCV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bCW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bCX" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/vending/cigarette{pixel_x = 2},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) "bCY" = (/obj/structure/stool/bed/chair/wood/wings,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/landmark/start{name = "Mime"},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bCZ" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bDa" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door_control{id = "bridge blast"; name = "Bridge Access Blast Door Control"; pixel_x = -24; pixel_y = -24; req_access_txt = "19"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/bridge) -"bDb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bDb" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) "bDc" = (/obj/item/clothing/mask/breath{pixel_x = 4; pixel_y = 0},/obj/item/weapon/tank/internals/emergency_oxygen{pixel_x = -8; pixel_y = 0},/obj/structure/table,/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) "bDd" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor/plasteel,/area/atmos) "bDe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/atmos) @@ -4226,7 +4226,7 @@ "bDn" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bDo" = (/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 6},/obj/structure/table/wood,/turf/simulated/floor/carpet,/area/security/vacantoffice) "bDp" = (/obj/structure/table/wood,/obj/machinery/light/small{dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/clothing/head/sombrero,/turf/simulated/floor/wood,/area/crew_quarters/theatre) -"bDq" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced{dir = 1},/obj/machinery/camera{c_tag = "Starboard Primary Hallway - Atmospherics"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 8},/area/hallway/primary/starboard) +"bDq" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced{dir = 1},/obj/machinery/camera{c_tag = "Starboard Primary Hallway - Atmospherics"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 8},/area/hallway/primary/starboard) "bDr" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bDs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard) "bDt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/carpet,/area/library) @@ -4234,9 +4234,9 @@ "bDv" = (/obj/machinery/space_heater,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/atmos) "bDw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/atmos) "bDx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor/plasteel,/area/atmos) -"bDy" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) -"bDz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/atmos) -"bDA" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Mix to Distro"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bDy" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bDz" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bDA" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Mix to Distro"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bDB" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bDC" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible{dir = 8; initialize_directions = 11},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) "bDD" = (/obj/structure/cable,/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) @@ -4247,7 +4247,7 @@ "bDI" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bDJ" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted{dir = 5; health = 120; icon_state = "twindow"; reinf = 0},/turf/simulated/floor/plating,/area/crew_quarters/bar) "bDK" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bDL" = (/obj/machinery/computer/teleporter,/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) +"bDL" = (/obj/machinery/computer/teleporter,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bDM" = (/obj/machinery/teleport/station,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bDN" = (/obj/machinery/teleport/hub,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bDO" = (/obj/machinery/computer/message_monitor,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) @@ -4255,7 +4255,7 @@ "bDQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "bDR" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "bDS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) -"bDT" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) +"bDT" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "bDU" = (/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Telecoms Control Room APC"; pixel_x = 26; pixel_y = 0},/obj/machinery/computer/telecomms/server{network = "tcommsat"},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "bDV" = (/obj/machinery/camera{c_tag = "Medbay Storage"; dir = 8; network = list("SS13","Medbay")},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "bDW" = (/obj/machinery/requests_console{announcementConsole = 0; department = "Medbay"; departmentType = 1; name = "Medbay RC"; pixel_x = 0; pixel_y = 0; pixel_z = 0},/turf/simulated/wall,/area/security/checkpoint/medical) @@ -4281,7 +4281,7 @@ "bEq" = (/obj/structure/disposalpipe/segment,/obj/structure/table/wood/poker,/obj/item/toy/cards/deck{pixel_y = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bEr" = (/obj/structure/stool/bed/chair/comfy/black,/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/wood,/area/library) "bEs" = (/obj/machinery/vending/coffee,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/library) -"bEt" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/library) +"bEt" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/library) "bEu" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-22"; icon_state = "plant-22"},/turf/simulated/floor/wood,/area/library) "bEv" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 21},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/obj/machinery/camera{c_tag = "Club - Fore"; dir = 2; network = list("SS13")},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bEw" = (/obj/machinery/door/poddoor/shutters/preopen{id = "hopqueue"; name = "HoP Queue Shutters"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "loadingarea"; tag = "loading"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) @@ -4304,7 +4304,7 @@ "bEN" = (/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/device/t_scanner,/obj/item/device/t_scanner,/obj/item/device/t_scanner,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) "bEO" = (/obj/machinery/space_heater,/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"; tag = "icon-warnwhite (NORTHEAST)"},/area/atmos) "bEP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) -"bEQ" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Waste In"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bEQ" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Waste In"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bER" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 6},/turf/simulated/floor/plasteel,/area/atmos) "bES" = (/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor/plasteel,/area/atmos) "bET" = (/obj/structure/stool/bed/chair/wood/wings{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/landmark/start{name = "Clown"},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) @@ -4312,13 +4312,13 @@ "bEV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bEW" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bEX" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) -"bEY" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 8},/area/hallway/primary/starboard) +"bEY" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 8},/area/hallway/primary/starboard) "bEZ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard) "bFa" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) "bFb" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bFc" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible,/turf/simulated/floor/plasteel,/area/atmos) "bFd" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel{dir = 5; icon_state = "green"},/area/atmos) -"bFe" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Air to Mix"; on = 0},/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) +"bFe" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Air to Mix"; on = 0},/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bFf" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) "bFg" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plating,/area/atmos) "bFh" = (/obj/machinery/light/small,/obj/item/weapon/storage/box/donkpockets,/obj/structure/table/wood,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) @@ -4326,7 +4326,7 @@ "bFj" = (/obj/machinery/light/small,/obj/item/weapon/folder,/obj/item/weapon/folder,/obj/machinery/camera{c_tag = "Telecoms - Control Room"; dir = 1; network = list("SS13","tcomm")},/obj/structure/table/wood,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "bFk" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Telecoms Admin"; departmentType = 5; name = "Telecoms RC"; pixel_x = 0; pixel_y = -30},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/weapon/paper_bin{pixel_x = -1; pixel_y = 6},/obj/structure/table/wood,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "bFl" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Bar"},/turf/simulated/floor/plasteel,/area/crew_quarters/bar) -"bFm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"bFm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bFn" = (/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bFo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bFp" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/centcom{name = "Club"; opacity = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -4346,11 +4346,11 @@ "bFD" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced,/obj/machinery/door/window{dir = 1; name = "MiniSat Walkway Access"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bFE" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) "bFF" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/medical/medbay2{name = "Medbay Storage"}) -"bFG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry{name = "Arrivals"}) +"bFG" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry{name = "Arrivals"}) "bFH" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bFI" = (/obj/item/weapon/storage/toolbox/emergency,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bFJ" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/medical/medbay{name = "Medbay Central"}) -"bFK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/security/vacantoffice) +"bFK" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/security/vacantoffice) "bFL" = (/obj/structure/table/wood,/turf/simulated/floor/wood,/area/security/vacantoffice) "bFM" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/simulated/floor/wood,/area/security/vacantoffice) "bFN" = (/obj/structure/table/wood,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/weapon/folder/red,/obj/item/weapon/pen/red,/turf/simulated/floor/wood,/area/security/vacantoffice) @@ -4373,7 +4373,7 @@ "bGe" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) -"bGh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) +"bGh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/bridge/meeting_room{name = "\improper Command Hallway"}) @@ -4386,7 +4386,7 @@ "bGr" = (/obj/structure/sign/directions/engineering{desc = "A direction sign, pointing out which way the bridge is."; dir = 4; icon_state = "direction_bridge"; name = "bridge"; tag = "icon-direction_bridge (EAST)"},/turf/simulated/wall,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 21},/obj/machinery/camera{c_tag = "Command Hallway - Starboard"; dir = 2; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) -"bGu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) +"bGu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/alarm{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGw" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Command Hallway"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) @@ -4402,10 +4402,10 @@ "bGH" = (/obj/structure/sign/directions/engineering{desc = "A direction sign, pointing out which way the bridge is."; dir = 1; icon_state = "direction_bridge"; name = "bridge"; pixel_y = -8; tag = "icon-direction_bridge (NORTH)"},/turf/simulated/wall/r_wall,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bGI" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bGJ" = (/obj/structure/table/wood,/obj/item/weapon/lipstick{pixel_y = 5},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/obj/machinery/camera{c_tag = "Theatre - Stage"; dir = 8; network = list("SS13")},/obj/machinery/light/small{dir = 4},/obj/item/device/instrument/guitar,/turf/simulated/floor/wood,/area/crew_quarters/theatre) -"bGK" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/hallway/primary/starboard) +"bGK" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/hallway/primary/starboard) "bGL" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bGM" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{tag = "icon-manifold-y (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/atmos) -"bGN" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Mix to Filter"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bGN" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Mix to Filter"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bGO" = (/obj/machinery/atmospherics/pipe/manifold/green/visible{dir = 1; tag = "icon-manifold-g (NORTH)"},/turf/simulated/floor/plasteel,/area/atmos) "bGP" = (/obj/machinery/atmospherics/pipe/simple/green/visible{tag = "icon-intact-g (SOUTHEAST)"; dir = 6},/turf/simulated/floor/plasteel,/area/atmos) "bGQ" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "waste_in"; name = "Gas Mix Tank Control"; output_tag = "waste_out"; sensors = list("waste_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/atmos) @@ -4436,7 +4436,7 @@ "bHp" = (/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/hallway/secondary/entry{name = "Arrivals"}) "bHq" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry{name = "Arrivals"}) "bHr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"bHs" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"bHs" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bHt" = (/obj/machinery/light_construct{dir = 8},/turf/simulated/floor/wood,/area/security/vacantoffice) "bHu" = (/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/wood,/area/security/vacantoffice) "bHv" = (/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/machinery/camera{c_tag = "Telescience - Test Chamber"; dir = 2; network = list("SS13","RD")},/obj/machinery/light{dir = 1},/turf/simulated/floor/engine,/area/toxins/explab) @@ -4445,7 +4445,7 @@ "bHy" = (/obj/structure/toilet{pixel_y = 8},/obj/machinery/light/small{dir = 4},/obj/machinery/door_control{id = "AuxToilet2"; name = "Lock Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plasteel,/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) "bHz" = (/obj/machinery/door/poddoor/preopen{id = "bridge blast"; name = "bridge blast door"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/glass_command{name = "Bridge Access"; req_access_txt = "19"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/bridge) "bHA" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) -"bHB" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) +"bHB" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bHC" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bHD" = (/obj/item/weapon/folder/white,/obj/structure/table/wood,/turf/simulated/floor/carpet,/area/security/vacantoffice) "bHE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Library"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "carpetsymbol"},/area/library) @@ -4456,7 +4456,7 @@ "bHJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bHK" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bHL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) -"bHM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -30},/obj/machinery/camera{c_tag = "Command Hallway - Port"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) +"bHM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -30},/obj/machinery/camera{c_tag = "Command Hallway - Port"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bHN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bHO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bHP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) @@ -4485,13 +4485,13 @@ "bIm" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=7.5-Starboard-Aft-Corner"; location = "7-Command-Starboard"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bIn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "bIo" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bIp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bIp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bIq" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/item/toy/cards/deck{pixel_y = 4},/obj/structure/table/wood/poker,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bIr" = (/obj/machinery/door/airlock{icon = 'icons/obj/doors/Doormaint.dmi'; name = "Theatre Stage"; req_access_txt = "0"; req_one_access_txt = "12;46"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/theatre) -"bIs" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) +"bIs" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "bIt" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bIu" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "loadingarea"; tag = "loading"},/area/atmos) -"bIv" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "blackcorner"},/area/atmos) +"bIv" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "blackcorner"},/area/atmos) "bIw" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/atmos) "bIx" = (/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor/engine,/area/toxins/explab) "bIy" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/door_control{id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = 26; pixel_y = -26; req_access_txt = "24"},/turf/simulated/floor/plasteel{dir = 6; icon_state = "caution"},/area/atmos) @@ -4503,7 +4503,7 @@ "bIE" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "bIF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 6},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/atmos) "bIG" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/starboard) -"bIH" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/hallway/primary/starboard) +"bIH" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/hallway/primary/starboard) "bII" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bIJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard) "bIK" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) @@ -4514,15 +4514,15 @@ "bIP" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 9; tag = "icon-intact-y (NORTHWEST)"},/turf/simulated/floor/plasteel,/area/atmos) "bIQ" = (/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "bIR" = (/obj/machinery/atmospherics/pipe/simple/green/visible{tag = "icon-intact-g (NORTHEAST)"; dir = 5; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) -"bIS" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Pure to Mix"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bIS" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Pure to Mix"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bIT" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 6},/area/atmos) -"bIU" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/binary/pump{dir = 4; name = "Unfiltered & Air to Mix"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bIU" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "Unfiltered & Air to Mix"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bIV" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plating,/area/atmos) "bIW" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "0"; req_one_access_txt = "12;17"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/maintcentral{name = "Central Maintenance"}) "bIX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bIY" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/bar) "bIZ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"bJa" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"bJa" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bJb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bJc" = (/obj/structure/disposalpipe/segment,/obj/structure/table/wood/poker,/obj/item/clothing/mask/cigarette/cigar,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bJd" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/space,/area/space) @@ -4552,7 +4552,7 @@ "bJB" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bJC" = (/obj/machinery/door/airlock/maintenance{name = "Library Maintenance"; req_access_txt = "0"; req_one_access_txt = "12;37"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bJD" = (/obj/item/weapon/folder/blue,/obj/structure/table/wood,/turf/simulated/floor/carpet,/area/security/vacantoffice) -"bJE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/library) +"bJE" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/library) "bJF" = (/turf/simulated/floor/wood{tag = "icon-wood-broken7"; icon_state = "wood-broken7"},/area/library) "bJG" = (/obj/machinery/bookbinder,/turf/simulated/floor/wood,/area/library) "bJH" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/hallway/primary/central) @@ -4582,7 +4582,7 @@ "bKf" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/hallway/primary/central) "bKg" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bKh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) -"bKi" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/engine,/area/toxins/explab) +"bKi" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/engine,/area/toxins/explab) "bKj" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bKk" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) "bKl" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/atmos) @@ -4606,7 +4606,7 @@ "bKD" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor/plating,/area/atmos) "bKE" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/maintcentral{name = "Central Maintenance"}) "bKF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/engine,/area/toxins/explab) -"bKG" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "waste_in"; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) +"bKG" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "waste_in"; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "bKH" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "bKI" = (/obj/item/stack/cable_coil,/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) "bKJ" = (/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = 7; pixel_y = 4},/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 3},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteyellow"},/area/medical/chemistry) @@ -4626,7 +4626,7 @@ "bKX" = (/obj/machinery/vending/cola,/turf/simulated/floor/carpet,/area/crew_quarters/bar) "bKY" = (/obj/machinery/door_control{id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/engine,/area/toxins/explab) "bKZ" = (/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/blood/gibs/limb,/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) -"bLa" = (/obj/machinery/shower{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) +"bLa" = (/obj/machinery/shower{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) "bLb" = (/obj/machinery/door/airlock{id_tag = "AuxToilet3"; name = "Unit 3"},/turf/simulated/floor/plating,/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) "bLc" = (/obj/structure/toilet{pixel_y = 8},/obj/machinery/light/small{dir = 4},/obj/machinery/door_control{id = "AuxToilet3"; name = "Lock Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plating,/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) "bLd" = (/obj/structure/bookcase{name = "bookcase (Non-Fiction)"},/turf/simulated/floor/wood,/area/library) @@ -4635,7 +4635,7 @@ "bLg" = (/obj/structure/table,/obj/structure/sign/bluecross{pixel_y = 32},/obj/item/weapon/reagent_containers/glass/beaker/large,/turf/simulated/floor/plating,/area/maintenance/starboard) "bLh" = (/obj/structure/table,/obj/effect/decal/cleanable/cobweb,/obj/item/weapon/shard,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bLi" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/plating,/area/maintenance/starboard) -"bLj" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bLj" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bLk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) "bLl" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bLm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) @@ -4645,11 +4645,11 @@ "bLq" = (/turf/simulated/wall,/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bLr" = (/obj/structure/ore_box,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/teleporter{name = "\improper Teleporter Room"}) "bLs" = (/obj/item/stack/sheet/rglass{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/device/flashlight,/obj/structure/closet/crate,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/teleporter{name = "\improper Teleporter Room"}) -"bLt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/teleporter{name = "\improper Teleporter Room"}) +"bLt" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/teleporter{name = "\improper Teleporter Room"}) "bLu" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/crate,/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/teleporter{name = "\improper Teleporter Room"}) "bLv" = (/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/structure/table,/obj/effect/decal/cleanable/cobweb2,/obj/machinery/reagentgrinder{pixel_y = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) "bLw" = (/obj/structure/stool/bed/chair{dir = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) -"bLx" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/bridge/meeting_room{name = "\improper Command Hallway"}) +"bLx" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bLy" = (/obj/structure/stool/bed/chair{dir = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bLz" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{pixel_x = 4; pixel_y = 5},/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{pixel_x = 6; pixel_y = -1},/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{pixel_x = -4; pixel_y = 6},/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/floor/plating,/area/maintenance/starboard) "bLA" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/obj/structure/grille,/turf/simulated/wall/r_wall,/area/atmos) @@ -4657,7 +4657,7 @@ "bLC" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/gateway) "bLD" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/item/stack/sheet/rglass{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/weapon/storage/toolbox/emergency,/obj/item/device/flashlight,/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Gateway APC"; pixel_x = 28; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/gateway) "bLE" = (/obj/structure/table,/obj/item/clothing/head/cakehat,/obj/machinery/newscaster{pixel_x = -30; pixel_y = 0},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"bLF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bLF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bLG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "bLH" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bLI" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - Mix"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) @@ -4680,7 +4680,7 @@ "bLZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/atmos) "bMa" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bMb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/atmos) -"bMc" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Air to External"; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) +"bMc" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Air to External"; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) "bMd" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bMe" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible{dir = 1; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/atmos) "bMf" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible{dir = 4; initialize_directions = 11},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) @@ -4688,7 +4688,7 @@ "bMh" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) "bMi" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 1},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) "bMj" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) -"bMk" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/atmospherics/binary/pump{dir = 8; name = "N2O to Pure"; on = 0},/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/simulated/floor/plasteel{dir = 5; icon_state = "escape"},/area/atmos) +"bMk" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "N2O to Pure"; on = 0},/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/simulated/floor/plasteel{dir = 5; icon_state = "escape"},/area/atmos) "bMl" = (/obj/item/weapon/reagent_containers/glass/rag,/obj/structure/table/wood,/turf/simulated/floor/wood{tag = "icon-wood-broken4"; icon_state = "wood-broken4"},/area/maintenance/aft{name = "Aft Maintenance"}) "bMm" = (/obj/structure/closet/secure_closet/exile,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/gateway) "bMn" = (/obj/machinery/light,/obj/machinery/camera{c_tag = "Kitchen Hatch"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -4705,7 +4705,7 @@ "bMy" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plating{dir = 8; icon_state = "warnplate"; tag = ""},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bMz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bMA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"bMB" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29},/turf/simulated/floor/wood,/area/security/vacantoffice) +"bMB" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29},/turf/simulated/floor/wood,/area/security/vacantoffice) "bMC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/wood,/area/security/vacantoffice) "bMD" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/maintcentral{name = "Central Maintenance"}) "bME" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/carpet,/area/library) @@ -4718,7 +4718,7 @@ "bML" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/library) "bMM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) "bMN" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) -"bMO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) +"bMO" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bMP" = (/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/multitool,/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bMQ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bMR" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) @@ -4737,7 +4737,7 @@ "bNe" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/toxins/explab) "bNf" = (/obj/structure/closet/l3closet/scientist,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/gateway) "bNg" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/gateway) -"bNh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/gateway) +"bNh" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/gateway) "bNi" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "telelab"; name = "test chamber blast door"},/turf/simulated/floor/plating,/area/toxins/explab) "bNj" = (/obj/machinery/door/poddoor/preopen{id = "telelab"; name = "test chamber blast door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/engine,/area/toxins/explab) "bNk" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/plasteel{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/gateway) @@ -4749,7 +4749,7 @@ "bNq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "bNr" = (/turf/simulated/wall,/area/crew_quarters/kitchen) "bNs" = (/obj/machinery/door/poddoor/shutters/preopen{id = "kitchen"; name = "Serving Hatch"},/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) -"bNt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/n20,/area/atmos) +"bNt" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/n20,/area/atmos) "bNu" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/shutters/preopen{id = "kitchen"; name = "Serving Hatch"},/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bNv" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bNw" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock{icon = 'icons/obj/doors/Doorsilver.dmi'; name = "Kitchen"; req_access_txt = "28"},/turf/simulated/floor/plasteel{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) @@ -4767,12 +4767,12 @@ "bNI" = (/obj/structure/showcase{desc = "A stand with an empty old NanoTrasen Corporation combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees."; icon = 'icons/mecha/mecha.dmi'; icon_state = "marauder"; name = "combat mech exhibit"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bNJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/wall/r_wall,/area/atmos) "bNK" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{tag = "icon-manifold-r (EAST)"; dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/atmos) -"bNL" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "External to Filter"; on = 1},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) +"bNL" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "External to Filter"; on = 1},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) "bNM" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 2},/turf/simulated/floor/plasteel,/area/atmos) -"bNN" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Air to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bNN" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Air to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bNO" = (/obj/item/device/radio/beacon,/turf/simulated/floor/plasteel,/area/atmos) -"bNP" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Pure to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) -"bNQ" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Mix to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bNP" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Pure to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bNQ" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Mix to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bNR" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/plasteel,/area/atmos) "bNS" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) "bNT" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/shutters/preopen{id = "kitchen"; name = "Serving Hatch"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/reagent_containers/food/snacks/pie/cream,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) @@ -4787,7 +4787,7 @@ "bOc" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/telecomms/bus/preset_four,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) "bOd" = (/obj/machinery/blackbox_recorder,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) "bOe" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine/n20,/area/atmos) -"bOf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) +"bOf" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bOg" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bOh" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/camera{c_tag = "Arrivals - Aft Arm"; dir = 8; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry{name = "Arrivals"}) "bOi" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -4839,12 +4839,12 @@ "bPc" = (/obj/structure/dresser,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "bPd" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/door/poddoor/preopen{id = "cmoprivacy"; name = "privacy shutter"},/turf/simulated/floor/plating,/area/medical/cmo) "bPe" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/effect/spawner/lootdrop{loot = list("/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/item/weapon/cigbutt","/obj/item/trash/cheesie","/obj/item/trash/candy","/obj/item/trash/chips","/obj/item/trash/deadmouse","/obj/item/trash/pistachios","/obj/item/trash/plate","/obj/item/trash/popcorn","/obj/item/trash/raisins","/obj/item/trash/sosjerky","/obj/item/trash/syndi_cakes"); name = "maint grille or trash spawner"},/turf/simulated/floor/plating,/area/maintenance/starboard) -"bPf" = (/obj/structure/rack,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/receiver,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/broadcaster,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Telecoms - Storage"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) +"bPf" = (/obj/structure/rack,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/receiver,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/broadcaster,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Telecoms - Storage"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) "bPg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/hologram/holopad,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) "bPh" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/machinery/light_switch{pixel_x = 0; pixel_y = 26},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) "bPi" = (/obj/structure/closet/wardrobe/grey,/turf/simulated/floor/plating,/area/maintenance/starboard) "bPj" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/maintenance/starboard) -"bPk" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/atmos) +"bPk" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/atmos) "bPl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bPm" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible{dir = 1; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 8},/area/atmos) "bPn" = (/obj/structure/reagent_dispensers/fueltank,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -26},/obj/machinery/camera{c_tag = "Atmospherics - Central"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel,/area/atmos) @@ -4858,14 +4858,14 @@ "bPv" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) "bPw" = (/obj/structure/flora/kirbyplants{icon_state = "plant-06"; level = 4.1; tag = "icon-plant-06"},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bPx" = (/obj/structure/closet/secure_closet/medical1{pixel_x = 0},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/gateway) -"bPy" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light/small{dir = 4},/obj/machinery/camera{c_tag = "MiniSat Exterior Aft-Port"; dir = 8; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) +"bPy" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light/small{dir = 4},/obj/machinery/camera{c_tag = "MiniSat Exterior Aft-Port"; dir = 8; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bPz" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bPA" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) "bPB" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/telecomms/server/presets/engineering,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) "bPC" = (/obj/machinery/telecomms/hub/preset,/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) "bPD" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/telecomms/server/presets/science,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) "bPE" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) -"bPF" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "MiniSat Exterior Aft-Starboard"; dir = 4; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) +"bPF" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "MiniSat Exterior Aft-Starboard"; dir = 4; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bPG" = (/obj/machinery/camera{c_tag = "Arrivals - Aft Arm - Far"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bPH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) "bPI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry{name = "Arrivals"}) @@ -4873,12 +4873,12 @@ "bPK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "bluecorner"},/area/hallway/secondary/entry{name = "Arrivals"}) "bPL" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "arrival"},/area/hallway/secondary/entry{name = "Arrivals"}) "bPM" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/sign/map/left{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; pixel_y = -32},/turf/simulated/floor/plasteel{dir = 2; icon_state = "arrival"},/area/hallway/secondary/entry{name = "Arrivals"}) -"bPN" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "n2o_in"; pixel_y = 1},/turf/simulated/floor/engine/n20,/area/atmos) +"bPN" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "n2o_in"; pixel_y = 1},/turf/simulated/floor/engine/n20,/area/atmos) "bPO" = (/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor/wood,/area/security/vacantoffice) "bPP" = (/obj/structure/table/wood,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/security/vacantoffice) "bPQ" = (/obj/structure/mirror{pixel_x = -28},/obj/item/weapon/lipstick/black,/obj/item/weapon/lipstick/jade{pixel_x = 2; pixel_y = 2},/obj/item/weapon/lipstick/purple{pixel_x = -2; pixel_y = -2},/obj/structure/table,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bPR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"bPS" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 4; on = 1},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "escape"; dir = 6},/area/atmos) +"bPS" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 1; filter_type = 4; on = 1},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "escape"; dir = 6},/area/atmos) "bPT" = (/obj/machinery/light/small,/obj/machinery/power/apc{dir = 8; name = "Library APC"; pixel_x = -25},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/wood,/area/library) "bPU" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood,/area/library) "bPV" = (/obj/machinery/light/small{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/window/reinforced,/obj/structure/showcase{desc = "Signs describe how cloning pods like these ensure that every Nanotrasen employee can carry out their contracts in full, even in the unlikely event of their catastrophic death. Hopefully they aren't all made of cardboard, like this one."; icon = 'icons/obj/cloning.dmi'; icon_state = "pod_0"; name = "cloning pod exhibit"},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) @@ -4909,7 +4909,7 @@ "bQu" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - N2O"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/turf/simulated/floor/engine/n20,/area/atmos) "bQv" = (/obj/structure/table/wood,/obj/machinery/light/small{dir = 4},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/weapon/storage/lockbox/clusterbang{desc = "An inpenetrable lockbox, designed for transporting the most dangerous of items. You have a bad feeling about opening this."; name = "Lockbox Exhibit"; pixel_y = 3},/obj/item/device/paicard{desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; name = "Nanotrasen Personal AI Device Exhibit"},/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bQw" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/surgical_drapes,/obj/item/weapon/retractor{desc = "A handy surgical tool which allows the user to peel back their victim's flesh. The label warns users to 'Aim away from face.'"; name = "retractor"; pixel_y = 3},/obj/structure/table/wood,/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) -"bQx" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/sign/map/right{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-right-MS"; pixel_y = -32},/obj/structure/flora/kirbyplants{icon_state = "plant-03"; layer = 4.1; tag = "icon-plant-03"},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 6},/area/hallway/secondary/entry{name = "Arrivals"}) +"bQx" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/sign/map/right{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-right-MS"; pixel_y = -32},/obj/structure/flora/kirbyplants{icon_state = "plant-03"; layer = 4.1; tag = "icon-plant-03"},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 6},/area/hallway/secondary/entry{name = "Arrivals"}) "bQy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/gateway) "bQz" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/wood,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/item/weapon/folder/blue,/obj/item/clothing/head/collectable/HoS{desc = "It's your turn to demand excessive paperwork, signatures, stamps, and hire more clowns! Papers, please!"; icon_state = "hopcap"; name = "novelty HoP hat"},/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bQA" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor/plasteel{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/gateway) @@ -4921,7 +4921,7 @@ "bQG" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 0; pixel_y = 30},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/explab) "bQH" = (/obj/structure/rack,/obj/item/weapon/book/manual/chef_recipes{pixel_x = 2; pixel_y = 6},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/stack/packageWrap,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bQI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) -"bQJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) +"bQJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bQK" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bQL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bQM" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) @@ -4935,13 +4935,13 @@ "bQU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/landmark/start{name = "Mime"},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "bQV" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "bQW" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/machinery/light/small{dir = 8},/obj/machinery/power/apc{dir = 8; name = "Telecoms Storage APC"; pixel_x = -28; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) -"bQX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) +"bQX" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) "bQY" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/treatment,/obj/item/weapon/stock_parts/subspace/treatment,/obj/item/weapon/stock_parts/subspace/treatment,/obj/machinery/light/small{dir = 4},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) -"bQZ" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/starboard) +"bQZ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/starboard) "bRa" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/atmos) "bRb" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 9},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 8},/area/atmos) -"bRc" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Air to Port"; on = 0},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"bRd" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Mix to Port"; on = 0},/obj/item/weapon/crowbar,/turf/simulated/floor/plasteel,/area/atmos) +"bRc" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Air to Port"; on = 0},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) +"bRd" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Mix to Port"; on = 0},/obj/item/weapon/crowbar,/turf/simulated/floor/plasteel,/area/atmos) "bRe" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/door/window/northleft{dir = 8; icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) "bRf" = (/obj/machinery/alarm/server{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "Telecoms - Server Room - Aft-Port"; dir = 4; network = list("SS13","tcomm")},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) "bRg" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) @@ -4956,7 +4956,7 @@ "bRp" = (/obj/machinery/door/airlock{icon = 'icons/obj/doors/Doormaint.dmi'; name = "Theatre Backstage"; req_access_txt = "46"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/theatre) "bRq" = (/obj/structure/table,/obj/item/clothing/mask/cigarette/pipe,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bRr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"bRs" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/atmos) +"bRs" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/atmos) "bRt" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/centcom{name = "Quiet Room"; opacity = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "carpetsymbol"},/area/library) "bRu" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/centcom{name = "Quiet Room"; opacity = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "carpetsymbol"},/area/library) "bRv" = (/obj/machinery/door/morgue{name = "Private Study"; req_access_txt = "37"},/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/library) @@ -5002,26 +5002,26 @@ "bSj" = (/mob/living/simple_animal/hostile/retaliate/goat{name = "Pete"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "bSk" = (/obj/structure/table/wood,/obj/structure/mirror{pixel_x = -28},/obj/item/weapon/lipstick/black,/obj/item/weapon/lipstick/jade{pixel_x = 2; pixel_y = 2},/obj/item/weapon/lipstick/purple{pixel_x = -2; pixel_y = -2},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "bSl" = (/obj/structure/stool/bed/chair/wood/wings{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/theatre) -"bSm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark/start{name = "Clown"},/turf/simulated/floor/wood,/area/crew_quarters/theatre) -"bSn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/theatre) -"bSo" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/atmos) +"bSm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark/start{name = "Clown"},/turf/simulated/floor/wood,/area/crew_quarters/theatre) +"bSn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/theatre) +"bSo" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/atmos) "bSp" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/sortjunction{dir = 2; icon_state = "pipe-j1s"; sortType = 18},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/starboard) "bSq" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) "bSr" = (/obj/structure/table,/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) "bSs" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/atmos_control{name = "Telecoms Storage"}) "bSt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/starboard) -"bSu" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/starboard) -"bSv" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) -"bSw" = (/obj/machinery/atmospherics/trinary/filter{req_access = "0"},/turf/simulated/floor/plating,/area/maintenance/starboard) +"bSu" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/starboard) +"bSv" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) +"bSw" = (/obj/machinery/atmospherics/components/trinary/filter{req_access = "0"},/turf/simulated/floor/plating,/area/maintenance/starboard) "bSx" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"bSy" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/atmos) -"bSz" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Plasma to Pure"; on = 0},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/turf/simulated/floor/plasteel{icon_state = "purplefull"},/area/atmos) +"bSy" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/atmos) +"bSz" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Plasma to Pure"; on = 0},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/turf/simulated/floor/plasteel{icon_state = "purplefull"},/area/atmos) "bSA" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/hallway/secondary/entry{name = "Arrivals"}) "bSB" = (/turf/space,/area/hallway/secondary/entry{name = "Arrivals"}) "bSC" = (/obj/machinery/door/airlock/maintenance{name = "Vacant Office Maintenance"; req_access_txt = "32"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/security/vacantoffice) "bSD" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/maintcentral{name = "Central Maintenance"}) "bSE" = (/obj/structure/sign/nosmoking_2,/turf/simulated/wall,/area/atmos) -"bSF" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) +"bSF" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "bSG" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "bSH" = (/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "bSI" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) @@ -5054,30 +5054,30 @@ "bTj" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/light/small{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 30; pixel_y = 0},/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/library) "bTk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) "bTl" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) -"bTm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) +"bTm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bTn" = (/obj/structure/cable/yellow,/turf/simulated/floor/plasteel{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/teleporter{name = "\improper Teleporter Room"}) "bTo" = (/obj/item/device/radio/beacon,/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/teleporter{name = "\improper Teleporter Room"}) -"bTp" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/machinery/door_control{id = "teleshutter"; name = "Teleporter Shutter Control"; pixel_x = 26; pixel_y = -26; req_access_txt = "19"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/teleporter{name = "\improper Teleporter Room"}) +"bTp" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/machinery/door_control{id = "teleshutter"; name = "Teleporter Shutter Control"; pixel_x = 26; pixel_y = -26; req_access_txt = "19"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/teleporter{name = "\improper Teleporter Room"}) "bTq" = (/obj/structure/cable/yellow,/obj/machinery/shieldwallgen,/turf/simulated/floor/plasteel{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/teleporter{name = "\improper Teleporter Room"}) "bTr" = (/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila,/obj/structure/table/wood,/turf/simulated/floor/wood,/area/maintenance/aft{name = "Aft Maintenance"}) "bTs" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) -"bTt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) +"bTt" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bTu" = (/turf/simulated/floor/wood{tag = "icon-wood-broken3"; icon_state = "wood-broken3"},/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bTv" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/machinery/power/apc{dir = 1; name = "Sleeper Room APC"; pixel_y = 24},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/item/clothing/tie/stethoscope,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/sleeper{name = "Sleepers"}) "bTw" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/showcase{desc = "The famous NanoTrasen-brand microwave, the multi-purpose cooking appliance every station needs! This one appears to be drawn onto a cardboard box."; dir = 1; icon = 'icons/obj/kitchen.dmi'; icon_state = "mw"; name = "NanoTrasen-brand microwave"; pixel_x = 0; pixel_y = 2},/obj/structure/table/wood,/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bTx" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/reagent_dispensers/beerkeg{desc = "One of the more successful achievements of the NanoTrasen Corporate Warfare Division, their nuclear fission explosives are renowned for being cheap to produce and devestatingly effective. Signs explain that though this is just a model, every NanoTrasen station is equipped with one, just in case. All Captains carefully guard the disk needed to detonate them - at least, the sign says they do. There seems to be a tap on the back."; icon = 'icons/obj/stationobjs.dmi'; icon_state = "nuclearbomb0"; name = "NanoTrasen-brand nuclear fission explosive"; pixel_x = 2; pixel_y = 6},/obj/structure/table/wood,/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bTy" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) -"bTz" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) +"bTz" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bTA" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bTB" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/toy/beach_ball{desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen"; item_state = "beachball"; name = "NanoTrasen brand beach ball"; pixel_y = 7},/obj/structure/table/wood,/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bTC" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/head/hardhat/orange{name = "protective hat"},/obj/item/clothing/head/hardhat/orange{name = "protective hat"},/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/gateway) -"bTD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/gateway) +"bTD" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/gateway) "bTE" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/gateway) "bTF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/gateway) "bTG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{icon = 'icons/obj/doors/Doorcomglass.dmi'; name = "Gateway Chamber"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/gateway) -"bTH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/gateway) +"bTH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/gateway) "bTI" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/gateway) -"bTJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/gateway) +"bTJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/gateway) "bTK" = (/obj/machinery/door/airlock/maintenance{name = "Gateway Maintenance"; req_access_txt = "17"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/gateway) "bTL" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) "bTM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/hallway/primary/central) @@ -5085,13 +5085,13 @@ "bTO" = (/obj/structure/rack,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bTP" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bTQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) -"bTR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) +"bTR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bTS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bTT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bTU" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bTV" = (/obj/machinery/requests_console{department = "Kitchen"; departmentType = 2; pixel_x = 30; pixel_y = 0},/obj/machinery/processor,/turf/simulated/floor/plasteel{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bTW" = (/obj/structure/closet/crate{desc = "It's a storage unit for kitchen clothes and equipment."; name = "Kitchen Crate"},/obj/item/clothing/head/chefhat,/obj/item/clothing/under/rank/chef,/obj/item/weapon/storage/box/mousetraps{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/box/mousetraps,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) -"bTX" = (/obj/effect/landmark/start{name = "Chef"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) +"bTX" = (/obj/effect/landmark/start{name = "Chef"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "bTY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "bTZ" = (/obj/machinery/icecream_vat,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/firealarm{dir = 4; pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "bUa" = (/obj/item/weapon/cartridge/medical{pixel_x = -2; pixel_y = 6},/obj/item/weapon/cartridge/medical{pixel_x = 6; pixel_y = 3},/obj/item/weapon/cartridge/medical,/obj/item/weapon/cartridge/chemistry{pixel_y = 2},/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) @@ -5099,8 +5099,8 @@ "bUc" = (/obj/item/weapon/folder/blue,/obj/structure/table/glass,/obj/item/weapon/stamp/cmo,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "bUd" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "bUe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/wrench,/turf/simulated/floor/plating,/area/maintenance/starboard) -"bUf" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plating,/area/maintenance/starboard) -"bUg" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/atmos) +"bUf" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plating,/area/maintenance/starboard) +"bUg" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/atmos) "bUh" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "tox_in"; name = "Toxin Supply Control"; output_tag = "tox_out"; sensors = list("tox_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/turf/simulated/floor/plasteel{icon_state = "purplefull"},/area/atmos) "bUi" = (/obj/structure/lattice,/turf/space,/area/hallway/secondary/entry{name = "Arrivals"}) "bUj" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/maintcentral{name = "Central Maintenance"}) @@ -5129,16 +5129,16 @@ "bUG" = (/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bUH" = (/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bUI" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/machinery/door_control{id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 0; pixel_y = -26; req_access_txt = "19"},/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) -"bUJ" = (/obj/machinery/computer/teleporter,/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plating,/area/teleporter{name = "\improper Teleporter Room"}) +"bUJ" = (/obj/machinery/computer/teleporter,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plating,/area/teleporter{name = "\improper Teleporter Room"}) "bUK" = (/obj/machinery/teleport/station,/turf/simulated/floor/plating,/area/teleporter{name = "\improper Teleporter Room"}) "bUL" = (/obj/machinery/teleport/hub,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/teleporter{name = "\improper Teleporter Room"}) "bUM" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/obj/item/weapon/wrench,/turf/simulated/floor/plasteel,/area/atmos) "bUN" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/toxins/lab) "bUO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bUP" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/toxins/explab) -"bUQ" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/atmos) +"bUQ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/atmos) "bUR" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) -"bUS" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; on = 1},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "purplefull"},/area/atmos) +"bUS" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 1; on = 1},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "purplefull"},/area/atmos) "bUT" = (/obj/effect/landmark/start{name = "Scientist"},/obj/structure/stool/bed/chair/office/light{dir = 1; pixel_y = 3},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "bUU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bUV" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/toxins/explab) @@ -5173,10 +5173,10 @@ "bVy" = (/obj/machinery/computer/security/telescreen/entertainment,/turf/simulated/wall,/area/crew_quarters/kitchen) "bVz" = (/obj/structure/closet/wardrobe/atmospherics_yellow,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) "bVA" = (/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 4; name = "Atmos RC"; pixel_x = 30; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/shower{dir = 8; icon_state = "shower"; name = "emergency shower"; tag = "icon-shower (WEST)"},/turf/simulated/floor/plasteel,/area/atmos) -"bVB" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Port to Filter"; on = 0},/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "Atmospherics - Starboard"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel,/area/atmos) +"bVB" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Port to Filter"; on = 0},/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "Atmospherics - Starboard"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel,/area/atmos) "bVC" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/obj/structure/stool,/turf/simulated/floor/plasteel,/area/atmos) "bVD" = (/obj/structure/table,/obj/machinery/recharger,/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/gateway) -"bVE" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "tox_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) +"bVE" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "tox_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "bVF" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bVG" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{icon_plating = "warnplate"; icon_state = "warnplate"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bVH" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -5203,7 +5203,7 @@ "bWc" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/shutters/preopen{id = "kitchen"; name = "Serving Hatch"},/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "bWd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/command{icon = 'icons/obj/doors/Doorele.dmi'; name = "Corporate Showroom"; req_access_txt = "19"},/turf/simulated/floor/wood,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bWe" = (/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/shutters{id = "gateshutter"; name = "Gateway Access Shutter"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/gateway) -"bWf" = (/obj/machinery/atmospherics/unary/heat_reservoir/heater{dir = 8; tag = ""},/turf/simulated/floor/plasteel,/area/atmos) +"bWf" = (/obj/machinery/atmospherics/components/unary/heat_reservoir/heater{dir = 8; tag = ""},/turf/simulated/floor/plasteel,/area/atmos) "bWg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "neutralcorner"},/area/hallway/primary/central) "bWh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "greencorner"},/area/hallway/primary/central) "bWi" = (/turf/simulated/wall,/area/hydroponics) @@ -5211,7 +5211,7 @@ "bWk" = (/obj/structure/table/reinforced,/obj/machinery/door/window/eastleft{dir = 1; name = "Kitchen Window"; req_access_txt = "28"; req_one_access_txt = "0"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/paper,/obj/machinery/door/window/eastleft{dir = 2; name = "Hydroponics Window"; req_access_txt = "0"; req_one_access_txt = "30;35"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/hydroponics) "bWl" = (/obj/machinery/smartfridge,/turf/simulated/wall,/area/hydroponics) "bWm" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/crew_quarters/kitchen) -"bWn" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/crew_quarters/kitchen) +"bWn" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/crew_quarters/kitchen) "bWo" = (/obj/machinery/door/airlock/maintenance{name = "Kitchen Maintenance"; req_access_txt = "28"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/crew_quarters/kitchen) "bWp" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/starboard) "bWq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -5219,7 +5219,7 @@ "bWs" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/starboard) "bWt" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/starboard) "bWu" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 2},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/starboard) -"bWv" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/starboard) +"bWv" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/starboard) "bWw" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "Kitchen"},/obj/structure/plasticflaps{opacity = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/crew_quarters/kitchen) "bWx" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) "bWy" = (/obj/machinery/light{dir = 1},/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/pipedispenser/disposal,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/atmos) @@ -5235,11 +5235,11 @@ "bWI" = (/obj/item/weapon/storage/box,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bWJ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bWK" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/obj/item/weapon/cigbutt,/turf/simulated/floor/plasteel,/area/atmos) -"bWL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/library) +"bWL" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/library) "bWM" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/wood,/area/library) "bWN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "bWO" = (/obj/structure/table/wood,/obj/item/weapon/paper,/obj/machinery/light,/turf/simulated/floor/wood,/area/library) -"bWP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood,/area/library) +"bWP" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood,/area/library) "bWQ" = (/obj/machinery/door/airlock/maintenance{name = "Library Maintenance"; req_access_txt = "0"; req_one_access_txt = "12;37"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bWR" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plating{dir = 8; icon_state = "warnplate"; tag = ""},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bWS" = (/obj/machinery/vending/snack,/obj/machinery/newscaster{pixel_x = -30; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/central) @@ -5275,7 +5275,7 @@ "bXw" = (/obj/machinery/vending/hydronutrients,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) "bXx" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) "bXy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) -"bXz" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Port to Filter"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bXz" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Port to Filter"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bXA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) "bXB" = (/obj/machinery/chem_master/condimaster{name = "BrewMaster 4000"; pixel_x = -4},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) "bXC" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/window/reinforced{dir = 8},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 29},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) @@ -5283,15 +5283,15 @@ "bXE" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/cultivator,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) "bXF" = (/obj/structure/closet{name = "spare parts locker"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/item/weapon/rack_parts,/obj/item/weapon/rack_parts,/obj/item/weapon/wrench,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/kitchen) "bXG" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/window/eastright{dir = 1; name = "Kitchen Delivery"; req_access_txt = "28"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/kitchen) -"bXH" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 8; tag = ""},/turf/simulated/floor/plasteel,/area/atmos) +"bXH" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{dir = 8; tag = ""},/turf/simulated/floor/plasteel,/area/atmos) "bXI" = (/obj/structure/disposalpipe/sortjunction{dir = 2; sortType = 20},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/starboard) "bXJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/starboard) "bXK" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/starboard) "bXL" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/starboard) "bXM" = (/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/starboard) "bXN" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/starboard) -"bXO" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plating,/area/maintenance/starboard) -"bXP" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "CO2 to Pure"; on = 0},/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/atmos) +"bXO" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plating,/area/maintenance/starboard) +"bXP" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "CO2 to Pure"; on = 0},/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/atmos) "bXQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 6},/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor/plasteel{dir = 9; icon_state = "caution"},/area/atmos) "bXR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/toxins/explab) "bXS" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) @@ -5313,10 +5313,10 @@ "bYi" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/aft{name = "Aft Maintenance"}) "bYj" = (/obj/structure/closet,/obj/item/clothing/shoes/jackboots,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bYk" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/central) -"bYl" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bYl" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bYm" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bYn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"bYo" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bYo" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bYp" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bYq" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{icon_state = "L1"},/area/hallway/primary/central) "bYr" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "L3"},/area/hallway/primary/central) @@ -5327,9 +5327,9 @@ "bYw" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{desc = ""; icon_state = "L13"; name = "floor"},/area/hallway/primary/central) "bYx" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/turf/simulated/wall/r_wall,/area/maintenance/incinerator) "bYy" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"bYz" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bYz" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bYA" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"bYB" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=8-Central-Aft"; location = "7.5-Starboard-Aft-Corner"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bYB" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=8-Central-Aft"; location = "7.5-Starboard-Aft-Corner"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bYC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hallway/primary/central) "bYD" = (/turf/simulated/floor/plasteel{icon_state = "greenfull"},/area/hallway/primary/central) "bYE" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/window/westleft{dir = 4; name = "Hydroponics Desk"; req_access_txt = "0"; req_one_access_txt = "30;35"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "greenfull"; tag = "icon-whitehall (WEST)"},/area/hydroponics) @@ -5350,19 +5350,19 @@ "bYT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) "bYU" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Maintenance"; req_access_txt = "24"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/atmos) "bYV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/atmos) -"bYW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) +"bYW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bYX" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/atmos) -"bYY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/atmos) -"bYZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) +"bYY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bYZ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) "bZa" = (/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) "bZb" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) "bZc" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window{base_state = "right"; dir = 1; icon_state = "right"; name = "MiniSat Walkway Access"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"bZd" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced,/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "MiniSat Exterior Aft"; dir = 2; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) +"bZd" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced,/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "MiniSat Exterior Aft"; dir = 2; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bZe" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/door/window{dir = 1; name = "MiniSat Walkway Access"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bZf" = (/obj/structure/stool,/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/machinery/camera{c_tag = "Aft Port Solar Maintenance"; dir = 4; network = list("SS13")},/turf/simulated/floor/plating,/area/maintenance/portsolar) -"bZg" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plating,/area/maintenance/portsolar) +"bZg" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plating,/area/maintenance/portsolar) "bZh" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/light/small{dir = 4},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/plating,/area/maintenance/portsolar) -"bZi" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"bZi" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bZj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bZk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "bZl" = (/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/aft{name = "Aft Maintenance"}) @@ -5418,7 +5418,7 @@ "caj" = (/obj/machinery/hydroponics/constructable,/turf/simulated/floor/plasteel,/area/hydroponics) "cak" = (/obj/machinery/seed_extractor,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/hydroponics) "cal" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/structure/closet/wardrobe/botanist,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) -"cam" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/firealarm{pixel_y = 29},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) +"cam" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/firealarm{pixel_y = 29},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "can" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/starboard) "cao" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/starboard) "cap" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/starboard) @@ -5426,9 +5426,9 @@ "car" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/starboard) "cas" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/starboard) "cat" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/starboard) -"cau" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 3; on = 1},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/atmos) +"cau" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 1; filter_type = 3; on = 1},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/atmos) "cav" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) -"caw" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel,/area/atmos) +"caw" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel,/area/atmos) "cax" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) "cay" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 6},/turf/simulated/floor/plasteel,/area/atmos) "caz" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 10; initialize_directions = 10},/turf/simulated/floor/plasteel,/area/atmos) @@ -5441,19 +5441,19 @@ "caG" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/portsolar) "caH" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/portsolar) "caI" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/machinery/door_control{id = "kitchen"; name = "Kitchen Shutters Control"; pixel_x = -4; pixel_y = 26; req_access_txt = "28"},/obj/machinery/light_switch{pixel_x = 6; pixel_y = 26},/turf/simulated/floor/plasteel{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) -"caJ" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"caJ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "caK" = (/obj/structure/closet,/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "caL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/aft{name = "Aft Maintenance"}) "caM" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "caN" = (/obj/structure/stool,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"caO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"caO" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "caP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/aft{name = "Aft Maintenance"}) "caQ" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "caR" = (/obj/structure/girder,/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "caS" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "caT" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "caU" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/item/weapon/rack_parts,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"caV" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "co2_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) +"caV" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "co2_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) "caW" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central) "caX" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central) "caY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central) @@ -5474,8 +5474,8 @@ "cbn" = (/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/toxins/explab) "cbo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/toxins/explab) "cbp" = (/obj/effect/landmark/start{name = "Botanist"},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/hydroponics) -"cbq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hydroponics) -"cbr" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hydroponics) +"cbq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hydroponics) +"cbr" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hydroponics) "cbs" = (/turf/simulated/floor/plasteel,/area/hydroponics) "cbt" = (/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hydroponics) "cbu" = (/turf/simulated/wall,/area/maintenance/incinerator) @@ -5489,11 +5489,11 @@ "cbC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) "cbD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/cigbutt,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/starboard) "cbE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/starboard) -"cbF" = (/obj/machinery/atmospherics/trinary/filter{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"cbG" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel,/area/atmos) -"cbH" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "N2 to Airmix"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) -"cbI" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"cbJ" = (/obj/machinery/atmospherics/trinary/mixer{dir = 2; node1_concentration = 0.8; node2_concentration = 0.2; on = 1; pixel_x = 0; pixel_y = 0; target_pressure = 4500},/turf/simulated/floor/plasteel,/area/atmos) +"cbF" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) +"cbG" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel,/area/atmos) +"cbH" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "N2 to Airmix"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"cbI" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) +"cbJ" = (/obj/machinery/atmospherics/components/trinary/mixer{dir = 2; node1_concentration = 0.8; node2_concentration = 0.2; on = 1; pixel_x = 0; pixel_y = 0; target_pressure = 4500},/turf/simulated/floor/plasteel,/area/atmos) "cbK" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/item/weapon/folder/yellow,/obj/item/weapon/folder/yellow,/turf/simulated/floor/plasteel{dir = 4; icon_state = "caution"},/area/atmos) "cbL" = (/obj/structure/sign/directions/evac{tag = "icon-direction_evac (EAST)"; icon_state = "direction_evac"; dir = 4},/obj/structure/sign/directions/medical{desc = "A direction sign, pointing out which way the medical department is."; dir = 4; icon_state = "direction_med"; name = "medical department"; pixel_y = 8; tag = "icon-direction_med (EAST)"},/obj/structure/sign/directions/science{desc = "A direction sign, pointing out which way the research department is."; dir = 4; icon_state = "direction_sci"; name = "research department"; pixel_y = -8; tag = "icon-direction_sci (EAST)"},/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "cbM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access = null; req_access_txt = "10; 13"},/turf/simulated/floor/plating,/area/maintenance/portsolar) @@ -5515,7 +5515,7 @@ "ccc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "ccd" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=4"; freq = 1400; location = "Medbay"},/obj/structure/plasticflaps{opacity = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/window/northleft{dir = 8; name = "MuleBot Access"; req_access_txt = "50"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/medical/medbay2{name = "Medbay Storage"}) "cce" = (/obj/machinery/computer/med_data,/obj/machinery/light{dir = 1},/obj/structure/sign/nosmoking_2{pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/sleeper{name = "Sleepers"}) -"ccf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"ccf" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "ccg" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "cch" = (/turf/simulated/wall,/area/security/checkpoint/medical) "cci" = (/obj/machinery/power/apc{dir = 8; name = "Medical Security Checkpoint APC"; pixel_x = -24; pixel_y = 0},/obj/machinery/alarm{pixel_y = 28},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/closet/secure_closet/security/med,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/checkpoint/medical) @@ -5550,7 +5550,7 @@ "ccL" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Hydroponics Maintenance"; req_access_txt = "35"; req_one_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/hydroponics) "ccM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) "ccN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 10},/turf/simulated/floor/plasteel,/area/atmos) -"ccO" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "N2 to Pure"},/turf/simulated/floor/plasteel,/area/atmos) +"ccO" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "N2 to Pure"},/turf/simulated/floor/plasteel,/area/atmos) "ccP" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "ccQ" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) "ccR" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) @@ -5559,7 +5559,7 @@ "ccU" = (/obj/machinery/door/airlock{name = "Medbay Emergency Storage"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/medbay2{name = "Medbay Storage"}) "ccV" = (/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "ccW" = (/obj/machinery/door/window/northleft{dir = 1; icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24"},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) -"ccX" = (/obj/machinery/atmospherics/trinary/filter{dir = 4; filter_type = 2; on = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/atmos) +"ccX" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4; filter_type = 2; on = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/atmos) "ccY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/atmos) "ccZ" = (/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cda" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/bluegrid,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -5570,16 +5570,16 @@ "cdf" = (/obj/machinery/light/small{dir = 1},/obj/structure/mopbucket,/obj/item/weapon/mop,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cdg" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 4},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 23},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/sleeper{name = "Sleepers"}) "cdh" = (/obj/item/weapon/cigbutt,/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/aft{name = "Aft Maintenance"}) -"cdi" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Nitrogen Outlet"; on = 1},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/atmos) +"cdi" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Nitrogen Outlet"; on = 1},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/atmos) "cdj" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "cdk" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2{name = "Medbay Storage"}) -"cdl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2{name = "Medbay Storage"}) +"cdl" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2{name = "Medbay Storage"}) "cdm" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2{name = "Medbay Storage"}) "cdn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "cdo" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Medbay Security Post"; req_access_txt = "63"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/security/checkpoint/medical) -"cdp" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/medical) +"cdp" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/medical) "cdq" = (/turf/simulated/floor/plasteel,/area/security/checkpoint/medical) -"cdr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/medical) +"cdr" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/medical) "cds" = (/obj/structure/window/reinforced,/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "n2_in"; name = "Nitrogen Supply Control"; output_tag = "n2_out"; sensors = list("n2_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/atmos) "cdt" = (/obj/structure/closet/l3closet/scientist{pixel_x = -2},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/explab) "cdu" = (/obj/structure/rack,/obj/item/weapon/reagent_containers/blood/random,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) @@ -5616,21 +5616,21 @@ "cdZ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "green"},/area/hydroponics) "cea" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/hydroponics) "ceb" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Hydroponics Backroom"; req_access_txt = "35"; req_one_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/hydroponics) -"cec" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) +"cec" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "ced" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) -"cee" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/trinary/filter{dir = 4; filter_type = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "bluefull"},/area/atmos) +"cee" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/components/trinary/filter{dir = 4; filter_type = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "bluefull"},/area/atmos) "cef" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/sortjunction{sortType = 21},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/starboard) "ceg" = (/obj/structure/rack,/obj/item/weapon/extinguisher,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/starboard) "ceh" = (/obj/structure/closet,/obj/item/stack/cable_coil/random,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/starboard) -"cei" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/incinerator) +"cei" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/incinerator) "cej" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/disposal,/obj/structure/sign/deathsposal{pixel_x = 0; pixel_y = 32},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plating,/area/maintenance/incinerator) "cek" = (/obj/machinery/power/smes{capacity = 9e+006; charge = 10000},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cel" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/northleft{dir = 1; icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24"},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) -"cem" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/binary/pump{dir = 1; name = "O2 to Airmix"; on = 1},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bluefull"},/area/atmos) +"cem" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "O2 to Airmix"; on = 1},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bluefull"},/area/atmos) "cen" = (/obj/structure/window/reinforced,/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "o2_in"; name = "Oxygen Supply Control"; output_tag = "o2_out"; sensors = list("o2_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bluefull"},/area/atmos) "ceo" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/atmos) -"cep" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/door/window/northleft{dir = 1; icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24"},/obj/machinery/atmospherics/binary/pump{dir = 1; name = "O2 to Pure"},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) -"ceq" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Air to Pure"},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/atmos) +"cep" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/door/window/northleft{dir = 1; icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24"},/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "O2 to Pure"},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/atmos) +"ceq" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Air to Pure"},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/atmos) "cer" = (/obj/structure/window/reinforced,/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1443; input_tag = "air_in"; name = "Mixed Air Supply Control"; output_tag = "air_out"; pressure_setting = 2000; sensors = list("air_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/atmos) "ces" = (/obj/structure/closet,/obj/item/weapon/storage/box/donkpockets,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "cet" = (/obj/machinery/light,/obj/machinery/camera{c_tag = "Medbay Surgery"; dir = 1; network = list("SS13","Medbay")},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) @@ -5667,7 +5667,7 @@ "ceY" = (/obj/structure/stool/bed/chair/office/dark,/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyer"; name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = 24; pixel_y = -24},/obj/effect/landmark/start/depsec/medical,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/checkpoint/medical) "ceZ" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/door/poddoor/preopen{id = "rdprivacy"; name = "privacy shutter"},/turf/simulated/floor/plating,/area/crew_quarters/hor) "cfa" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"cfb" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"cfb" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cfc" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cfd" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cfe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) @@ -5677,7 +5677,7 @@ "cfi" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"; tag = "icon-whitehall (WEST)"},/area/medical/medbay{name = "Medbay Central"}) "cfj" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"; tag = "icon-whitehall (WEST)"},/area/medical/research{name = "Research Division"}) "cfk" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"cfl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"cfl" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cfm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cfn" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cfo" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/machinery/hologram/holopad,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -5685,7 +5685,7 @@ "cfq" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cfr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) "cfs" = (/obj/item/weapon/screwdriver{pixel_y = 10},/obj/item/device/radio/off,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/science{name = "Security Post - Research Division"}) -"cft" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/effect/landmark/start/depsec/science,/turf/simulated/floor/plasteel,/area/security/checkpoint/science{name = "Security Post - Research Division"}) +"cft" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/effect/landmark/start/depsec/science,/turf/simulated/floor/plasteel,/area/security/checkpoint/science{name = "Security Post - Research Division"}) "cfu" = (/obj/machinery/computer/secure_data,/obj/item/weapon/book/manual/wiki/security_space_law,/obj/machinery/computer/security/telescreen{desc = "Used for watching the RD's goons from the safety of his office."; dir = 8; name = "Research Monitor"; network = list("RD"); pixel_x = 28; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/science{name = "Security Post - Research Division"}) "cfv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/effect/spawner/lootdrop{loot = list("/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/item/weapon/cigbutt","/obj/item/trash/cheesie","/obj/item/trash/candy","/obj/item/trash/chips","/obj/item/trash/deadmouse","/obj/item/trash/pistachios","/obj/item/trash/plate","/obj/item/trash/popcorn","/obj/item/trash/raisins","/obj/item/trash/sosjerky","/obj/item/trash/syndi_cakes"); name = "maint grille or trash spawner"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cfw" = (/obj/machinery/vending/hydroseeds{slogan_delay = 700},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/hallway/primary/central) @@ -5698,13 +5698,13 @@ "cfD" = (/obj/machinery/hydroponics/constructable,/obj/machinery/light,/obj/machinery/power/apc{dir = 2; name = "Hydroponics APC"; pixel_x = 0; pixel_y = -28},/obj/structure/cable/yellow,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hydroponics) "cfE" = (/obj/machinery/hydroponics/constructable,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hydroponics) "cfF" = (/obj/machinery/hydroponics/constructable,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hydroponics) -"cfG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/vending/wallmed{pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/patients_rooms{name = "Patient Room A"}) +"cfG" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/vending/wallmed{pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/patients_rooms{name = "Patient Room A"}) "cfH" = (/obj/structure/lattice/catwalk,/obj/structure/cable,/turf/space,/area/solar/port) "cfI" = (/obj/machinery/door/window/eastright{dir = 1; name = "Hydroponics Delivery"; req_access_txt = "35"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hydroponics) "cfJ" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "Hydroponics"},/obj/structure/plasticflaps{opacity = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/hydroponics) "cfK" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/starboard) -"cfL" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/atmospherics/unary/tank/toxins{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cfM" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "plasma tank pump"},/obj/structure/sign/nosmoking_2{pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cfL" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/atmospherics/components/unary/tank/toxins{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cfM" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "plasma tank pump"},/obj/structure/sign/nosmoking_2{pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cfN" = (/obj/machinery/door/airlock/maintenance{name = "Hydroponics Maintenance"; req_access_txt = "35"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/hydroponics) "cfO" = (/obj/machinery/light{dir = 1},/obj/machinery/light_switch{pixel_x = 0; pixel_y = 26},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/meter,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cfP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) @@ -5732,12 +5732,12 @@ "cgl" = (/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cgm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/aft{name = "Aft Maintenance"}) "cgn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cgo" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cgo" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cgp" = (/turf/simulated/floor/plasteel,/area/atmos) "cgq" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cgr" = (/obj/item/trash/semki,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cgs" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cgt" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cgt" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cgu" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/closet/firecloset,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cgv" = (/obj/structure/rack,/obj/item/weapon/contraband/poster,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "cgw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall,/area/medical/surgery) @@ -5752,17 +5752,17 @@ "cgF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cgG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cgH" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"cgI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"cgI" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cgJ" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cgK" = (/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"; tag = "icon-whitehall (WEST)"},/area/medical/medbay{name = "Medbay Central"}) "cgL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/aft) -"cgM" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) +"cgM" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "cgN" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 2; icon_state = "purplecorner"},/area/hallway/primary/aft) "cgO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cgP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cgQ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cgR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"cgS" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"cgS" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cgT" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cgU" = (/obj/item/weapon/storage/box/rxglasses{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/bodybags,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29},/obj/structure/table/glass,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/genetics) "cgV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/science{name = "Security Post - Research Division"}) @@ -5774,13 +5774,13 @@ "chb" = (/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/maintenance/starboard) "chc" = (/obj/structure/closet/crate,/obj/item/weapon/coin/silver,/obj/item/device/flashlight,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "chd" = (/obj/structure/closet,/obj/item/clothing/tie/stethoscope,/obj/item/weapon/hemostat,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"che" = (/obj/structure/sign/nosmoking_2{pixel_x = -28},/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4; name = "input gas connector port"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"chf" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "input port pump"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"che" = (/obj/structure/sign/nosmoking_2{pixel_x = -28},/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4; name = "input gas connector port"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"chf" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "input port pump"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "chg" = (/obj/structure/disposalpipe/segment,/obj/machinery/computer/turbine_computer{id = "incineratorturbine"},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/machinery/computer/security/telescreen{desc = "Used for watching the turbine vent."; dir = 8; name = "turbine vent monitor"; network = list("Turbine"); pixel_x = 29; pixel_y = 0},/obj/machinery/door_control{id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = 24; pixel_y = -24; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator) "chh" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -31},/mob/living/simple_animal/mouse,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "chi" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door_control{id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = -6; pixel_y = -24; req_access_txt = "12"},/obj/machinery/door_control{id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = 6; pixel_y = -24; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 2},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "chj" = (/obj/machinery/meter,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"chk" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8; name = "output gas connector port"},/obj/machinery/portable_atmospherics/canister,/obj/machinery/ignition_switch{id = "Incinerator"; pixel_x = -6; pixel_y = -24},/obj/machinery/doorButtons/airlock_controller{idExterior = "incinerator_airlock_exterior"; idSelf = "incinerator_access_control"; idInterior = "incinerator_airlock_interior"; name = "Incinerator Access Console"; pixel_x = 6; pixel_y = -26; req_access_txt = "12"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"chk" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8; name = "output gas connector port"},/obj/machinery/portable_atmospherics/canister,/obj/machinery/ignition_switch{id = "Incinerator"; pixel_x = -6; pixel_y = -24},/obj/machinery/doorButtons/airlock_controller{idExterior = "incinerator_airlock_exterior"; idSelf = "incinerator_access_control"; idInterior = "incinerator_airlock_interior"; name = "Incinerator Access Console"; pixel_x = 6; pixel_y = -26; req_access_txt = "12"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "chl" = (/obj/machinery/door/airlock/maintenance{name = "Medbay Maintenance"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor/plating,/area/medical/surgery) "chm" = (/obj/structure/table,/obj/item/stack/medical/gauze,/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "chn" = (/obj/structure/table,/obj/item/stack/cable_coil,/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = -4},/obj/item/weapon/screwdriver{pixel_y = 16},/obj/item/device/gps{gpstag = "RD0"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) @@ -5803,10 +5803,10 @@ "chE" = (/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "chF" = (/turf/simulated/wall,/area/medical/sleeper{name = "Sleepers"}) "chG" = (/obj/machinery/requests_console{department = "Genetics"; departmentType = 0; name = "Genetics Requests Console"; pixel_x = 0; pixel_y = 30},/obj/machinery/light{dir = 1},/obj/item/weapon/storage/box/monkeycubes,/obj/item/device/radio/headset/headset_medsci,/obj/item/device/flashlight/pen{pixel_x = 4; pixel_y = 3},/obj/item/device/flashlight/pen{pixel_x = 4; pixel_y = 3},/obj/structure/noticeboard{desc = "A board for pinning important notices upon."; name = "notice board"; pixel_x = -32; pixel_y = 32},/obj/structure/table/glass,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/genetics) -"chH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2{name = "Medbay Storage"}) +"chH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2{name = "Medbay Storage"}) "chI" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2{name = "Medbay Storage"}) "chJ" = (/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 8; pixel_y = 2},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/structure/table/glass,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/genetics) -"chK" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 28},/obj/machinery/light{dir = 1},/obj/machinery/newscaster{pixel_x = -30; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) +"chK" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 28},/obj/machinery/light{dir = 1},/obj/machinery/newscaster{pixel_x = -30; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "chL" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/effect/landmark/start{name = "Medical Doctor"},/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyer"; name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = 24; pixel_y = 24},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "chM" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/atmos) "chN" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) @@ -5827,7 +5827,7 @@ "cic" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) "cid" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) "cie" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/science{name = "Security Post - Research Division"}) -"cif" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/checkpoint/science{name = "Security Post - Research Division"}) +"cif" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/checkpoint/science{name = "Security Post - Research Division"}) "cig" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/light{dir = 4},/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/science{name = "Security Post - Research Division"}) "cih" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cii" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -5877,7 +5877,7 @@ "cja" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "cjb" = (/obj/item/weapon/folder/white,/obj/item/stack/packageWrap,/obj/item/weapon/pen,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/structure/table/glass,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/medical/genetics) "cjc" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 10; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) -"cjd" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) +"cjd" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "cje" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/item/weapon/reagent_containers/food/drinks/britcup,/turf/simulated/floor/plasteel{icon_state = "whitegreenfull"},/area/medical/medbay{name = "Medbay Central"}) "cjf" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{icon_state = "whitebluefull"},/area/medical/medbay{name = "Medbay Central"}) "cjg" = (/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/hand_labeler,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -5907,10 +5907,10 @@ "cjE" = (/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/aft{name = "Aft Maintenance"}) "cjF" = (/obj/machinery/power/apc{dir = 8; name = "Incinerator APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cjG" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/incinerator) -"cjH" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/binary/valve{dir = 2; name = "output gas to space"},/obj/structure/sign/fire{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cjI" = (/obj/machinery/atmospherics/binary/pump{dir = 2; on = 1},/obj/machinery/doorButtons/access_button{idDoor = "incinerator_airlock_exterior"; layer = 3.1; idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = 8; pixel_y = -24},/obj/machinery/light/small{dir = 8},/obj/structure/sign/fire{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/engine,/area/maintenance/incinerator) +"cjH" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/binary/valve{dir = 2; name = "output gas to space"},/obj/structure/sign/fire{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cjI" = (/obj/machinery/atmospherics/components/binary/pump{dir = 2; on = 1},/obj/machinery/doorButtons/access_button{idDoor = "incinerator_airlock_exterior"; layer = 3.1; idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = 8; pixel_y = -24},/obj/machinery/light/small{dir = 8},/obj/structure/sign/fire{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/engine,/area/maintenance/incinerator) "cjJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/engine,/area/maintenance/incinerator) -"cjK" = (/obj/machinery/atmospherics/binary/pump{dir = 1; on = 1},/obj/structure/sign/fire{pixel_x = 32; pixel_y = 0},/obj/machinery/doorButtons/access_button{idDoor = "incinerator_airlock_interior"; idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -8; pixel_y = 24},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine,/area/maintenance/incinerator) +"cjK" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; on = 1},/obj/structure/sign/fire{pixel_x = 32; pixel_y = 0},/obj/machinery/doorButtons/access_button{idDoor = "incinerator_airlock_interior"; idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -8; pixel_y = 24},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine,/area/maintenance/incinerator) "cjL" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/space,/area/space) "cjM" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/space,/area/space) "cjN" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 8},/turf/space,/area/space) @@ -5992,9 +5992,9 @@ "cll" = (/obj/structure/stool/bed/roller,/obj/machinery/light/small{dir = 8},/obj/machinery/iv_drip{density = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "clm" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "cln" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/sleeper{name = "Sleepers"}) -"clo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper{name = "Sleepers"}) +"clo" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper{name = "Sleepers"}) "clp" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper{name = "Sleepers"}) -"clq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper{name = "Sleepers"}) +"clq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper{name = "Sleepers"}) "clr" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/sleeper{name = "Sleepers"}) "cls" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "whitebluefull"},/area/medical/sleeper{name = "Sleepers"}) "clt" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) @@ -6023,13 +6023,13 @@ "clQ" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/meter{frequency = 1443; id = "mair_out_meter"; name = "Mixed Air Tank Out"},/obj/structure/grille,/turf/simulated/wall/r_wall,/area/atmos) "clR" = (/obj/machinery/disposal{pixel_x = 5},/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 24; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/toxins/lab) "clS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) -"clT" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/medical/research{name = "Research Division"}) +"clT" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/medical/research{name = "Research Division"}) "clU" = (/obj/machinery/power/apc{cell_type = 10000; dir = 1; name = "Research Division APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/machinery/camera{c_tag = "Research Division - Airlock"; dir = 2; network = list("SS13","RD")},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 5},/area/medical/research{name = "Research Division"}) "clV" = (/turf/simulated/floor/plasteel{icon_state = "bot"},/area/medical/research{name = "Research Division"}) "clW" = (/obj/effect/landmark{name = "blobstart"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/cigbutt,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "clX" = (/obj/structure/stool,/obj/machinery/newscaster{pixel_x = -30; pixel_y = 0},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) "clY" = (/obj/structure/stool,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) -"clZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) +"clZ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) "cma" = (/obj/item/weapon/cigbutt,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) "cmb" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/vending/cola,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "cmc" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/medical/virology) @@ -6040,19 +6040,19 @@ "cmh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/iv_drip,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) "cmi" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/aft{name = "Aft Maintenance"}) "cmj" = (/obj/structure/grille,/obj/structure/window/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/virology) -"cmk" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) +"cmk" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "cml" = (/obj/machinery/igniter{icon_state = "igniter0"; id = "Incinerator"; luminosity = 2; on = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) -"cmm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 0; pressure_checks = 2; pump_direction = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) +"cmm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 0; pressure_checks = 2; pump_direction = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "cmn" = (/obj/machinery/door/poddoor{id = "auxincineratorvent"; name = "Auxiliary Incinerator Vent"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) -"cmo" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/atmos) -"cmp" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/atmos) +"cmo" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/atmos) +"cmp" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/atmos) "cmq" = (/obj/machinery/r_n_d/destructive_analyzer,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/lab) "cmr" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/lab) -"cms" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) +"cms" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) "cmt" = (/mob/living/simple_animal/pet/pug{desc = "It's Pugley IV, the research department's lovable pug clone. Hopefully nothing happens to this one - fourth time lucky!"; name = "Pugley IV"; real_name = "Pugley IV"},/turf/simulated/floor/engine,/area/toxins/explab) -"cmu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor/engine,/area/toxins/explab) -"cmv" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "n2_in"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) -"cmw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) +"cmu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor/engine,/area/toxins/explab) +"cmv" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "n2_in"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) +"cmw" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) "cmx" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty{pixel_x = -3; pixel_y = -3},/obj/item/weapon/reagent_containers/blood/AMinus,/obj/item/weapon/reagent_containers/blood/BMinus{pixel_x = -4; pixel_y = 4},/obj/item/weapon/reagent_containers/blood/BPlus{pixel_x = 1; pixel_y = 2},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OPlus{pixel_x = -2; pixel_y = -1},/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) "cmy" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor/wood,/area/maintenance/aft{name = "Aft Maintenance"}) "cmz" = (/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/turf/simulated/floor/wood{tag = "icon-wood-broken3"; icon_state = "wood-broken3"},/area/maintenance/aft{name = "Aft Maintenance"}) @@ -6063,11 +6063,11 @@ "cmE" = (/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/clothing/tie/stethoscope,/obj/item/clothing/tie/stethoscope,/obj/item/weapon/gun/syringe,/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "cmF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/aft{name = "Aft Maintenance"}) "cmG" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cmH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) +"cmH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "cmI" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "cmJ" = (/obj/item/weapon/cigbutt,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "cmK" = (/obj/structure/stool/bed/chair,/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) -"cmL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) +"cmL" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "cmM" = (/turf/simulated/wall,/area/medical/surgery) "cmN" = (/obj/item/weapon/cigbutt,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "cmO" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) @@ -6084,19 +6084,19 @@ "cmZ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cna" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cnb" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"cnc" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"cnc" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cnd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/shower{dir = 8; icon_state = "shower"; name = "emergency shower"; tag = "icon-shower (WEST)"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteyellowcorner"},/area/medical/medbay{name = "Medbay Central"}) "cne" = (/obj/machinery/smartfridge/chemistry,/turf/simulated/wall,/area/medical/chemistry) "cnf" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/virology) "cng" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) -"cnh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) +"cnh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "cni" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellow"; tag = "icon-whitehall (WEST)"},/area/medical/chemistry) "cnj" = (/obj/machinery/door/airlock/maintenance{name = "Experimentation Lab Maintenance"; req_access_txt = "8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/toxins/explab) -"cnk" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "o2_in"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) +"cnk" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "o2_in"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "cnl" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/lab) "cnm" = (/obj/machinery/r_n_d/protolathe,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/lab) "cnn" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/lab) -"cno" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) +"cno" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "cnp" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "cnq" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/storage/box/lights/mixed,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/starboard) "cnr" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) @@ -6112,7 +6112,7 @@ "cnB" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) "cnC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) "cnD" = (/obj/machinery/vending/coffee,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) -"cnE" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) +"cnE" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) "cnF" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/obj/item/target,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/toxins/test_area) "cnG" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_virology{name = "Containment Cells"; req_access_txt = "39"},/turf/simulated/floor/plasteel{icon_state = "whitegreenfull"},/area/medical/virology) "cnH" = (/obj/structure/closet/crate,/obj/item/weapon/coin/silver,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/starboard) @@ -6123,14 +6123,14 @@ "cnM" = (/obj/machinery/doorButtons/access_button{idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 0; pixel_y = 24; req_access_txt = "39"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/virology{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "virology_airlock_exterior"; locked = 1; name = "Virology Exterior Airlock"; req_access_txt = "39"},/turf/simulated/floor/plasteel{icon_state = "whitegreenfull"},/area/medical/virology) "cnN" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/virology{name = "Virology Access"; req_access_txt = "39"},/turf/simulated/floor/plasteel{icon_state = "whitegreenfull"},/area/medical/medbay3{name = "Medbay Aft"}) "cnO" = (/obj/structure/grille,/obj/structure/window/fulltile,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor/plating,/area/medical/virology) -"cnP" = (/obj/structure/lattice,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/binary/pump{dir = 2; name = "Gas Pump"; on = 1},/turf/space,/area/space) +"cnP" = (/obj/structure/lattice,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/binary/pump{dir = 2; name = "Gas Pump"; on = 1},/turf/space,/area/space) "cnQ" = (/obj/machinery/power/compressor{comp_id = "incineratorturbine"; dir = 1; luminosity = 2},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) -"cnR" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) +"cnR" = (/obj/machinery/atmospherics/components/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) "cnS" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) "cnT" = (/obj/machinery/door/airlock/glass_atmos{name = "Auxiliary Chamber"; req_access_txt = "24"},/turf/simulated/floor/plating,/area/atmos) -"cnU" = (/obj/machinery/atmospherics/binary/pump{dir = 2},/turf/simulated/wall/r_wall,/area/atmos) +"cnU" = (/obj/machinery/atmospherics/components/binary/pump{dir = 2},/turf/simulated/wall/r_wall,/area/atmos) "cnV" = (/obj/structure/girder/reinforced,/turf/simulated/floor/plating,/area/atmos) -"cnW" = (/obj/machinery/atmospherics/binary/pump{dir = 1},/turf/simulated/wall/r_wall,/area/atmos) +"cnW" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1},/turf/simulated/wall/r_wall,/area/atmos) "cnX" = (/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{pixel_x = 4; pixel_y = 5},/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{pixel_x = 6; pixel_y = -1},/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{pixel_x = -4; pixel_y = 6},/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{pixel_x = -5; pixel_y = 2},/obj/structure/table/wood,/obj/machinery/light_construct/small{dir = 1},/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/turf/simulated/floor/wood,/area/maintenance/aft{name = "Aft Maintenance"}) "cnY" = (/obj/machinery/computer/rdconsole/core,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/toxins/lab) "cnZ" = (/obj/structure/table,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/micro_laser,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/clothing/glasses/science,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/lab) @@ -6147,9 +6147,9 @@ "cok" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "col" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "com" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical{name = "Observation"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) -"con" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) +"con" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "coo" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) -"cop" = (/obj/item/weapon/cigbutt,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/sign/nosmoking_2{pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) +"cop" = (/obj/item/weapon/cigbutt,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/sign/nosmoking_2{pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/surgery) "coq" = (/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "whitebluefull"},/area/medical/sleeper{name = "Sleepers"}) "cor" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whiteblue"},/area/medical/sleeper{name = "Sleepers"}) "cos" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/sleeper{name = "Sleepers"}) @@ -6157,7 +6157,7 @@ "cou" = (/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "whitebluefull"},/area/medical/sleeper{name = "Sleepers"}) "cov" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/bodycontainer/morgue,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/assembly/robotics) "cow" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) -"cox" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"cox" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "coy" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "coz" = (/obj/item/device/radio/intercom{broadcasting = 1; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "coA" = (/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) @@ -6176,17 +6176,17 @@ "coN" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/lab) "coO" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) "coP" = (/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) -"coQ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/research{name = "Research Division"}) +"coQ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/research{name = "Research Division"}) "coR" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - O2"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "coS" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/closet/firecloset,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/medical/research{name = "Research Division"}) "coT" = (/obj/structure/plasticflaps{opacity = 1},/obj/machinery/navbeacon{codes_txt = "delivery;dir=2"; freq = 1400; location = "Research Division"},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/maintenance/aft{name = "Aft Maintenance"}) "coU" = (/turf/simulated/wall/r_wall,/area/maintenance/aft{name = "Aft Maintenance"}) "coV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/item/weapon/storage/box/lights/mixed,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) -"coW" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) +"coW" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) "coX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_virology{name = "Isolation B"; req_access_txt = "39"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) "coY" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) "coZ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) -"cpa" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/noticeboard{pixel_y = -32},/obj/machinery/light,/obj/machinery/camera{c_tag = "Research Division - Break Room"; dir = 1; network = list("SS13","RD")},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) +"cpa" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/noticeboard{pixel_y = -32},/obj/machinery/light,/obj/machinery/camera{c_tag = "Research Division - Break Room"; dir = 1; network = list("SS13","RD")},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/research{name = "Research Division"}) "cpb" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "cpc" = (/obj/structure/grille,/obj/structure/window/fulltile,/obj/structure/cable/yellow,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/medical/virology) "cpd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_virology{name = "Isolation A"; req_access_txt = "39"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) @@ -6200,7 +6200,7 @@ "cpl" = (/obj/structure/rack,/obj/item/clothing/suit/apron,/obj/item/clothing/mask/surgical,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cpm" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"; pixel_x = -4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cpn" = (/obj/machinery/light_switch{pixel_y = 28},/obj/structure/closet/l3closet/scientist{pixel_x = -2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cpo" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8},/turf/simulated/floor/plating/airless,/area/space) +"cpo" = (/obj/machinery/atmospherics/components/unary/outlet_injector{dir = 8},/turf/simulated/floor/plating/airless,/area/space) "cpp" = (/obj/machinery/power/turbine{luminosity = 2},/obj/structure/cable,/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "cpq" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "cpr" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) @@ -6218,7 +6218,7 @@ "cpD" = (/obj/structure/rack,/obj/item/stack/rods{amount = 23},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cpE" = (/obj/structure/bodycontainer/crematorium,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "cpF" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical{name = "Observation"; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel,/area/medical/surgery) -"cpG" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) +"cpG" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "cpH" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/medical/sleeper{name = "Sleepers"}) "cpI" = (/obj/machinery/door/airlock/maintenance{name = "Surgery Maintenance"; req_access_txt = "45"},/turf/simulated/floor/plating,/area/medical/surgery) "cpJ" = (/obj/machinery/door/firedoor,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) @@ -6234,7 +6234,7 @@ "cpT" = (/obj/item/device/flashlight/lamp,/obj/machinery/newscaster{pixel_x = -30},/obj/structure/table/wood,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "cpU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/sign/chemistry{pixel_x = -32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellowcorner"},/area/hallway/primary/aft) "cpV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/sign/science{pixel_x = 32},/turf/simulated/floor/plasteel{dir = 2; icon_state = "purplecorner"},/area/hallway/primary/aft) -"cpW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) +"cpW" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "cpX" = (/obj/structure/stool/bed/chair/office/light,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellow"; tag = "icon-whitehall (WEST)"},/area/medical/chemistry) "cpY" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "cpZ" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurple"},/area/toxins/lab) @@ -6278,7 +6278,7 @@ "cqL" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "cqM" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/obj/structure/closet/secure_closet/medical1{pixel_x = -3},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/cryo) "cqN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/medical/cryo) -"cqO" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/medical/cryo) +"cqO" = (/obj/machinery/atmospherics/components/unary/cryo_cell,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/medical/cryo) "cqP" = (/obj/structure/table,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/stock_parts/scanning_module,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/sign/nosmoking_2{pixel_x = 30; pixel_y = 0},/turf/simulated/floor/plasteel,/area/toxins/lab) "cqQ" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cqR" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) @@ -6293,10 +6293,10 @@ "cra" = (/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "crb" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 6},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowfull"; tag = "icon-whitehall (WEST)"},/area/hallway/primary/aft) "crc" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/hallway/primary/aft) -"crd" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/aft) +"crd" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "cre" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 4; icon_state = "purple"},/area/hallway/primary/aft) "crf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "purplefull"},/area/hallway/primary/aft) -"crg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/chapel/main) +"crg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/chapel/main) "crh" = (/obj/machinery/light/small,/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) "cri" = (/obj/machinery/light/small,/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "crj" = (/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) @@ -6338,11 +6338,11 @@ "crT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "crU" = (/obj/machinery/power/apc{dir = 4; name = "Surgery APC"; pixel_x = 26; pixel_y = 0},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/table,/obj/item/weapon/surgical_drapes,/turf/simulated/floor/plasteel{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/surgery) "crV" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/maintenance{name = "Research Lab Maintenance"; req_access_txt = "7"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/toxins/lab) -"crW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) +"crW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "crX" = (/obj/structure/stool/bed,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/bedsheet/medical,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "crY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "crZ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/cryo) -"csa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/cryo) +"csa" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/cryo) "csb" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/medical/cryo) "csc" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 2},/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor/plasteel,/area/medical/cryo) "csd" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/medical/cryo) @@ -6350,7 +6350,7 @@ "csf" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "csg" = (/obj/docking_port/stationary{dheight = 0; dir = 2; dwidth = 2; height = 22; id = "emergency_home"; name = "emergency evac bay"; width = 14},/turf/space,/area/space) "csh" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) -"csi" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) +"csi" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "csj" = (/obj/structure/stool/bed/chair/office/light{dir = 1},/obj/effect/landmark/start{name = "Chief Medical Officer"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "csk" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "csl" = (/obj/machinery/power/apc{dir = 4; name = "CMO's Office APC"; pixel_x = 26; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "CMO's Office"; dir = 8; network = list("SS13","Medbay")},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) @@ -6382,7 +6382,7 @@ "csL" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "csM" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/junction{dir = 8; icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "csN" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"csO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"csO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "csP" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/junction{dir = 8; icon_state = "pipe-j2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) "csQ" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/starboard) "csR" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/lattice/catwalk,/turf/space,/area/solar/starboard) @@ -6435,13 +6435,13 @@ "ctM" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 6},/turf/simulated/floor/plasteel{icon_state = "purplefull"},/area/hallway/primary/aft) "ctN" = (/obj/machinery/door_control{id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 0; pixel_y = 25},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{pixel_x = 7; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = -2; pixel_y = -1},/obj/item/weapon/reagent_containers/dropper,/obj/item/stack/medical/bruise_pack{pixel_x = -2; pixel_y = 6},/obj/item/stack/medical/ointment,/obj/item/device/healthanalyzer,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/explab) "ctO" = (/obj/machinery/chem_heater,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"ctP" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/medical/cryo) +"ctP" = (/obj/machinery/atmospherics/components/unary/cryo_cell,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/medical/cryo) "ctQ" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/door/window/eastleft{dir = 1; name = "Research and Development Deliveries"; req_access_txt = "7"},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/toxins/lab) "ctR" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/lab) "ctS" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "ctT" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "ctU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"ctV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"ctV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "ctW" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "ctX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "ctY" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -6462,30 +6462,30 @@ "cun" = (/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/blood/gibs/limb,/obj/structure/stool/bed/roller,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/aft{name = "Aft Maintenance"}) "cuo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cup" = (/obj/structure/barricade/wooden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/girder,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cuq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cuq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cur" = (/obj/structure/stool/bed,/obj/effect/decal/cleanable/blood/gibs/limb,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cus" = (/obj/item/toy/cards/deck,/obj/structure/table/wood/poker,/turf/simulated/floor/wood,/area/maintenance/aft{name = "Aft Maintenance"}) "cut" = (/turf/simulated/floor/wood{tag = "icon-wood-broken4"; icon_state = "wood-broken4"},/area/maintenance/aft{name = "Aft Maintenance"}) "cuu" = (/obj/structure/closet,/obj/item/device/flashlight,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/starboard) -"cuv" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"; tag = "icon-whitehall (WEST)"},/area/medical/surgery) +"cuv" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"; tag = "icon-whitehall (WEST)"},/area/medical/surgery) "cuw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "cux" = (/obj/machinery/computer/operating,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "cuy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) -"cuz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/surgery) +"cuz" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/surgery) "cuA" = (/obj/structure/stool/bed/roller,/obj/machinery/light/small{dir = 8},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/sign/nosmoking_2{pixel_x = -28},/obj/machinery/iv_drip{density = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/surgery) "cuB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) "cuC" = (/obj/structure/filingcabinet/filingcabinet,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) -"cuD" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/cryo) +"cuD" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/cryo) "cuE" = (/obj/machinery/light{dir = 8},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 5},/obj/structure/table/glass,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) -"cuF" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 1},/obj/item/device/radio/intercom{broadcasting = 1; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -30},/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"; tag = "icon-warnwhite (NORTHEAST)"},/area/medical/cryo) -"cuG" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1; name = "Connector Port (Air Supply)"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/medical/cryo) +"cuF" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{dir = 1},/obj/item/device/radio/intercom{broadcasting = 1; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -30},/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"; tag = "icon-warnwhite (NORTHEAST)"},/area/medical/cryo) +"cuG" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1; name = "Connector Port (Air Supply)"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/medical/cryo) "cuH" = (/obj/structure/disposalpipe/junction{tag = "icon-pipe-j2"; icon_state = "pipe-j2"; dir = 2},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "cuI" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) "cuJ" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) "cuK" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "cuL" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "cuM" = (/obj/structure/table/glass,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/storage/secure/briefcase,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) -"cuN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) +"cuN" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "cuO" = (/obj/machinery/disposal{pixel_x = 5},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "cuP" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cuQ" = (/obj/machinery/door/airlock/maintenance{name = "Medbay Maintenance"; req_access_txt = "5"},/turf/simulated/floor/plating,/area/medical/cryo) @@ -6521,7 +6521,7 @@ "cvu" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/surgery) "cvv" = (/obj/machinery/computer/slot_machine{pixel_y = 2},/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/aft{name = "Aft Maintenance"}) "cvw" = (/obj/machinery/computer/arcade,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cvx" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/surgery) +"cvx" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/surgery) "cvy" = (/obj/structure/stool/bed,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/weapon/bedsheet/medical,/obj/machinery/newscaster{pixel_x = 0; pixel_y = -32},/obj/machinery/camera{c_tag = "Medbay Recovery Room"; dir = 1; network = list("SS13","Medbay")},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/surgery) "cvz" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Research Maintenance"; req_access_txt = "0"; req_one_access_txt = "7;47;29"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) "cvA" = (/turf/simulated/wall,/area/medical/cryo) @@ -6533,11 +6533,11 @@ "cvG" = (/obj/structure/stool/bed/chair{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "cvH" = (/obj/structure/closet,/obj/item/weapon/storage/box/donkpockets,/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cvI" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Medical Officer's Desk"; departmentType = 5; name = "Chief Medical Officer RC"; pixel_x = 0; pixel_y = -32},/obj/effect/landmark/start{name = "Chief Medical Officer"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) -"cvJ" = (/obj/structure/closet/crate,/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/item/device/assembly/infra,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) +"cvJ" = (/obj/structure/closet/crate,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/item/device/assembly/infra,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cvK" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cvL" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cvM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/aft{name = "Aft Maintenance"}) -"cvN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/lab) +"cvN" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/lab) "cvO" = (/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j1s"; sortType = 11},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cvP" = (/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j2s"; sortType = 23},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cvQ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/maintenance{req_access_txt = "0"; req_one_access_txt = "12;5;9"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -6577,7 +6577,7 @@ "cwy" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cwz" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cwA" = (/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) -"cwB" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/patients_rooms{name = "Patient Room A"}) +"cwB" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/patients_rooms{name = "Patient Room A"}) "cwC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/item/weapon/cigbutt,/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/aft{name = "Aft Maintenance"}) "cwD" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/white,/obj/item/weapon/folder/white,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "cwE" = (/obj/machinery/door/airlock/medical{name = "Patient Room A"; req_access_txt = "5"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/patients_rooms{name = "Patient Room A"}) @@ -6626,9 +6626,9 @@ "cxv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cxw" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cxx" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) -"cxy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) -"cxz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/power/apc{dir = 2; name = "Experimentation Lab APC"; pixel_y = -24},/obj/structure/cable/yellow,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) -"cxA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/aft{name = "Aft Maintenance"}) +"cxy" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) +"cxz" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/power/apc{dir = 2; name = "Experimentation Lab APC"; pixel_y = -24},/obj/structure/cable/yellow,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"cxA" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/aft{name = "Aft Maintenance"}) "cxB" = (/obj/item/weapon/dice/d20,/obj/item/weapon/dice,/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/aft{name = "Aft Maintenance"}) "cxC" = (/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/plasteel{dir = 9; icon_state = "blue"},/area/medical/genetics) "cxD" = (/obj/structure/noticeboard{desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; name = "requests board"; pixel_x = -32; pixel_y = 32},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 5; icon_state = "blue"},/area/medical/genetics) @@ -6637,14 +6637,14 @@ "cxG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/hallway/primary/aft) "cxH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/aft) "cxI" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted{dir = 5; health = 120; icon_state = "twindow"; reinf = 0},/turf/simulated/floor/plating,/area/medical/genetics) -"cxJ" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/effect/spawner/lootdrop/maintenance,/obj/item/weapon/wrench,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cxJ" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/effect/spawner/lootdrop/maintenance,/obj/item/weapon/wrench,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cxK" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating{icon_plating = "warnplate"; icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cxL" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cxM" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/storage/box/lights/mixed,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cxN" = (/obj/effect/landmark/start{name = "Scientist"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurple"},/area/toxins/lab) "cxO" = (/obj/structure/table/reinforced,/obj/machinery/door/window/eastright{dir = 4; name = "Research and Development Desk"; req_access_txt = "7"},/obj/item/weapon/folder/white,/obj/item/weapon/folder/white,/obj/machinery/door/poddoor/shutters/preopen{id = "rndshutters"; name = "research and development lab shutters"},/obj/machinery/door/firedoor,/obj/item/weapon/pen,/turf/simulated/floor/plating,/area/toxins/lab) "cxP" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) -"cxQ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"cxQ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cxR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitebluecorner"},/area/medical/research{name = "Research Division"}) "cxS" = (/obj/structure/sign/directions/evac{pixel_y = 0},/turf/simulated/wall,/area/medical/genetics) "cxT" = (/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/structure/table/reinforced,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) @@ -6658,12 +6658,12 @@ "cyb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/landmark/start{name = "Scientist"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/storage) "cyc" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/toxins/storage) "cyd" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/light/small{dir = 4},/obj/machinery/camera{c_tag = "Toxins Storage"; dir = 8; network = list("SS13","RD")},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/toxins/storage) -"cye" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cye" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cyf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/aft{name = "Aft Maintenance"}) "cyg" = (/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cyh" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cyi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/aft{name = "Aft Maintenance"}) -"cyj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/aft{name = "Aft Maintenance"}) +"cyj" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/aft{name = "Aft Maintenance"}) "cyk" = (/obj/structure/closet/emcloset,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cyl" = (/obj/structure/closet,/obj/item/weapon/storage/toolbox/emergency,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cym" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -6696,9 +6696,9 @@ "cyN" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/research{name = "Research Division"}) "cyO" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/command{name = "Research Director's Office"; req_access_txt = "30"; req_one_access_txt = "0"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "cyP" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) -"cyQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) +"cyQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "cyR" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) -"cyS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) +"cyS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "cyT" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/toxins/storage) "cyU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/storage) "cyV" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/toxins/storage) @@ -6730,7 +6730,7 @@ "czv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/machinery/computer/cloning,/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteblue"},/area/medical/genetics_cloning) "czw" = (/obj/machinery/dna_scannernew,/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "whitebluefull"},/area/medical/genetics) "czx" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/genetics) -"czy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) +"czy" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "czz" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/genetics) "czA" = (/obj/machinery/dna_scannernew,/turf/simulated/floor/plasteel{icon_state = "whitebluefull"},/area/medical/genetics) "czB" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -6742,7 +6742,7 @@ "czH" = (/obj/machinery/mech_bay_recharge_port,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/assembly/chargebay) "czI" = (/obj/structure/grille,/obj/structure/window/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/poddoor/preopen{id = "isolb"; name = "privacy shutters"},/turf/simulated/floor/plating,/area/medical/exam_room{name = "Patient Room B"}) "czJ" = (/obj/structure/closet/secure_closet/personal/patient,/obj/machinery/door_control{id = "isolb"; name = "Privacy Shutters"; pixel_y = 25},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/exam_room{name = "Patient Room B"}) -"czK" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/structure/sign/nosmoking_2{pixel_x = -28; pixel_y = 0},/turf/simulated/floor/plasteel,/area/assembly/chargebay) +"czK" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/obj/structure/sign/nosmoking_2{pixel_x = -28; pixel_y = 0},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "czL" = (/obj/machinery/computer/mech_bay_power_console,/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"},/area/assembly/chargebay) "czM" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 31},/turf/simulated/floor/mech_bay_recharge_floor,/area/assembly/chargebay) "czN" = (/obj/machinery/cell_charger,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/power/apc{dir = 2; name = "Research Lab APC"; pixel_x = 0; pixel_y = -26},/obj/structure/cable/yellow,/obj/machinery/door_control{dir = 2; id = "rndshutters"; name = "Shutters Control Button"; pixel_x = -24; pixel_y = -25},/obj/structure/table,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/lab) @@ -6763,26 +6763,26 @@ "cAc" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/device/flashlight,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cAd" = (/obj/item/trash/chips,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cAe" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/exam_room{name = "Patient Room B"}) -"cAf" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/exam_room{name = "Patient Room B"}) -"cAg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/exam_room{name = "Patient Room B"}) +"cAf" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/exam_room{name = "Patient Room B"}) +"cAg" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/exam_room{name = "Patient Room B"}) "cAh" = (/obj/machinery/door/airlock/medical{name = "Patient Room B"; req_access_txt = "5"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/exam_room{name = "Patient Room B"}) "cAi" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay3{name = "Medbay Aft"}) "cAj" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "cAk" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitebluecorner"},/area/medical/medbay3{name = "Medbay Aft"}) "cAl" = (/obj/structure/sign/directions/evac{pixel_y = 0},/turf/simulated/wall,/area/hallway/primary/aft) "cAm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/genetics_cloning) -"cAn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning) +"cAn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning) "cAo" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/obj/machinery/dna_scannernew,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/genetics_cloning) "cAp" = (/obj/structure/sign/directions/evac{pixel_y = 0},/turf/simulated/wall,/area/assembly/chargebay) "cAq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/genetics) "cAr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"},/area/medical/genetics) "cAs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "cAt" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"},/area/medical/genetics) -"cAu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteblue"},/area/medical/genetics) +"cAu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteblue"},/area/medical/genetics) "cAv" = (/obj/item/weapon/cigbutt,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cAw" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "bluecorner"},/area/medical/genetics) "cAx" = (/obj/structure/sign/nosmoking_2{pixel_x = 28},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plasteel{dir = 5; icon_state = "blue"},/area/medical/genetics) -"cAy" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) +"cAy" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "cAz" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/aft) "cAA" = (/obj/machinery/door/poddoor/shutters{id = "Skynet_launch"; name = "Mech Bay"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/assembly/chargebay) "cAB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/camera{c_tag = "Research Division Hallway - Mech Bay"; dir = 4; network = list("SS13","RD")},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) @@ -6808,7 +6808,7 @@ "cAV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay3{name = "Medbay Aft"}) "cAW" = (/obj/machinery/door/firedoor,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass_medical{id_tag = "CloningDoor"; name = "Cloning Lab"; req_access_txt = "0"; req_one_access_txt = "5"},/turf/simulated/floor/plasteel{icon_state = "whitebluefull"},/area/medical/genetics_cloning) "cAX" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/genetics_cloning) -"cAY" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning) +"cAY" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics_cloning) "cAZ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/genetics_cloning) "cBa" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_research{name = "Genetics Lab"; req_access_txt = "5;9"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "whitebluefull"},/area/medical/genetics) "cBb" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/genetics) @@ -6818,7 +6818,7 @@ "cBf" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/genetics) "cBg" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{icon_state = "door_closed"; id_tag = "AuxGenetics"; locked = 0; name = "Genetics Lab"; req_access_txt = "9"; req_one_access_txt = "0"},/turf/simulated/floor/plasteel,/area/medical/genetics) "cBh" = (/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/medical/genetics) -"cBi" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/medical/genetics) +"cBi" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/medical/genetics) "cBj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 4},/area/medical/genetics) "cBk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{icon_state = "door_closed"; id_tag = "AuxGenetics"; locked = 0; name = "Genetics Access"; req_access_txt = "9"; req_one_access_txt = "0"},/turf/simulated/floor/plasteel,/area/medical/genetics) "cBl" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/aft) @@ -6826,21 +6826,21 @@ "cBn" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "cBo" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/landmark/start{name = "Roboticist"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/bluegrid,/area/assembly/chargebay) "cBp" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/light_switch{pixel_x = 26; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/surgery) -"cBq" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1; name = "Connector Port (Air Supply)"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/light_switch{pixel_x = 0; pixel_y = -24},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/medical/cryo) +"cBq" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1; name = "Connector Port (Air Supply)"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/light_switch{pixel_x = 0; pixel_y = -24},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/medical/cryo) "cBr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cBs" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/keycard_auth{pixel_x = 26; pixel_y = -7},/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/machinery/door_control{id = "cmoprivacy"; name = "Privacy Shutters Control"; pixel_x = 26; pixel_y = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) -"cBt" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"cBt" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cBu" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cBv" = (/obj/structure/sign/biohazard,/turf/simulated/wall,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cBw" = (/obj/item/clothing/gloves/color/latex,/obj/item/device/healthanalyzer,/obj/item/clothing/glasses/hud/health,/obj/structure/reagent_dispensers/virusfood{density = 0; pixel_x = 0; pixel_y = 30},/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitegreen"},/area/medical/virology) "cBx" = (/obj/item/device/radio/intercom{pixel_x = -28; pixel_y = 0},/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 9},/obj/machinery/light/small{dir = 8},/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) -"cBy" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/unary/cold_sink/freezer,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cBz" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cBA" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cBB" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/camera{c_tag = "Toxins - Lab"; dir = 2; network = list("SS13","RD")},/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cBC" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/structure/window/reinforced{dir = 8},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cBD" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cBE" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/structure/window/reinforced{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cBy" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/components/unary/cold_sink/freezer,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cBz" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cBA" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cBB" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/camera{c_tag = "Toxins - Lab"; dir = 2; network = list("SS13","RD")},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cBC" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/structure/window/reinforced{dir = 8},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cBD" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cBE" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/structure/window/reinforced{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cBF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cBG" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cBH" = (/turf/simulated/wall/r_wall,/area/toxins/mixing{name = "\improper Toxins Lab"}) @@ -6853,7 +6853,7 @@ "cBO" = (/obj/machinery/vending/cigarette,/obj/structure/noticeboard{pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/medical/medbay3{name = "Medbay Aft"}) "cBP" = (/turf/simulated/wall,/area/medical/medbay3{name = "Medbay Aft"}) "cBQ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay3{name = "Medbay Aft"}) -"cBR" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) +"cBR" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "cBS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/sign/nosmoking_2{pixel_x = 28},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay3{name = "Medbay Aft"}) "cBT" = (/obj/machinery/door_control{desc = "A remote control switch for the cloning door."; id = "CloningDoor"; name = "Cloning Exit Button"; normaldoorcontrol = 1; pixel_x = -23; pixel_y = 8},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whiteblue"},/area/medical/genetics_cloning) "cBU" = (/obj/effect/landmark/start{name = "Geneticist"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/genetics_cloning) @@ -6880,7 +6880,7 @@ "cCp" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/obj/machinery/meter,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cCq" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cCr" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cCs" = (/obj/machinery/atmospherics/trinary/filter{density = 0; dir = 8; req_access = "0"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cCs" = (/obj/machinery/atmospherics/components/trinary/filter{density = 0; dir = 8; req_access = "0"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cCt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cCu" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cCv" = (/turf/simulated/wall,/area/toxins/mixing{name = "\improper Toxins Lab"}) @@ -6895,7 +6895,7 @@ "cCE" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/aft{name = "Aft Maintenance"}) "cCF" = (/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) "cCG" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) -"cCH" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) +"cCH" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) "cCI" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) "cCJ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/cigbutt,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) "cCK" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/medical{name = "Medbay Break Room"; req_access_txt = "5"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) @@ -6910,7 +6910,7 @@ "cCT" = (/obj/structure/stool/bed/roller,/obj/machinery/door/window/westleft{dir = 1; name = "Monkey Pen"; pixel_y = 2; req_access_txt = "9"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/genetics) "cCU" = (/obj/machinery/light,/obj/machinery/door/window/westleft{base_state = "right"; dir = 1; icon_state = "right"; name = "Monkey Pen"; pixel_y = 2; req_access_txt = "9"},/obj/structure/stool/bed/roller,/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/genetics) "cCV" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/stool/bed/roller,/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/genetics) -"cCW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/genetics) +"cCW" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/genetics) "cCX" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/genetics) "cCY" = (/turf/simulated/floor/mech_bay_recharge_floor,/area/assembly/chargebay) "cCZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/aft) @@ -6924,7 +6924,7 @@ "cDh" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) "cDi" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/obj/machinery/light/small,/turf/simulated/floor/plasteel{dir = 8; icon_state = "barber"},/area/medical/cmo) "cDj" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cDk" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cDk" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cDl" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cDm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cDn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) @@ -6938,7 +6938,7 @@ "cDv" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cDw" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-warningcorner"; icon_state = "warningcorner"; dir = 2},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cDx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cDy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 22},/obj/machinery/light/small{dir = 8},/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cDy" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 22},/obj/machinery/light/small{dir = 8},/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cDz" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cDA" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/computer/security/telescreen{desc = "Used for watching the test chamber."; dir = 8; layer = 4; name = "Test Chamber Telescreen"; network = list("Toxins"); pixel_x = 30; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cDB" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 9},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/extinguisher_cabinet{pixel_x = -25; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitegreen"},/area/medical/virology) @@ -6971,7 +6971,7 @@ "cEc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEd" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cEf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cEf" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEg" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEi" = (/turf/simulated/wall/r_wall,/area/toxins/misc_lab{name = "\improper Research Testing Range"}) @@ -6980,7 +6980,7 @@ "cEl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEm" = (/obj/machinery/door/airlock/research{name = "Toxins Launch Room"; req_access_txt = "8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"; tag = "icon-warnwhite (NORTHEAST)"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cEo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cEo" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEp" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEq" = (/obj/machinery/light/small,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cEr" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/driver_button{dir = 2; id = "toxinsdriver"; pixel_x = 24; pixel_y = -24},/obj/machinery/computer/security/telescreen{desc = "Used for watching the test chamber."; dir = 8; layer = 4; name = "Test Chamber Telescreen"; network = list("Toxins"); pixel_x = 30; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) @@ -6994,7 +6994,7 @@ "cEz" = (/obj/structure/closet,/obj/item/clothing/glasses/science,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"; tag = "icon-warnplate (NORTH)"},/area/maintenance/aft{name = "Aft Maintenance"}) "cEA" = (/obj/machinery/light/small{dir = 4},/obj/structure/closet,/obj/item/device/flashlight,/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cEB" = (/obj/structure/table/glass,/obj/machinery/newscaster{pixel_x = -30},/obj/item/weapon/folder/white,/obj/item/weapon/folder/white,/obj/item/weapon/paper,/obj/item/weapon/pen/red,/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitegreen"},/area/medical/virology) -"cEC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light/small,/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -29},/obj/machinery/camera{c_tag = "Medbay Break Room"; dir = 1; network = list("SS13","Medbay")},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) +"cEC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light/small,/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -29},/obj/machinery/camera{c_tag = "Medbay Break Room"; dir = 1; network = list("SS13","Medbay")},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) "cED" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/machinery/light_switch{pixel_x = 0; pixel_y = 26},/obj/machinery/camera{c_tag = "Virology - Break Room"; dir = 2; network = list("SS13","Medbay")},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) "cEE" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "cEF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) @@ -7011,7 +7011,7 @@ "cEQ" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/aft) "cER" = (/obj/structure/table/glass,/obj/item/weapon/folder/white{pixel_y = 4},/obj/item/weapon/pen/red,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) "cES" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/assembly/chargebay) -"cET" = (/obj/machinery/power/apc{dir = 4; name = "Mech Bay APC"; pixel_x = 28; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/assembly/chargebay) +"cET" = (/obj/machinery/power/apc{dir = 4; name = "Mech Bay APC"; pixel_x = 28; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "cEU" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "cEV" = (/obj/machinery/door_control{id = "xeno_blastdoor"; name = "Secure Lab Shutter Control"; pixel_x = -5; pixel_y = -5; req_access_txt = "47"},/obj/structure/table/reinforced,/obj/machinery/door_control{id = "rdprivacy"; name = "Privacy Shutters Control"; pixel_x = 5; pixel_y = 5},/obj/machinery/door_control{id = "Biohazard"; name = "Entrance Shutter Control"; pixel_x = -5; pixel_y = 5; req_access_txt = "47"},/obj/machinery/door_control{id = "toxins_blastdoor"; name = "Toxins Shutter Control"; pixel_x = 5; pixel_y = -5; req_access_txt = "47"},/obj/item/device/radio/off,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "cEW" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) @@ -7043,8 +7043,8 @@ "cFw" = (/turf/simulated/floor/plating/airless,/area/toxins/test_area) "cFx" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plating/airless{dir = 5; icon_state = "warnplate"},/area/toxins/test_area) "cFy" = (/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) -"cFz" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) -"cFA" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) +"cFz" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) +"cFA" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) "cFB" = (/obj/machinery/camera{c_tag = "Medbay Hallway Aft"; dir = 4; network = list("SS13","Medbay")},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/medbay3{name = "Medbay Aft"}) "cFC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "cFD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"},/area/medical/medbay3{name = "Medbay Aft"}) @@ -7053,8 +7053,8 @@ "cFG" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "cFH" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"},/area/medical/medbay3{name = "Medbay Aft"}) "cFI" = (/obj/machinery/camera{c_tag = "Chapel - Port"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/chapel/main) -"cFJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) -"cFK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) +"cFJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) +"cFK" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "cFL" = (/obj/effect/landmark/start{name = "Medical Doctor"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "cFM" = (/obj/structure/table,/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/pen,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "cFN" = (/obj/machinery/vending/cola,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/aft) @@ -7118,19 +7118,19 @@ "cGT" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/assembly/chargebay) "cGU" = (/turf/simulated/floor/plasteel{icon_state = "bot"},/area/assembly/robotics) "cGV" = (/obj/machinery/camera{c_tag = "Research Testing Range"; dir = 8; network = list("SS13","RD"); pixel_y = -22},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/toxins/misc_lab{name = "\improper Research Testing Range"}) -"cGW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating{icon_plating = "warnplate"; icon_state = "warnplate"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) +"cGW" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating{icon_plating = "warnplate"; icon_state = "warnplate"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cGX" = (/turf/simulated/floor/plating{icon_plating = "warnplate"; icon_state = "warnplate"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cGY" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/carpet,/area/chapel/main) "cGZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "cHa" = (/obj/structure/lattice,/turf/space,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHb" = (/obj/machinery/door/poddoor{id = "mixvent"; name = "Mixer Room Vent"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHc" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cHd" = (/obj/machinery/sparker{dir = 2; id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cHd" = (/obj/machinery/sparker{dir = 2; id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHe" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cHf" = (/obj/machinery/airlock_sensor{id_tag = "tox_airlock_sensor"; master_tag = "tox_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/binary/pump{dir = 4; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cHf" = (/obj/machinery/airlock_sensor{id_tag = "tox_airlock_sensor"; master_tag = "tox_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/components/binary/pump{dir = 4; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHg" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/meter,/obj/machinery/embedded_controller/radio/airlock_controller{airpump_tag = "tox_airlock_pump"; exterior_door_tag = "tox_airlock_exterior"; id_tag = "tox_airlock_control"; interior_door_tag = "tox_airlock_interior"; pixel_x = -24; pixel_y = 0; sanitize_external = 1; sensor_tag = "tox_airlock_sensor"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warnwhitecorner"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cHh" = (/obj/machinery/atmospherics/binary/valve{dir = 4; name = "manual outlet valve"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cHi" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cHh" = (/obj/machinery/atmospherics/components/binary/valve{dir = 4; name = "manual outlet valve"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cHi" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHj" = (/obj/structure/closet/wardrobe/grey,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cHk" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/carpet,/area/chapel/main) "cHl" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plating/airless{dir = 10; icon_state = "warnplate"},/area/toxins/test_area) @@ -7141,7 +7141,7 @@ "cHq" = (/obj/machinery/door/window/westleft{base_state = "right"; dir = 1; icon_state = "right"; name = "door"; req_access_txt = "0"},/turf/simulated/floor/plasteel,/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cHr" = (/obj/structure/rack,/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cHs" = (/obj/structure/stool/bed/chair/office/light{dir = 1; pixel_y = 3},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreencorner"},/area/medical/virology) -"cHt" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) +"cHt" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) "cHu" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/effect/landmark/start{name = "Virologist"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreencorner"},/area/medical/virology) "cHv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cHw" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "0"; req_one_access_txt = "12;5;39;6"},/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7149,7 +7149,7 @@ "cHy" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "cHz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitehall"},/area/medical/medbay3{name = "Medbay Aft"}) "cHA" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitecorner"},/area/medical/medbay3{name = "Medbay Aft"}) -"cHB" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) +"cHB" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cHC" = (/obj/machinery/vending/medical,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitecorner"},/area/medical/medbay3{name = "Medbay Aft"}) "cHD" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Research Testing Range"; req_access_txt = "0"; req_one_access_txt = "7;47;29"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "purplefull"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cHE" = (/obj/structure/disposalpipe/junction{tag = "icon-pipe-j2"; icon_state = "pipe-j2"; dir = 2},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) @@ -7158,7 +7158,7 @@ "cHH" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/centcom{name = "Morgue"; opacity = 1; req_access_txt = "6"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "cHI" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hallway/primary/aft) "cHJ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) -"cHK" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) +"cHK" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "cHL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "cHM" = (/obj/machinery/door/firedoor,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/poddoor/preopen{id = "toxins_blastdoor"; name = "biohazard containment door"},/obj/machinery/door/airlock/research{name = "Toxins Lab"; req_access_txt = "8"},/obj/machinery/door/poddoor/shutters/preopen{id = "toxins_blastdoor"; name = "biohazard containment shutters"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHN" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/assembly/robotics) @@ -7166,11 +7166,11 @@ "cHP" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "cHQ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cHR" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/machinery/camera{c_tag = "Research Division Hallway - Robotics"; dir = 4; network = list("SS13","RD")},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"cHS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"cHS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cHT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "cHU" = (/turf/simulated/floor/engine/vacuum,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHV" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; glass = 1; icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "8"},/turf/simulated/floor/engine,/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cHW" = (/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{dir = 2; frequency = 1449; id = "tox_airlock_pump"},/turf/simulated/floor/engine,/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cHW" = (/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{dir = 2; frequency = 1449; id = "tox_airlock_pump"},/turf/simulated/floor/engine,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHX" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; glass = 1; icon_state = "door_locked"; id_tag = "tox_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "8"},/turf/simulated/floor/engine,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHY" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cHZ" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/camera{c_tag = "Toxins - Mixing Area"; dir = 8; network = list("SS13","RD")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) @@ -7221,11 +7221,11 @@ "cIS" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "cIT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cIU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) -"cIV" = (/obj/machinery/sparker{dir = 2; id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 4; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cIW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/sign/fire{pixel_y = -32},/obj/machinery/atmospherics/binary/pump{dir = 8; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cIV" = (/obj/machinery/sparker{dir = 2; id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 4; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cIW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/sign/fire{pixel_y = -32},/obj/machinery/atmospherics/components/binary/pump{dir = 8; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cIX" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/meter,/obj/machinery/door_control{id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; req_access_txt = "7"},/obj/machinery/ignition_switch{id = "mixingsparker"; pixel_x = -25; pixel_y = -5},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cIY" = (/obj/machinery/atmospherics/binary/valve{dir = 4; name = "manual inlet valve"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cIZ" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cIY" = (/obj/machinery/atmospherics/components/binary/valve{dir = 4; name = "manual inlet valve"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cIZ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cJa" = (/obj/structure/reagent_dispensers/watertank,/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cJb" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cJc" = (/obj/machinery/power/apc{dir = 1; name = "Robotics Lab APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/assembly/robotics) @@ -7239,22 +7239,22 @@ "cJk" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) "cJl" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "cJm" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/effect/landmark{name = "lightsout"},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) -"cJn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"cJn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "cJo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) "cJp" = (/obj/structure/noticeboard{dir = 4; pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/assembly/robotics) "cJq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"; tag = "icon-whitehall (WEST)"},/area/medical/virology) "cJr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "cJs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/doorButtons/airlock_controller{idExterior = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; idInterior = "virology_airlock_interior"; name = "Virology Access Console"; pixel_x = 26; pixel_y = 26; req_access_txt = "39"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) "cJt" = (/obj/structure/table,/obj/item/stack/sheet/plasteel{amount = 10},/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/machinery/ai_status_display{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/assembly/robotics) -"cJu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/doorButtons/access_button{idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -26; pixel_y = 28; req_access_txt = "39"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/virology) -"cJv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/virology) +"cJu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/doorButtons/access_button{idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -26; pixel_y = 28; req_access_txt = "39"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/virology) +"cJv" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/virology) "cJw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/assembly/robotics) "cJx" = (/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/assembly/robotics) "cJy" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/medbay3{name = "Medbay Aft"}) "cJz" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/iv_drip{density = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"; tag = "icon-whitehall (WEST)"},/area/medical/medbay3{name = "Medbay Aft"}) "cJA" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"; tag = "icon-whitehall (WEST)"},/area/medical/medbay3{name = "Medbay Aft"}) "cJB" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) -"cJC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) +"cJC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "cJD" = (/obj/machinery/computer/rdconsole/robotics,/obj/machinery/requests_console{department = "Robotics"; departmentType = 2; name = "Robotics RC"; pixel_x = -31; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/assembly/robotics) "cJE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/assembly/robotics) "cJF" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/maintenance{name = "Morgue Maintenance"; req_access_txt = "6"},/turf/simulated/floor/plating,/area/medical/morgue) @@ -7264,9 +7264,9 @@ "cJJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/assembly/robotics) "cJK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/assembly/robotics) "cJL" = (/obj/structure/flora/kirbyplants{icon_state = "plant-21"; layer = 4.1; pixel_x = -3; pixel_y = 3; tag = "icon-plant-21"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreencorner"},/area/medical/medbay3{name = "Medbay Aft"}) -"cJM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/assembly/robotics) +"cJM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/assembly/robotics) "cJN" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"cJO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/assembly/robotics) +"cJO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/assembly/robotics) "cJP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/server{name = "\improper Research Division Server Room"}) "cJQ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/turf/simulated/wall/r_wall,/area/toxins/server{name = "\improper Research Division Server Room"}) "cJR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/mixing{name = "\improper Toxins Lab"}) @@ -7286,18 +7286,18 @@ "cKf" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/camera{c_tag = "Virology - Lab"; dir = 8; network = list("SS13","Medbay")},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 6; icon_state = "whitegreen"},/area/medical/virology) "cKg" = (/obj/machinery/door/airlock/maintenance{name = "Robotics Maintenance"; req_access_txt = "29"},/turf/simulated/floor/plating,/area/assembly/robotics) "cKh" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/medical/virology) -"cKi" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating/airless,/area/space) +"cKi" = (/obj/machinery/atmospherics/components/unary/outlet_injector{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating/airless,/area/space) "cKj" = (/obj/structure/closet/emcloset,/obj/item/device/radio/intercom{pixel_x = -28; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/medical/virology) "cKk" = (/obj/machinery/camera{c_tag = "Virology - Airlock"; dir = 1; network = list("SS13","Medbay")},/obj/machinery/light,/obj/structure/closet/l3closet,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/virology) "cKl" = (/obj/structure/closet/l3closet,/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/medical/virology) -"cKm" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1; name = "virology air connector port"},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/virology) +"cKm" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1; name = "virology air connector port"},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/virology) "cKn" = (/obj/machinery/camera{c_tag = "Virology - Entrance"; dir = 8; network = list("SS13","Medbay")},/obj/machinery/light/small{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/medbay3{name = "Medbay Aft"}) "cKo" = (/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/assembly/robotics) "cKp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/assembly/robotics) "cKq" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "chapelparlourshutters"; name = "chapel shutters"},/turf/simulated/floor/plating,/area/chapel/main) "cKr" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cKs" = (/obj/effect/landmark/start{name = "Roboticist"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/assembly/robotics) -"cKt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cKt" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cKu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/rack,/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/device/healthanalyzer{pixel_x = 4; pixel_y = -4},/obj/item/device/healthanalyzer{pixel_x = 4; pixel_y = -4},/obj/item/device/healthanalyzer{pixel_x = 4; pixel_y = -4},/obj/item/device/radio/headset/headset_sci{pixel_x = -3},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/assembly/robotics) "cKv" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cKw" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7319,10 +7319,10 @@ "cKM" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/command{name = "Research Division Server Room"; req_access = null; req_access_txt = "30"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server{name = "\improper Research Division Server Room"}) "cKN" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server{name = "\improper Research Division Server Room"}) "cKO" = (/obj/machinery/camera{c_tag = "Research Division - Server Room"; dir = 2; network = list("SS13","RD"); pixel_x = 22},/obj/machinery/power/apc{dir = 1; name = "Research Division Server Room APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server{name = "\improper Research Division Server Room"}) -"cKP" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{current_temperature = 80; dir = 2; on = 1},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server{name = "\improper Research Division Server Room"}) +"cKP" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{current_temperature = 80; dir = 2; on = 1},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server{name = "\improper Research Division Server Room"}) "cKQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurple"},/area/medical/research{name = "Research Division"}) "cKR" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server{name = "\improper Research Division Server Room"}) -"cKS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server{name = "\improper Research Division Server Room"}) +"cKS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server{name = "\improper Research Division Server Room"}) "cKT" = (/turf/simulated/wall/r_wall,/area/toxins/server{name = "\improper Research Division Server Room"}) "cKU" = (/obj/structure/closet,/obj/item/weapon/storage/box/lights/mixed,/obj/item/device/flashlight,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cKV" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7358,7 +7358,7 @@ "cLz" = (/obj/structure/closet/wardrobe/robotics_black{pixel_x = 2},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/assembly/robotics) "cLA" = (/obj/machinery/door/window/eastleft{dir = 1; name = "Robotics Deliveries"; req_access_txt = "29"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/assembly/robotics) "cLB" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/crowbar,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/assembly/robotics) -"cLC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"cLC" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "cLD" = (/obj/structure/flora/kirbyplants{icon_state = "plant-10"; layer = 4.1; tag = "icon-plant-10"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "cLE" = (/turf/simulated/wall,/area/toxins/server{name = "\improper Research Division Server Room"}) "cLF" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server{name = "\improper Research Division Server Room"}) @@ -7373,7 +7373,7 @@ "cLO" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/aft{name = "Aft Maintenance"}) "cLP" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"}) "cLQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/bedsheet/medical,/obj/structure/stool/bed,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) -"cLR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) +"cLR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) "cLS" = (/obj/structure/stool/bed,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) "cLT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/medical/virology) "cLU" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Secure Lab"; req_access_txt = "47"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurplefull"; tag = "icon-whitehall (WEST)"},/area/medical/research{name = "Research Division"}) @@ -7399,7 +7399,7 @@ "cMo" = (/obj/structure/table/wood,/obj/item/weapon/spellbook/oneuse/smoke{name = "mysterious old book of "},/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater{name = "flask of holy water"; pixel_x = -2; pixel_y = 2},/obj/item/weapon/nullrod{pixel_x = 4},/obj/item/organ/heart,/obj/item/device/soulstone/anybody,/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) "cMp" = (/obj/structure/optable{name = "Robotics Operating Table"},/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -30},/obj/machinery/camera{c_tag = "Robotics - Aft"; dir = 1; network = list("SS13","RD")},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitehall"},/area/assembly/robotics) "cMq" = (/obj/machinery/computer/operating{name = "Robotics Operating Computer"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitehall"},/area/assembly/robotics) -"cMr" = (/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/door_control{id = "chapelparlourshutters"; name = "Window Shutter Control"; pixel_x = 0; pixel_y = -25; req_access_txt = "0"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main) +"cMr" = (/obj/machinery/light/small,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/door_control{id = "chapelparlourshutters"; name = "Window Shutter Control"; pixel_x = 0; pixel_y = -25; req_access_txt = "0"},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main) "cMs" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/camera{c_tag = "Departure Lounge - Port Fore"; dir = 4; network = list("SS13")},/obj/structure/flora/kirbyplants{icon_state = "plant-24"; layer = 4.1; tag = "icon-plant-24"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cMt" = (/obj/machinery/light{dir = 4},/obj/machinery/camera{c_tag = "Departure Lounge - Starboard Fore"; dir = 8; network = list("SS13")},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/structure/flora/kirbyplants{icon_state = "plant-14"; layer = 4.1; tag = "icon-plant-14"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cMu" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) @@ -7410,18 +7410,18 @@ "cMz" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server{name = "\improper Research Division Server Room"}) "cMA" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/obj/machinery/door/poddoor/preopen{id = "xeno_blastdoor"; name = "biohazard containment door"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cMB" = (/obj/machinery/r_n_d/server/core,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server{name = "\improper Research Division Server Room"}) -"cMC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 120; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server{name = "\improper Research Division Server Room"}) +"cMC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 120; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server{name = "\improper Research Division Server Room"}) "cMD" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/aft{name = "Aft Maintenance"}) "cME" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/poddoor/preopen{id = "xeno_blastdoor"; name = "biohazard containment door"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cMF" = (/obj/effect/decal/cleanable/dirt,/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"; tag = "icon-warnplate (NORTH)"},/area/maintenance/aft{name = "Aft Maintenance"}) "cMG" = (/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/machinery/light/small{dir = 1},/obj/structure/table/wood,/obj/structure/noticeboard{pixel_y = 29},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main) -"cMH" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cMH" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cMI" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cMJ" = (/obj/structure/sign/biohazard,/turf/simulated/wall,/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cMK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) +"cMK" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) "cML" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) "cMM" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) -"cMN" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) +"cMN" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/virology) "cMO" = (/obj/structure/sign/securearea,/turf/simulated/wall,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cMP" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/machinery/light{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 0; pixel_y = 29},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) "cMQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitegreen"},/area/medical/virology) @@ -7461,9 +7461,9 @@ "cNy" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cNz" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/wall,/area/medical/virology) "cNA" = (/obj/machinery/doorButtons/access_button{idDoor = "xeno_airlock_exterior"; idSelf = "xeno_airlock_control"; name = "Access Button"; pixel_x = -24; pixel_y = 0; req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "xeno_airlock_exterior"; locked = 1; name = "Secure Lab External Airlock"; req_access_txt = "55"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurplefull"; tag = "icon-whitehall (WEST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cNB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"cNB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "cNC" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) -"cND" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"cND" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "cNE" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) "cNF" = (/turf/simulated/wall,/area/chapel/office) "cNG" = (/obj/machinery/door/airlock/centcom{icon = 'icons/obj/doors/Doormaint.dmi'; layer = 2.7; name = "Crematorium Maintenance"; opacity = 1; req_access_txt = "27"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7481,7 +7481,7 @@ "cNS" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cNT" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cNU" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) -"cNV" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) +"cNV" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cNW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cNX" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cNY" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) @@ -7494,7 +7494,7 @@ "cOf" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/maintenance{req_access_txt = "0"; req_one_access_txt = "7;12;47"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cOg" = (/obj/machinery/camera{c_tag = "Departure Lounge - Port Aft"; dir = 4; network = list("SS13")},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/structure/flora/kirbyplants{icon_state = "plant-04"; layer = 4.1; tag = "icon-plant-04"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cOh" = (/obj/machinery/camera{c_tag = "Departure Lounge - Starboard Aft"; dir = 8; network = list("SS13")},/obj/machinery/light{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/obj/structure/flora/kirbyplants{icon_state = "plant-16"; layer = 4.1; tag = "icon-plant-16"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) -"cOi" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cOi" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cOj" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{dir = 8; icon_state = "warnplate"; tag = ""},/area/maintenance/aft{name = "Aft Maintenance"}) "cOk" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/aft{name = "Aft Maintenance"}) "cOl" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7514,7 +7514,7 @@ "cOz" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/effect/decal/cleanable/cobweb,/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "cOA" = (/obj/machinery/requests_console{department = "Chapel"; departmentType = 2; pixel_y = 30},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "cOB" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) -"cOC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) +"cOC" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "cOD" = (/obj/machinery/door/morgue{name = "Relic Closet"; req_access_txt = "22"},/turf/simulated/floor/plasteel{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) "cOE" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/centcom{name = "Funeral Parlour"; opacity = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cOF" = (/obj/machinery/door/airlock/maintenance{name = "Chapel Maintenance Access "; req_access_txt = "0"; req_one_access_txt = "12;27"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7528,22 +7528,22 @@ "cON" = (/obj/structure/closet/l3closet/scientist,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/camera{c_tag = "Secure Lab - Airlock"; dir = 8; network = list("SS13","RD")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cOO" = (/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Aft Maintenance APC"; pixel_y = -24},/obj/structure/cable/yellow,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cOP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cOQ" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; pixel_y = 1},/turf/simulated/floor/plating/airless,/area/space) +"cOQ" = (/obj/machinery/atmospherics/components/unary/outlet_injector{dir = 8; pixel_y = 1},/turf/simulated/floor/plating/airless,/area/space) "cOR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cOS" = (/obj/structure/stool/bed/chair,/obj/item/weapon/cigbutt,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cOT" = (/obj/structure/stool,/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/machinery/camera{c_tag = "Aft Starboard Solar Maintenance"; dir = 4; network = list("SS13")},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) -"cOU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) +"cOU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "cOV" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/light/small{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "cOW" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating/airless,/area/space) "cOX" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating/airless,/area/space) "cOY" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/centcom{name = "Funeral Parlour"; opacity = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) -"cOZ" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/doorButtons/access_button{idDoor = "xeno_airlock_interior"; idSelf = "xeno_airlock_control"; name = "Access Button"; pixel_x = 8; pixel_y = -28; req_access_txt = "0"},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cPa" = (/obj/machinery/atmospherics/unary/tank/air{dir = 1},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/virology) +"cOZ" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/doorButtons/access_button{idDoor = "xeno_airlock_interior"; idSelf = "xeno_airlock_control"; name = "Access Button"; pixel_x = 8; pixel_y = -28; req_access_txt = "0"},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cPa" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 1},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/medical/virology) "cPb" = (/obj/structure/closet/l3closet/scientist,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTHEAST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cPc" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cPd" = (/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/obj/structure/table/glass,/obj/item/stack/sheet/mineral/plasma{layer = 2.9; pixel_y = 4},/obj/item/stack/sheet/mineral/plasma{layer = 2.9; pixel_y = 4},/obj/item/stack/sheet/mineral/plasma{layer = 2.9; pixel_y = 4},/obj/item/stack/sheet/mineral/plasma{layer = 2.9; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 8; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/beaker/large{pixel_x = -3; pixel_y = 3},/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurplefull"; tag = "icon-whitehall (WEST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cPe" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 7},/obj/item/weapon/storage/box/syringes{pixel_y = 5},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurplefull"; tag = "icon-whitehall (WEST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cPf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/crema_switch{pixel_x = -25},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) +"cPf" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/crema_switch{pixel_x = -25},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "cPg" = (/obj/machinery/light/small{dir = 4},/obj/effect/landmark/start{name = "Chaplain"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "cPh" = (/obj/machinery/chem_master{pixel_x = -2; pixel_y = 1},/obj/structure/noticeboard{pixel_y = 30},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurplefull"; tag = "icon-whitehall (WEST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cPi" = (/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Chaplain"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) @@ -7568,7 +7568,7 @@ "cPB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cPC" = (/obj/structure/table/reinforced,/obj/machinery/door/window/westleft{base_state = "right"; dir = 8; icon_state = "right"; name = "Outer Window"; req_access_txt = "0"},/obj/machinery/door/window/brigdoor{dir = 4; name = "Security Desk"; req_access_txt = "1"},/obj/item/weapon/folder/red,/obj/item/weapon/pen,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cPD" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/computer/security/telescreen{desc = "Used for watching output from station security cameras."; name = "Security Camera Monitor"; network = list("SS13"); pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) -"cPE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/reagent_dispensers/peppertank{pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) +"cPE" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/reagent_dispensers/peppertank{pixel_x = 0; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cPF" = (/obj/structure/stool/bed/chair,/obj/structure/sign/map/left{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cPG" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/sign/map/right{desc = "A framed picture of the station. Clockwise from security in red at the top, you see engineering in yellow, science in purple, escape in checkered red-and-white, medbay in green, arrivals in checkered red-and-blue, and then cargo in brown."; icon_state = "map-right-MS"; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cPH" = (/obj/machinery/door/airlock/external{name = "Auxiliary Escape Airlock"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7620,7 +7620,7 @@ "cQB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access = null; req_access_txt = "10; 13"},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "cQC" = (/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitepurple"; tag = "icon-whitehall (WEST)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cQD" = (/obj/structure/table,/obj/item/weapon/folder/yellow,/obj/machinery/light/small{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) -"cQE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) +"cQE" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "cQF" = (/obj/machinery/door/airlock/centcom{layer = 2.7; name = "Crematorium"; opacity = 1; req_access_txt = "27"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "cQG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "cQH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) @@ -7641,14 +7641,14 @@ "cQX" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cQY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cQZ" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Departure Lounge Security Post"; req_access_txt = "63"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redfull"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) -"cRa" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) +"cRa" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cRb" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cRc" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "red"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cRd" = (/obj/structure/table,/obj/machinery/newscaster/security_unit{pixel_x = 29; pixel_y = 1},/obj/machinery/camera{c_tag = "Departure Lounge - Security Post"; dir = 1; network = list("SS13")},/obj/item/weapon/book/manual/wiki/security_space_law{pixel_x = -4; pixel_y = 4},/obj/item/device/taperecorder{pixel_x = 4; pixel_y = 0},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) -"cRe" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cRe" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cRf" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; tag = "icon-sink (WEST)"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurple"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cRg" = (/obj/item/seeds/moonflowerseed,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cRh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cRh" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cRi" = (/obj/item/seeds/berryseed,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cRj" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cRk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) @@ -7656,7 +7656,7 @@ "cRm" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "cRn" = (/obj/structure/closet/wardrobe/chaplain_black,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "cRo" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) -"cRp" = (/obj/machinery/power/apc{dir = 2; lighting = 3; name = "Chapel Office APC"; pixel_x = 0; pixel_y = -25},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) +"cRp" = (/obj/machinery/power/apc{dir = 2; lighting = 3; name = "Chapel Office APC"; pixel_x = 0; pixel_y = -25},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "cRq" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "cRr" = (/obj/machinery/door/morgue{name = "Confession Booth (Chaplain)"; req_access_txt = "22"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "cRs" = (/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25},/obj/structure/stool/bed/chair{dir = 1},/obj/effect/landmark/start{name = "Chaplain"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) @@ -7667,7 +7667,7 @@ "cRx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/stool,/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/chapel/main) "cRy" = (/obj/structure/stool,/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/chapel/main) "cRz" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/chapel/main) -"cRA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) +"cRA" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cRB" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cRC" = (/obj/structure/stool/bed/chair{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cRE" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) @@ -7684,7 +7684,7 @@ "cRP" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/ambrosiavulgarisseed,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cRQ" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/watermelonseed,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cRR" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/berryseed,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) -"cRS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cRS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cRT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/chapel/office) "cRU" = (/obj/machinery/door/airlock/centcom{name = "Chapel Office"; opacity = 1; req_access_txt = "27"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "cRV" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/chapel/main) @@ -7693,12 +7693,12 @@ "cRY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/stool,/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/chapel/main) "cRZ" = (/obj/structure/stool,/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/chapel/main) "cSa" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/chapel/main) -"cSb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) +"cSb" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cSc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cSd" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cSe" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cSf" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/extinguisher{pixel_x = 4; pixel_y = 3},/obj/item/weapon/extinguisher,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurple"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cSg" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1; name = "xenobiology air connector port"},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (SOUTHWEST)"; icon_state = "whitepurple"; dir = 10},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cSg" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1; name = "xenobiology air connector port"},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{tag = "icon-whitepurple (SOUTHWEST)"; icon_state = "whitepurple"; dir = 10},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cSh" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cSi" = (/obj/machinery/disposal,/obj/structure/sign/deathsposal{pixel_x = 0; pixel_y = -32},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurple"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cSj" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) @@ -7732,7 +7732,7 @@ "cSL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cSM" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 21},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cSN" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) -"cSO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"cSO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "cSP" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cSQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/chapel/main) "cSR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/chapel/main) @@ -7766,10 +7766,10 @@ "cTt" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/obj/machinery/camera{c_tag = "Chapel - Starboard"; dir = 8; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/chapel/main) "cTu" = (/obj/structure/sign/vacuum{pixel_x = -32},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cTv" = (/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) -"cTw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) +"cTw" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cTx" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cTy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) -"cTz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) +"cTz" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cTA" = (/obj/structure/sign/vacuum{pixel_x = 32},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cTB" = (/obj/structure/window/reinforced,/obj/structure/table/reinforced,/obj/machinery/door_control{id = "xenobio8"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access_txt = "55"},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cTC" = (/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) @@ -7780,7 +7780,7 @@ "cTH" = (/obj/machinery/door/window/northleft{dir = 4; name = "Containment Pen #1"; req_access_txt = "55"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cTI" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cTJ" = (/obj/effect/landmark/start{name = "Chaplain"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) -"cTK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/chapel/main) +"cTK" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/chapel/main) "cTL" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cTM" = (/obj/machinery/door/airlock/external{name = "Departure Lounge Airlock"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cTN" = (/obj/machinery/door/window/northleft{dir = 4; name = "Containment Pen #2"; req_access_txt = "55"},/obj/machinery/door/poddoor/preopen{id = "xenobio8"; name = "containment blast door"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) @@ -7789,7 +7789,7 @@ "cTQ" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/door/poddoor/preopen{id = "xenobio3"; name = "containment blast door"},/turf/simulated/floor/plating,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cTR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warnwhitecorner"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cTS" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "xenobio3"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access_txt = "55"},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cTT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warnwhitecorner"; icon_state = "warnwhitecorner"; dir = 2},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cTT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warnwhitecorner"; icon_state = "warnwhitecorner"; dir = 2},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cTU" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cTV" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/cable/yellow,/obj/machinery/door/poddoor/preopen{id = "xenobio8"; name = "containment blast door"},/turf/simulated/floor/plating,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cTW" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) @@ -7829,7 +7829,7 @@ "cUE" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUF" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUG" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/door/poddoor/preopen{id = "xenobio1"; name = "containment blast door"},/turf/simulated/floor/plating,/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cUH" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cUH" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUI" = (/obj/machinery/light{dir = 1},/obj/machinery/door_control{id = "xenobio1"; name = "Containment Blast Doors"; pixel_x = -24; pixel_y = 24; req_access_txt = "55"},/turf/simulated/floor/plasteel{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUJ" = (/obj/structure/window/reinforced,/obj/machinery/door_control{id = "xenobio6"; name = "Containment Blast Doors"; pixel_x = 24; pixel_y = 24; req_access_txt = "55"},/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal,/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUK" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) @@ -7841,14 +7841,14 @@ "cUQ" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUR" = (/obj/machinery/door/window/northleft{dir = 4; name = "Containment Pen #6"; req_access_txt = "55"},/obj/machinery/door/poddoor/preopen{id = "xenobio6"; name = "containment blast door"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUS" = (/obj/machinery/door/poddoor{id = "chapelgun"; name = "Chapel Launcher Door"},/turf/simulated/floor/plating,/area/chapel/main) -"cUT" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cUT" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUU" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/cable/yellow,/obj/machinery/door/poddoor/preopen{id = "xenobio1"; name = "containment blast door"},/turf/simulated/floor/plating,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cUW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cUW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/components/binary/pump{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUX" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cUY" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cUZ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cVa" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/binary/pump{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cUZ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cVa" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/components/binary/pump{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cVb" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cVc" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/door/poddoor/preopen{id = "xenobio6"; name = "containment blast door"},/turf/simulated/floor/plating,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cVd" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/camera{c_tag = "Secure Lab - Aft-Port"; dir = 4; network = list("SS13","RD")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) @@ -7882,7 +7882,7 @@ "cVF" = (/obj/structure/disposaloutlet{dir = 2},/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cVG" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 10},/obj/item/device/electropack,/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cVH" = (/obj/machinery/sparker{id = "Xenobio"; pixel_x = -25},/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) -"cVI" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; unacidable = 1},/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) +"cVI" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; unacidable = 1},/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cVJ" = (/obj/item/device/radio/beacon,/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cVK" = (/obj/structure/table,/obj/machinery/cell_charger{pixel_y = 5},/obj/item/stack/cable_coil,/obj/item/device/multitool,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cVL" = (/obj/effect/decal/remains/xeno,/turf/simulated/floor/engine,/area/toxins/xenobiology{name = "\improper Secure Lab"}) diff --git a/_maps/map_files/MetaStation/z4.dmm b/_maps/map_files/MetaStation/z4.dmm index 28ec3f8ad01..c1864973f23 100644 --- a/_maps/map_files/MetaStation/z4.dmm +++ b/_maps/map_files/MetaStation/z4.dmm @@ -265,8 +265,8 @@ "fe" = (/obj/machinery/field/generator,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "ff" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/bridge/access) "fg" = (/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plasteel,/area/derelict/bridge/access) -"fh" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/derelict/bridge) -"fi" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/derelict/bridge) +"fh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/derelict/bridge) +"fi" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/derelict/bridge) "fj" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/bridge) "fk" = (/obj/item/stack/rods,/turf/simulated/floor/plating/airless,/area/space) "fl" = (/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) @@ -334,7 +334,7 @@ "gv" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel/airless{icon_state = "damaged3"},/area/derelict/singularity_engine) "gw" = (/obj/machinery/door/window,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/derelict/bridge/access) "gx" = (/obj/structure/table,/turf/simulated/floor/plasteel/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) -"gy" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) +"gy" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "gz" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "gA" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plasteel/airless{icon_state = "damaged5"},/area/derelict/singularity_engine) "gB" = (/obj/structure/grille,/turf/simulated/floor/plasteel/airless{icon_state = "damaged3"},/area/derelict/singularity_engine) @@ -367,8 +367,8 @@ "hc" = (/turf/simulated/floor/plasteel/airless,/area/space) "hd" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) "he" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) -"hf" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) -"hg" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) +"hf" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) +"hg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "hh" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "hi" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) "hj" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) @@ -459,7 +459,7 @@ "iQ" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/derelict/medical/chapel) "iR" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) "iS" = (/obj/structure/table,/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/derelict/medical/chapel) -"iT" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) +"iT" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) "iU" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/derelict/medical/chapel) "iV" = (/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) "iW" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel/airless{icon_state = "damaged3"},/area/derelict/medical) @@ -472,8 +472,8 @@ "jd" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/derelict/medical/chapel) "je" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/derelict/medical/chapel) "jf" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/derelict/medical/chapel) -"jg" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel) -"jh" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel) +"jg" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel) +"jh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel) "ji" = (/obj/machinery/sleeper{tag = "icon-sleeper-open (EAST)"; icon_state = "sleeper-open"; dir = 4},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) "jj" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) "jk" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) @@ -503,7 +503,7 @@ "jI" = (/obj/structure/table,/turf/simulated/floor/plating/airless,/area/space) "jJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) "jK" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel,/area/derelict/arrival) -"jL" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) +"jL" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) "jM" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/wall,/area/derelict/medical/chapel) "jN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall,/area/derelict/medical/chapel) "jO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) @@ -518,7 +518,7 @@ "jX" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/space) "jY" = (/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/space) "jZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) -"ka" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless{icon_state = "damaged2"},/area/derelict/hallway/primary) +"ka" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless{icon_state = "damaged2"},/area/derelict/hallway/primary) "kb" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) "kc" = (/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/derelict/arrival) "kd" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/derelict/medical/chapel) @@ -569,8 +569,8 @@ "kW" = (/turf/simulated/floor/plating/airless,/area/derelict/medical/chapel) "kX" = (/turf/simulated/floor/plasteel/airless{icon_state = "damaged3"},/area/derelict/medical/chapel) "kY" = (/obj/machinery/door/airlock/command{name = "Teleporter Room"},/turf/simulated/floor/plasteel/airless,/area/derelict/medical/chapel) -"kZ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) -"la" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) +"kZ" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) +"la" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) "lb" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) "lc" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) "ld" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) @@ -634,14 +634,14 @@ "mj" = (/turf/simulated/floor/plasteel/airless{icon_state = "floorgrime"},/area/derelict/hallway/primary) "mk" = (/turf/simulated/floor/plasteel/airless{icon_state = "damaged5"},/area/derelict/hallway/primary) "ml" = (/obj/structure/table,/obj/item/device/healthanalyzer,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) -"mm" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/atmospherics) +"mm" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/atmospherics) "mn" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plating,/area/derelict/atmospherics) -"mo" = (/obj/machinery/atmospherics/unary/portables_connector/visible{tag = "icon-connector_map (WEST)"; icon_state = "connector_map"; dir = 8},/turf/simulated/floor/plating,/area/derelict/atmospherics) +"mo" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{tag = "icon-connector_map (WEST)"; icon_state = "connector_map"; dir = 8},/turf/simulated/floor/plating,/area/derelict/atmospherics) "mp" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Access"; req_access_txt = "24"},/turf/simulated/floor/plating/airless,/area/derelict/atmospherics) "mq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/space) "mr" = (/obj/structure/closet/wardrobe/mixed,/turf/simulated/floor/plasteel,/area/derelict/arrival) "ms" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/stock_parts/cell/hyper,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) -"mt" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/atmospherics) +"mt" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/atmospherics) "mu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plating,/area/derelict/atmospherics) "mv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/plating,/area/derelict/atmospherics) "mw" = (/turf/simulated/floor/plasteel/airless,/area/derelict/atmospherics) @@ -678,12 +678,12 @@ "nb" = (/obj/structure/lattice,/turf/space,/area/derelict/atmospherics) "nc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/wirecutters,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) "nd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) -"ne" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) +"ne" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) "nf" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plating,/area/derelict/atmospherics) "ng" = (/turf/simulated/floor/plasteel/airless{icon_state = "damaged3"},/area/derelict/atmospherics) "nh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) "ni" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) -"nj" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) +"nj" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) "nk" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/derelict/atmospherics) "nl" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plasteel,/area/derelict/atmospherics) "nm" = (/turf/simulated/floor/plasteel{tag = "icon-damaged1"; icon_state = "damaged1"},/area/derelict/atmospherics) @@ -700,7 +700,7 @@ "nx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) "ny" = (/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) "nz" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) -"nA" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) +"nA" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) "nB" = (/obj/machinery/power/apc{dir = 1; name = "Worn-out APC"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/atmospherics) "nC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) "nD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel/airless{icon_state = "derelict9"},/area/derelict/hallway/secondary) @@ -721,7 +721,7 @@ "nS" = (/obj/item/drone_shell,/turf/simulated/floor/plasteel/airless{icon_state = "derelict6"},/area/derelict/hallway/secondary) "nT" = (/turf/simulated/floor/plasteel/airless{icon_state = "derelict7"},/area/derelict/hallway/secondary) "nU" = (/turf/simulated/floor/plasteel/airless{icon_state = "derelict8"},/area/derelict/hallway/secondary) -"nV" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) +"nV" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) "nW" = (/obj/structure/lattice,/turf/space,/area/derelict/hallway/secondary) "nX" = (/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) "nY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) @@ -749,7 +749,7 @@ "ou" = (/obj/docking_port/stationary{dheight = 0; dir = 2; dwidth = 11; height = 15; id = "whiteship_z4"; name = "KC13: Space, Station-Aft"; width = 27},/turf/space,/area/space) "ov" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "ow" = (/turf/simulated/floor/plating/airless,/area/derelict/se_solar) -"ox" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) +"ox" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "oy" = (/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "oz" = (/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "oA" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/machinery/power/solar_control{id = "derelictsolar"; name = "Primary Solar Control"; track = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) @@ -765,7 +765,7 @@ "oK" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "oL" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "oM" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) -"oN" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/rack,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/weapon/storage/backpack/dufflebag,/obj/item/weapon/storage/backpack/dufflebag,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) +"oN" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/rack,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/weapon/storage/backpack/dufflebag,/obj/item/weapon/storage/backpack/dufflebag,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "oO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/external,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "oP" = (/obj/structure/cable,/obj/structure/lattice/catwalk,/turf/space,/area/solar/derelict_aft) "oQ" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/lattice/catwalk,/turf/space,/area/solar/derelict_aft) diff --git a/_maps/map_files/MetaStation/z5.dmm b/_maps/map_files/MetaStation/z5.dmm index 9385eaa1e89..337a57476bf 100644 --- a/_maps/map_files/MetaStation/z5.dmm +++ b/_maps/map_files/MetaStation/z5.dmm @@ -70,7 +70,7 @@ "br" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/port_gen/pacman{anchored = 1},/turf/simulated/floor/plating,/area/mine/north_outpost) "bs" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/mine/north_outpost) "bt" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes{charge = 5e+006},/turf/simulated/floor/plating,/area/mine/north_outpost) -"bu" = (/obj/machinery/atmospherics/unary/tank/air,/turf/simulated/floor/plating,/area/mine/north_outpost) +"bu" = (/obj/machinery/atmospherics/components/unary/tank/air,/turf/simulated/floor/plating,/area/mine/north_outpost) "bv" = (/obj/effect/decal/remains/human,/turf/simulated/floor/plasteel/airless{icon_state = "damaged5"},/area/mine/abandoned) "bw" = (/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/obj/structure/alien/weeds,/turf/simulated/floor/plasteel/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "bx" = (/obj/structure/alien/weeds/node,/turf/simulated/floor/plasteel/airless{icon_state = "floorscorched2"},/area/mine/abandoned) @@ -121,7 +121,7 @@ "cq" = (/turf/simulated/floor/plasteel{icon_state = "damaged3"},/area/mine/abandoned) "cr" = (/obj/structure/ore_box,/turf/simulated/floor/plating/asteroid/airless,/area/mine/explored) "cs" = (/obj/structure/table,/obj/item/weapon/storage/backpack/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light/small{dir = 8},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/plasteel,/area/mine/north_outpost) -"ct" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/north_outpost) +"ct" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cu" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cv" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/machinery/door/airlock/glass_mining{name = "Break Room"; req_access_txt = "54"},/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cw" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4},/turf/simulated/floor/plasteel,/area/mine/north_outpost) @@ -139,7 +139,7 @@ "cI" = (/obj/effect/decal/remains/xeno,/turf/simulated/floor/plasteel/airless,/area/mine/abandoned) "cJ" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cK" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel,/area/mine/north_outpost) -"cL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/north_outpost) +"cL" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cM" = (/obj/structure/rack,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/mine/north_outpost) "cN" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/mine/north_outpost) "cO" = (/obj/structure/alien/weeds/node,/turf/simulated/floor/plasteel/airless{icon_state = "floorgrime"},/area/mine/abandoned) @@ -193,7 +193,7 @@ "dK" = (/obj/structure/sign/bluecross_2{pixel_y = 32},/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "white"; temperature = 273.15},/area/mine/laborcamp) "dL" = (/obj/machinery/camera{c_tag = "Labor Camp Medical"; dir = 8; network = list("Labor")},/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor/plasteel{icon_state = "white"; temperature = 273.15},/area/mine/laborcamp) "dM" = (/turf/simulated/wall,/area/mine/laborcamp) -"dN" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) +"dN" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "dO" = (/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "dP" = (/turf/simulated/wall,/area/mine/explored) "dQ" = (/turf/simulated/floor/plating/asteroid{temperature = 273.15},/area/mine/explored) @@ -206,7 +206,7 @@ "dX" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 1},/area/mine/explored) "dY" = (/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 5},/area/mine/explored) "dZ" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) -"ea" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) +"ea" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) "eb" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=1-Storage"; location = "Sleeper"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) "ec" = (/obj/machinery/light/small{dir = 4},/obj/structure/stool/bed/roller,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) "ed" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/closet/crate/internals,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) @@ -249,7 +249,7 @@ "eO" = (/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/unexplored) "eP" = (/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 6},/area/mine/unexplored) "eQ" = (/obj/machinery/vending/sustenance,/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) -"eR" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) +"eR" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "eS" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/wall,/area/mine/laborcamp) "eT" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "eU" = (/obj/machinery/flasher{id = "Labor"; pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold{dir = 4},/turf/simulated/wall,/area/mine/laborcamp) @@ -325,16 +325,16 @@ "gm" = (/obj/structure/plasticflaps/mining,/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/wall,/area/mine/laborcamp/security) "gn" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=4-Maint"; location = "3-SMine"},/turf/simulated/floor/plasteel{icon_state = "asteroidfloor"; temperature = 273.15},/area/mine/laborcamp) "go" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/closet/crate,/turf/simulated/floor/plasteel{icon_state = "asteroidfloor"; temperature = 273.15},/area/mine/explored) -"gp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/closet/crate,/turf/simulated/floor/plating/asteroid{temperature = 273.15},/area/mine/explored) +"gp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/closet/crate,/turf/simulated/floor/plating/asteroid{temperature = 273.15},/area/mine/explored) "gq" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/explored) "gr" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/mine/laborcamp/security) "gs" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) "gt" = (/obj/structure/stool/bed/chair/office/dark,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) -"gu" = (/obj/machinery/door_control{id = "Labor"; name = "Labor Camp Lockdown"; pixel_x = 28; pixel_y = 7; req_access_txt = "2"},/obj/machinery/flasher_button{id = "Labor"; pixel_x = 26; pixel_y = -3},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) +"gu" = (/obj/machinery/door_control{id = "Labor"; name = "Labor Camp Lockdown"; pixel_x = 28; pixel_y = 7; req_access_txt = "2"},/obj/machinery/flasher_button{id = "Labor"; pixel_x = 26; pixel_y = -3},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) "gv" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/mine/laborcamp/security) "gw" = (/turf/simulated/floor/plating,/area/mine/laborcamp/security) "gx" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8},/obj/machinery/meter,/turf/simulated/floor/plating,/area/mine/laborcamp/security) -"gy" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/mine/laborcamp/security) +"gy" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/mine/laborcamp/security) "gz" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/mine/laborcamp/security) "gA" = (/obj/structure/table,/obj/machinery/recharger,/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) "gB" = (/obj/machinery/computer/secure_data,/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) @@ -371,7 +371,7 @@ "hg" = (/turf/simulated/floor/bluegrid,/area/mine/maintenance) "hh" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 1; name = "Mining Communications APC"; pixel_x = 1; pixel_y = 25},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/mine/maintenance) "hi" = (/obj/machinery/telecomms/relay/preset/mining,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/mine/maintenance) -"hj" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/mine/maintenance) +"hj" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/mine/maintenance) "hk" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/space,/area/mine/explored) "hl" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/space,/area/mine/explored) "hm" = (/obj/structure/lattice,/turf/space,/area/mine/explored) @@ -451,7 +451,7 @@ "iI" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/mine/living_quarters) "iJ" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/mine/living_quarters) "iK" = (/turf/simulated/floor/plasteel,/area/mine/living_quarters) -"iL" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/mine/living_quarters) +"iL" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/mine/living_quarters) "iM" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/table,/obj/item/weapon/pickaxe,/turf/simulated/floor/plasteel,/area/mine/eva) "iN" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/suit_storage_unit/mining,/turf/simulated/floor/plasteel,/area/mine/eva) "iO" = (/obj/machinery/suit_storage_unit/mining,/turf/simulated/floor/plasteel,/area/mine/eva) @@ -477,13 +477,13 @@ "ji" = (/obj/machinery/atmospherics/pipe/simple{dir = 6},/obj/machinery/camera{c_tag = "EVA"; dir = 4; network = list("MINE")},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table,/obj/item/device/gps/mining,/obj/item/device/gps/mining,/obj/item/device/gps/mining,/obj/item/device/gps/mining,/turf/simulated/floor/plasteel,/area/mine/eva) "jj" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/mine/eva) "jk" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/eva) -"jl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor/plasteel,/area/mine/eva) +"jl" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor/plasteel,/area/mine/eva) "jm" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plasteel,/area/mine/west_outpost) -"jn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) +"jn" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) "jo" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/mine/west_outpost) "jp" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) "jq" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/west_outpost) -"jr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) +"jr" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) "js" = (/obj/machinery/conveyor_switch{id = "mining_west"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/mine/west_outpost) "jt" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/mine/living_quarters) "ju" = (/obj/machinery/door/airlock/glass{name = "Crew Area"; req_access_txt = "48"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/mine/living_quarters) @@ -547,7 +547,7 @@ "kA" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/mine/production) "kB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/airlock/glass_mining{name = "Mining Station Bridge"; req_access_txt = "48"},/turf/simulated/floor/plasteel,/area/mine/production) "kC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/mine/production) -"kD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) +"kD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) "kE" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/production) "kF" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/mine/production) "kG" = (/obj/machinery/power/apc{dir = 2; name = "Mining EVA APC"; pixel_x = 1; pixel_y = -23},/obj/structure/cable,/obj/structure/table,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/weapon/hand_labeler,/turf/simulated/floor/plasteel,/area/mine/eva) @@ -582,7 +582,7 @@ "lj" = (/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/production) "lk" = (/obj/machinery/conveyor_switch{id = "mining_external"},/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/production) "ll" = (/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/production) -"lm" = (/obj/machinery/atmospherics/unary/tank/air{dir = 1; initialize_directions = 0; level = 1},/turf/simulated/floor/plating,/area/mine/west_outpost) +"lm" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 1; initialize_directions = 0; level = 1},/turf/simulated/floor/plating,/area/mine/west_outpost) "ln" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/west_outpost) "lo" = (/obj/machinery/power/terminal{dir = 4},/obj/machinery/light/small,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/mine/west_outpost) "lp" = (/obj/structure/cable,/obj/machinery/power/smes{charge = 5e+006},/turf/simulated/floor/plating,/area/mine/west_outpost) @@ -622,12 +622,12 @@ "lX" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/production) "lY" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty{pixel_x = -3; pixel_y = -3},/obj/item/weapon/reagent_containers/blood/AMinus,/obj/item/weapon/reagent_containers/blood/BMinus{pixel_x = -4; pixel_y = 4},/obj/item/weapon/reagent_containers/blood/BPlus{pixel_x = 1; pixel_y = 2},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OPlus{pixel_x = -2; pixel_y = -1},/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/turf/simulated/floor/plasteel{icon_state = "white"},/area/mine/living_quarters) "lZ" = (/obj/machinery/iv_drip,/turf/simulated/floor/plasteel{icon_state = "white"},/area/mine/living_quarters) -"ma" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Sleeper Room"; dir = 1; network = list("MINE")},/turf/simulated/floor/plasteel{icon_state = "white"; temperature = 273.15},/area/mine/living_quarters) +"ma" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Sleeper Room"; dir = 1; network = list("MINE")},/turf/simulated/floor/plasteel{icon_state = "white"; temperature = 273.15},/area/mine/living_quarters) "mb" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/brute{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/mine/living_quarters) "mc" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/mine/living_quarters) "md" = (/turf/simulated/floor/plating,/area/mine/living_quarters) "me" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8},/obj/machinery/meter,/turf/simulated/floor/plating,/area/mine/living_quarters) -"mf" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/mine/living_quarters) +"mf" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/mine/living_quarters) "mg" = (/obj/structure/ore_box,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/mine/living_quarters) "mh" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/mine/living_quarters) "mi" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/mine/living_quarters) @@ -658,7 +658,7 @@ "mH" = (/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/mine/production) "mI" = (/obj/machinery/computer/shuttle/mining{req_access = "0"},/obj/machinery/light{dir = 4},/obj/machinery/camera{c_tag = "Shuttle Docking Foyer"; dir = 8; network = list("MINE")},/obj/machinery/newscaster{pixel_x = 30; pixel_y = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/mine/production) "mJ" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/mine/production) -"mK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) +"mK" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) "mL" = (/obj/machinery/camera{c_tag = "Processing Area Room"; dir = 8; network = list("MINE")},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/mine/production) "mM" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/mine/production) "mN" = (/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "mining_away"; name = "asteroid mine"; width = 7},/turf/space,/area/space) @@ -681,7 +681,7 @@ "ne" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/mine/production) "nf" = (/obj/machinery/mineral/processing_unit_console,/turf/simulated/wall/r_wall,/area/mine/production) "ng" = (/obj/machinery/mineral/processing_unit{dir = 1; output_dir = 2},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 9},/area/mine/production) -"nh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) +"nh" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) "ni" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/mine/production) "nj" = (/obj/machinery/door/airlock/glass_mining{name = "Processing Area"; req_access_txt = "48"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/mine/production) "nk" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/mine/production) diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm index 790d303ec4f..c8e5aad5690 100644 --- a/_maps/map_files/MiniStation/MiniStation.dmm +++ b/_maps/map_files/MiniStation/MiniStation.dmm @@ -31,7 +31,7 @@ "aE" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/plasteel,/area/bridge) "aF" = (/obj/structure/displaycase,/turf/simulated/floor/plasteel,/area/bridge) "aG" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel,/area/bridge) -"aH" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/bridge) +"aH" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/bridge) "aI" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/bridge) "aJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/table/reinforced,/turf/simulated/floor/plasteel,/area/bridge) "aK" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/yellow,/obj/item/weapon/disk/nuclear,/turf/simulated/floor/plasteel,/area/bridge) @@ -63,7 +63,7 @@ "bk" = (/obj/item/weapon/storage/bag/ore,/turf/simulated/floor/plating/airless,/area/quartermaster/storage) "bl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/bridge) "bm" = (/turf/simulated/mineral/random/high_chance,/area/mine/unexplored) -"bn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/bridge) +"bn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/bridge) "bo" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_command{name = "Bridge"; req_access_txt = "19"},/turf/simulated/floor/plasteel,/area/bridge) "bp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/bridge) "bq" = (/turf/simulated/wall,/area/quartermaster/storage) @@ -91,7 +91,7 @@ "bM" = (/obj/machinery/door/airlock/external{req_access_txt = "13"},/turf/simulated/floor/plating,/area/hallway/primary/central) "bN" = (/turf/simulated/floor/plating,/area/hallway/primary/central) "bO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/hallway/primary/central) -"bP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "blue"},/area/bridge) +"bP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "blue"},/area/bridge) "bQ" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/storage) "bR" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 0; icon_state = "blue"},/area/bridge) "bS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -109,7 +109,7 @@ "ce" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 0},/turf/simulated/wall,/area/quartermaster/storage) "cf" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central) "cg" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 0; icon_state = "blue"},/area/bridge) -"ch" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 0; icon_state = "blue"},/area/bridge) +"ch" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 0; icon_state = "blue"},/area/bridge) "ci" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central) "cj" = (/turf/simulated/wall/r_wall,/area/security/brig) "ck" = (/turf/simulated/wall,/area/security/brig) @@ -163,7 +163,7 @@ "dg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/security/brig) "dh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/closet{name = "Contraband Locker"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/security/brig) "di" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/security/brig) -"dj" = (/obj/structure/rack,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/riot,/obj/item/clothing/head/helmet/riot,/obj/item/clothing/head/helmet/riot,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/item/weapon/shield/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/shield/riot,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"dj" = (/obj/structure/rack,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/riot,/obj/item/clothing/head/helmet/riot,/obj/item/clothing/head/helmet/riot,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/item/weapon/shield/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/shield/riot,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "dk" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "xenobio2"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access_txt = "55"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/medical/research{name = "Research Division"}) "dl" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/poddoor/preopen{id = "xenobio8"; name = "containment blast door"},/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/engine,/area/medical/research{name = "Research Division"}) "dm" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/medical/research{name = "Research Division"}) @@ -239,7 +239,7 @@ "eE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/obj/item/device/multitool,/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 0; pixel_y = 30},/obj/item/clothing/head/soft,/turf/simulated/floor/plasteel,/area/quartermaster/storage) "eF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table,/obj/machinery/cell_charger,/obj/machinery/camera/autoname,/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "eG" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/stamp{pixel_x = -3; pixel_y = 3},/obj/item/weapon/stamp/denied{pixel_x = 4; pixel_y = -2},/obj/item/weapon/pen/red,/turf/simulated/floor/plasteel,/area/quartermaster/storage) -"eH" = (/obj/structure/rack,/obj/item/clothing/suit/armor/laserproof,/obj/item/clothing/suit/armor/reactive,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"eH" = (/obj/structure/rack,/obj/item/clothing/suit/armor/laserproof,/obj/item/clothing/suit/armor/reactive,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "eI" = (/turf/simulated/floor/plasteel{icon_state = "bot"},/area/hallway/primary/central) "eJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/brig) "eK" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/hallway/primary/central) @@ -258,15 +258,15 @@ "eX" = (/turf/simulated/wall,/area/space) "eY" = (/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/space) "eZ" = (/obj/structure/rack,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe{pixel_x = 5},/obj/item/weapon/shovel{pixel_x = -5},/obj/item/weapon/shovel{pixel_x = -5},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/storage) -"fa" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) +"fa" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "fb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/storage) "fc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/storage) -"fd" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) +"fd" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "fe" = (/obj/structure/closet/secure_closet/miner,/turf/simulated/floor/plasteel{dir = 4; icon_state = "brown"},/area/quartermaster/storage) "ff" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/filingcabinet,/turf/simulated/floor/plasteel,/area/quartermaster/storage) "fg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/computer/supplycomp,/turf/simulated/floor/plasteel{dir = 2; icon_state = "yellowcorner"},/area/quartermaster/storage) "fh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/brig) -"fi" = (/obj/structure/closet/secure_closet/brig{id = "Cell 2"; name = "Cell 2 Locker"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) +"fi" = (/obj/structure/closet/secure_closet/brig{id = "Cell 2"; name = "Cell 2 Locker"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) "fj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "fk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/hallway/primary/central) "fl" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "xenobio1"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access_txt = "55"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/medical/research{name = "Research Division"}) @@ -274,9 +274,9 @@ "fn" = (/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/brig) "fo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/security/brig) "fp" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) -"fq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"fq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "fr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light/small{dir = 1},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/plasteel,/area/security/brig) -"fs" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/closet/secure_closet/brig{id = "Cell 2"; name = "Cell 2 Locker"},/turf/simulated/floor/plasteel,/area/security/brig) +"fs" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/closet/secure_closet/brig{id = "Cell 2"; name = "Cell 2 Locker"},/turf/simulated/floor/plasteel,/area/security/brig) "ft" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_mining{name = "Cargo Bay"; req_access_txt = "31"},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "fu" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Xenobiology Lab"; req_access_txt = "7"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "fv" = (/obj/effect/landmark/start{name = "Scientist"},/obj/structure/stool,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -297,19 +297,19 @@ "fK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/brig) "fL" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "fM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/brig) -"fN" = (/obj/machinery/photocopier,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "cautioncorner"; dir = 4},/area/quartermaster/storage) +"fN" = (/obj/machinery/photocopier,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "cautioncorner"; dir = 4},/area/quartermaster/storage) "fO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/security/brig) "fP" = (/obj/machinery/r_n_d/server/core,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/research{name = "Research Division"}) "fQ" = (/obj/machinery/flasher{id = "Cell 2"; pixel_x = 28},/turf/simulated/floor/plasteel,/area/security/brig) -"fR" = (/obj/structure/table,/obj/item/weapon/extinguisher{pixel_x = 4; pixel_y = 3},/obj/item/weapon/extinguisher,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"fS" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"fR" = (/obj/structure/table,/obj/item/weapon/extinguisher{pixel_x = 4; pixel_y = 3},/obj/item/weapon/extinguisher,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"fS" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "fT" = (/obj/structure/table,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/machinery/light,/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"fU" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"fU" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "fV" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_mining{name = "Cargo Office"; req_access_txt = "31"},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "fW" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/secondary/exit) "fX" = (/turf/simulated/floor/plasteel,/area/hallway/primary/central) "fY" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"fZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"fZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "ga" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/central) "gb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/closet/secure_closet/security,/turf/simulated/floor/plasteel,/area/security/brig) "gc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/security/brig) @@ -319,11 +319,11 @@ "gg" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Security Officer"},/turf/simulated/floor/plasteel,/area/security/brig) "gh" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/security/brig) "gi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) -"gj" = (/obj/structure/stool/bed,/obj/item/weapon/book/manual/wiki/security_space_law,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) +"gj" = (/obj/structure/stool/bed,/obj/item/weapon/book/manual/wiki/security_space_law,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) "gk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door_timer{dir = 4; id = "Cell 2"; name = "Cell 2"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) -"gl" = (/obj/machinery/computer/secure_data,/obj/machinery/camera/autoname{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) -"gm" = (/obj/machinery/vending/security,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) -"gn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/brig) +"gl" = (/obj/machinery/computer/secure_data,/obj/machinery/camera/autoname{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) +"gm" = (/obj/machinery/vending/security,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/brig) +"gn" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/brig) "go" = (/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"}) "gp" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/weapon/crowbar/red,/turf/simulated/floor/plasteel{icon_state = "whitepurple"; dir = 8},/area/medical/research{name = "Research Division"}) "gq" = (/obj/structure/table,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -333,9 +333,9 @@ "gu" = (/obj/machinery/door_control{dir = 2; id = "rnd"; name = "Shutters Control Button"; pixel_x = -24; pixel_y = -6},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_x = -27; pixel_y = 3},/turf/simulated/floor/plasteel{icon_state = "whitepurple"; dir = 8},/area/medical/research{name = "Research Division"}) "gv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/medical/research{name = "Research Division"}) "gw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/medical/research{name = "Research Division"}) -"gx" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 120; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/turf/simulated/floor/bluegrid,/area/medical/research{name = "Research Division"}) +"gx" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; external_pressure_bound = 120; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/turf/simulated/floor/bluegrid,/area/medical/research{name = "Research Division"}) "gy" = (/obj/structure/closet/crate,/obj/machinery/camera/autoname{dir = 8},/obj/item/weapon/ore/glass,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/quartermaster/storage) -"gz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 140; on = 1; pressure_checks = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/turf/simulated/floor/bluegrid,/area/medical/research{name = "Research Division"}) +"gz" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; external_pressure_bound = 140; on = 1; pressure_checks = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/turf/simulated/floor/bluegrid,/area/medical/research{name = "Research Division"}) "gA" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA"; pixel_y = 0},/turf/simulated/wall,/area/quartermaster/storage) "gB" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "cautioncorner"},/area/quartermaster/storage) "gC" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/plasteel,/area/quartermaster/storage) @@ -345,9 +345,9 @@ "gG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Security Officer"},/turf/simulated/floor/plasteel,/area/security/brig) "gH" = (/obj/structure/table,/obj/item/weapon/storage/box/chemimp{pixel_x = 4; pixel_y = 3},/obj/item/weapon/storage/box/trackimp,/turf/simulated/floor/plasteel,/area/security/brig) "gI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/security/brig) -"gJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/brig) +"gJ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/brig) "gK" = (/obj/machinery/computer/security/wooden_tv,/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/brig) -"gL" = (/obj/structure/table/wood,/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/item/device/taperecorder{pixel_y = 0},/obj/machinery/camera/autoname,/obj/item/weapon/folder/yellow,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/carpet,/area/security/brig) +"gL" = (/obj/structure/table/wood,/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/item/device/taperecorder{pixel_y = 0},/obj/machinery/camera/autoname,/obj/item/weapon/folder/yellow,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/carpet,/area/security/brig) "gM" = (/obj/item/weapon/storage/secure/safe{pixel_x = 4; pixel_y = 26},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/carpet,/area/security/brig) "gN" = (/obj/machinery/mineral/ore_redemption{input_dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/hallway/primary/central) "gO" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "loadingarea"},/area/hallway/primary/central) @@ -380,7 +380,7 @@ "hp" = (/turf/simulated/floor/plasteel{icon_state = "purple"; dir = 4},/area/hallway/primary/central) "hq" = (/obj/machinery/door/firedoor,/obj/machinery/door/window/brigdoor{dir = 4; id = "Cell 2"; name = "Cell 2"; req_access_txt = "2"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) "hr" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/weapon/pen,/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = -30; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "whitepurple"; dir = 8},/area/medical/research{name = "Research Division"}) -"hs" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"hs" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "ht" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "hu" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "hv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -422,19 +422,19 @@ "if" = (/obj/machinery/vending/cigarette{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "ig" = (/obj/structure/table,/obj/item/clothing/ears/earmuffs,/obj/item/clothing/ears/earmuffs{pixel_x = -3; pixel_y = -2},/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/sunglasses{pixel_x = 3; pixel_y = 3},/turf/simulated/floor/plasteel,/area/security/brig) "ih" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/computer/security,/turf/simulated/floor/plasteel,/area/security/brig) -"ii" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/item/toy/beach_ball/holoball,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) +"ii" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/item/toy/beach_ball/holoball,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) "ij" = (/obj/machinery/light,/obj/machinery/computer/prisoner,/turf/simulated/floor/plasteel,/area/security/brig) -"ik" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"ik" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "il" = (/obj/structure/filingcabinet,/turf/simulated/floor/plasteel,/area/security/brig) "im" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/brig) -"in" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"in" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "io" = (/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/brig) -"ip" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"ip" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "iq" = (/obj/machinery/newscaster{pixel_x = -32; pixel_y = 0},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "ir" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "whitepurple"; dir = 8},/area/medical/research{name = "Research Division"}) "is" = (/obj/machinery/computer/rdconsole/core,/turf/simulated/floor/plasteel,/area/medical/research{name = "Research Division"}) "it" = (/obj/machinery/light,/turf/simulated/floor/plasteel,/area/medical/research{name = "Research Division"}) -"iu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/r_n_d/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/turf/simulated/floor/plasteel,/area/medical/research{name = "Research Division"}) +"iu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/r_n_d/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/turf/simulated/floor/plasteel,/area/medical/research{name = "Research Division"}) "iv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "iw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/poddoor/preopen{id = "Biohazard"; name = "biohazard blast door"},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/medical/research{name = "Research Division"}) "ix" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/beaker/large{pixel_x = -3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 8; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 8; pixel_y = 2},/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -446,7 +446,7 @@ "iD" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'BOMB RANGE"; name = "BOMB RANGE"},/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/space) "iE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/hallway/primary/central) "iF" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) -"iG" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) +"iG" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) "iH" = (/obj/machinery/vending/autodrobe{req_access_txt = ""},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 9},/area/hallway/primary/central) "iI" = (/obj/structure/closet/wardrobe/mixed,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/hallway/primary/central) "iJ" = (/obj/machinery/camera/autoname,/obj/structure/table/wood,/obj/item/weapon/storage/crayons,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/toy/cards/deck,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/hallway/primary/central) @@ -456,14 +456,14 @@ "iN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "iO" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "iP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/wall,/area/hallway/primary/central) -"iQ" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/hallway/primary/central) -"iR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"iS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) +"iQ" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/hallway/primary/central) +"iR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"iS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "iT" = (/obj/machinery/camera/autoname{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "iU" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "iV" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "iW" = (/obj/machinery/atmospherics/pipe/simple{dir = 2},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"iX" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{current_temperature = 80; dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"iX" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{current_temperature = 80; dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "iY" = (/obj/machinery/mass_driver{dir = 4; id = "toxinsdriver"},/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) "iZ" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/medical/research{name = "Research Division"}) "ja" = (/obj/machinery/door/poddoor{id = "toxinsdriver"; name = "Toxins Launcher Bay Door"},/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) @@ -473,14 +473,14 @@ "je" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/quartermaster/storage) "jf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "jg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall,/area/hallway/primary/central) -"jh" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/closet/jcloset,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/janitor) +"jh" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/closet/jcloset,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/janitor) "ji" = (/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) "jj" = (/obj/machinery/door/airlock{id_tag = "Dorm1"; name = "Dorm 1"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "jk" = (/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/hallway/primary/central) "jl" = (/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "jm" = (/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 4},/area/hallway/primary/central) "jn" = (/obj/machinery/alarm{pixel_y = 23},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 5},/area/hallway/primary/central) -"jo" = (/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/hallway/primary/central) +"jo" = (/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/hallway/primary/central) "jp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "jq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "jr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) @@ -498,7 +498,7 @@ "jD" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/medical/research{name = "Research Division"}) "jE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "jF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) -"jG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) +"jG" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "jH" = (/obj/machinery/camera/autoname,/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "jI" = (/obj/machinery/atmospherics/pipe/simple{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "jJ" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -509,11 +509,11 @@ "jO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/hallway/primary/central) "jP" = (/obj/machinery/door/window/eastleft,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/hallway/primary/central) "jQ" = (/obj/machinery/door/firedoor/heavy,/obj/machinery/door/airlock/research{name = "Toxins Lab"; req_access_txt = "7"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"jR" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"jR" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "jS" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "jT" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "loadingarea"},/area/janitor) -"jU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) -"jV" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table/reinforced,/obj/item/device/transfer_valve{pixel_x = -5},/obj/item/device/transfer_valve{pixel_x = 0},/obj/item/device/transfer_valve{pixel_x = 5},/obj/item/device/transfer_valve{pixel_x = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"jU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) +"jV" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/table/reinforced,/obj/item/device/transfer_valve{pixel_x = -5},/obj/item/device/transfer_valve{pixel_x = 0},/obj/item/device/transfer_valve{pixel_x = 5},/obj/item/device/transfer_valve{pixel_x = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "jW" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) "jX" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "jY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) @@ -531,7 +531,7 @@ "kk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central) "kl" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plating,/area/hallway/primary/central) "km" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/hallway/primary/central) -"kn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/item/weapon/storage/pill_bottle/dice,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) +"kn" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/item/weapon/storage/pill_bottle/dice,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) "ko" = (/obj/effect/landmark/start{name = "Assistant"},/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "kp" = (/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"},/area/hallway/primary/central) "kq" = (/obj/machinery/door/window/eastright,/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/hallway/primary/central) @@ -550,7 +550,7 @@ "kD" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "kE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/research{name = "Research Division"}) "kF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) -"kG" = (/obj/machinery/atmospherics/unary/portables_connector/visible{tag = "icon-connector_map (EAST)"; icon_state = "connector_map"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"kG" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{tag = "icon-connector_map (EAST)"; icon_state = "connector_map"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "kH" = (/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "kI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "kJ" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/medical/research{name = "Research Division"}) @@ -581,7 +581,7 @@ "li" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "lj" = (/obj/machinery/light,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "lk" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/exit) -"ll" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"ll" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "lm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "ln" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "lo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) @@ -612,7 +612,7 @@ "lN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/hallway/secondary/exit) "lO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/meter{frequency = 1443; id = "dloop_atm_meter"; name = "Distribution Loop"},/turf/simulated/floor/plating,/area/hallway/primary/central) "lP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/hallway/primary/central) -"lQ" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/janitor) +"lQ" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/janitor) "lR" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/hallway/primary/central) "lS" = (/obj/machinery/conveyor{dir = 4; id = "recycler"},/turf/simulated/floor/plating,/area/hallway/primary/central) "lT" = (/obj/machinery/conveyor{dir = 4; id = "recycler"},/obj/machinery/recycler,/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -630,12 +630,12 @@ "mf" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/toxins,/obj/machinery/door/window/eastright,/turf/simulated/floor/plasteel{dir = 2; icon_state = "redfull"},/area/medical/research{name = "Research Division"}) "mg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "mh" = (/obj/machinery/airlock_sensor{id_tag = "tox_airlock_sensor"; master_tag = "tox_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/engine,/area/medical/research{name = "Research Division"}) -"mi" = (/obj/machinery/atmospherics/binary/volume_pump{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"mi" = (/obj/machinery/atmospherics/components/binary/volume_pump{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "mj" = (/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"}) -"mk" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/medical/research{name = "Research Division"}) +"mk" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/medical/research{name = "Research Division"}) "ml" = (/obj/structure/sign/fire,/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"}) -"mm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/portable_atmospherics/pump,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) -"mn" = (/obj/machinery/camera/autoname{dir = 1},/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) +"mm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/portable_atmospherics/pump,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) +"mn" = (/obj/machinery/camera/autoname{dir = 1},/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "mo" = (/obj/machinery/door/poddoor{id = "mixvent"; name = "Mixer Room Vent"},/turf/simulated/floor/engine/vacuum,/area/medical/research{name = "Research Division"}) "mp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "mq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) @@ -661,7 +661,7 @@ "mK" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1; icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "mL" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact"; dir = 10; pixel_x = 0; level = 2; initialize_directions = 10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "mM" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; glass = 1; icon_state = "door_locked"; id_tag = "tox_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "8"},/turf/simulated/floor/engine,/area/medical/research{name = "Research Division"}) -"mN" = (/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{dir = 2; frequency = 1449; id = "tox_airlock_pump"},/turf/simulated/floor/engine,/area/medical/research{name = "Research Division"}) +"mN" = (/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{dir = 2; frequency = 1449; id = "tox_airlock_pump"},/turf/simulated/floor/engine,/area/medical/research{name = "Research Division"}) "mO" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; glass = 1; icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "8"},/turf/simulated/floor/engine,/area/medical/research{name = "Research Division"}) "mP" = (/obj/machinery/igniter{icon_state = "igniter0"; id = "burnchamber"; on = 0},/turf/simulated/floor/engine/vacuum,/area/medical/research{name = "Research Division"}) "mQ" = (/turf/simulated/floor/plasteel{icon_state = "escape"; dir = 8},/area/hallway/secondary/exit) @@ -674,9 +674,9 @@ "mX" = (/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 4},/area/hallway/primary/central) "mY" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/hallway/primary/central) "mZ" = (/obj/structure/table,/obj/item/stack/sheet/rglass{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) -"na" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) +"na" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "nb" = (/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) -"nc" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) +"nc" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "nd" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "ne" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central) "nf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -685,14 +685,14 @@ "ni" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "nj" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "nk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) -"nl" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/portables_connector/visible{tag = "icon-connector_map (EAST)"; icon_state = "connector_map"; dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) +"nl" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/portables_connector/visible{tag = "icon-connector_map (EAST)"; icon_state = "connector_map"; dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "nm" = (/obj/machinery/meter,/obj/machinery/embedded_controller/radio/airlock_controller{airpump_tag = "tox_airlock_pump"; exterior_door_tag = "tox_airlock_exterior"; id_tag = "tox_airlock_control"; interior_door_tag = "tox_airlock_interior"; pixel_x = 24; pixel_y = 0; sanitize_external = 1; sensor_tag = "tox_airlock_sensor"},/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "warnwhitecorner"; dir = 8},/area/medical/research{name = "Research Division"}) "nn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/sign/fire{pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/engine,/area/medical/research{name = "Research Division"}) -"no" = (/obj/machinery/atmospherics/unary/outlet_injector/on{tag = "icon-inje_map (WEST)"; icon_state = "inje_map"; dir = 8},/turf/simulated/floor/engine/vacuum,/area/medical/research{name = "Research Division"}) -"np" = (/obj/machinery/atmospherics/binary/volume_pump{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warnwhitecorner"; dir = 1},/area/medical/research{name = "Research Division"}) -"nq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"nr" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"ns" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) +"no" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{tag = "icon-inje_map (WEST)"; icon_state = "inje_map"; dir = 8},/turf/simulated/floor/engine/vacuum,/area/medical/research{name = "Research Division"}) +"np" = (/obj/machinery/atmospherics/components/binary/volume_pump{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warnwhitecorner"; dir = 1},/area/medical/research{name = "Research Division"}) +"nq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"nr" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"ns" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "nt" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "nu" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "escape"; dir = 8},/area/hallway/secondary/exit) "nv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) @@ -726,7 +726,7 @@ "nX" = (/obj/machinery/power/apc{auto_name = 1; dir = 8; name = "_West APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/hallway/secondary/exit) "nY" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/hallway/secondary/exit) "nZ" = (/obj/machinery/power/apc{auto_name = 1; dir = 4; name = "_East APC"; pixel_x = 27; pixel_y = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/janitor) -"oa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"oa" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "ob" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/turf/simulated/floor/plasteel,/area/janitor) "oc" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/camera/autoname,/obj/item/weapon/paper/recycler,/turf/simulated/floor/plasteel,/area/janitor) "od" = (/obj/structure/table,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/newscaster{pixel_x = 32; pixel_y = 0},/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/grenade/chem_grenade/cleaner,/turf/simulated/floor/plasteel,/area/janitor) @@ -742,7 +742,7 @@ "on" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/hallway/primary/central) "oo" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 2},/area/medical/medbay) "op" = (/turf/simulated/floor/plasteel{icon_state = "warnwhitecorner"; dir = 1},/area/medical/medbay) -"oq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"oq" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "or" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "os" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/sleeper{dir = 8; icon_state = "sleeper-open"},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) "ot" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/computer/med_data,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) @@ -768,11 +768,11 @@ "oN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "oO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/medbay) "oP" = (/obj/machinery/door/airlock/glass_command{name = "E.V.A."; req_access_txt = "18"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) -"oQ" = (/obj/structure/closet/crate/bin,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"oQ" = (/obj/structure/closet/crate/bin,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "oR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "oS" = (/obj/machinery/door/airlock/maintenance{name = "Medbay Maintenance"; req_access_txt = "45"},/turf/simulated/floor/plating,/area/medical/medbay) "oT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Custodial Closet"; req_access_txt = "26"},/turf/simulated/floor/plasteel,/area/janitor) -"oU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/newscaster{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"oU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/newscaster{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "oV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "oW" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "oX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -782,7 +782,7 @@ "pb" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "pc" = (/obj/structure/table,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/mask/surgical,/obj/item/clothing/suit/apron/surgical,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitehall"},/area/medical/medbay) "pd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"pe" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"pe" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "pf" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "pg" = (/obj/structure/table,/obj/item/weapon/surgical_drapes,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 8},/area/medical/medbay) "ph" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/shuttle/arrival) @@ -790,7 +790,7 @@ "pj" = (/obj/structure/stool/bed/chair/comfy/beige,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/hallway/secondary/exit) "pk" = (/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/hallway/secondary/exit) "pl" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/hallway/secondary/exit) -"pm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"pm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "pn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel,/area/janitor) "po" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/janitor) "pp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_command{name = "E.V.A."; req_access_txt = "18"},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) @@ -799,7 +799,7 @@ "ps" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "pt" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/hallway/primary/central) "pu" = (/obj/machinery/power/apc{auto_name = 1; dir = 1; name = "_North APC"; pixel_y = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/ai_monitored/storage/eva) -"pv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) +"pv" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) "pw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "px" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable,/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/primary/central) "py" = (/obj/structure/toilet{pixel_y = 8},/obj/machinery/light/small{dir = 8},/obj/item/weapon/razor,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/hallway/primary/central) @@ -815,7 +815,7 @@ "pI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "pJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "pK" = (/obj/structure/optable,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) -"pL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"pL" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "pM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "pN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "pO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) @@ -854,9 +854,9 @@ "qv" = (/obj/structure/closet/crate/bin,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/hallway/secondary/exit) "qw" = (/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteyellow"},/area/medical/medbay) "qx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/hallway/primary/central) -"qy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"qy" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "qz" = (/obj/structure/table/reinforced,/obj/machinery/door/window/eastright{dir = 2; name = "Chemistry Desk"; req_access_txt = "33"},/obj/item/clothing/glasses/science,/obj/machinery/door/firedoor/heavy,/turf/simulated/floor/plating,/area/medical/medbay) -"qA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"qA" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "qB" = (/obj/machinery/door/airlock{name = "Public Toilets"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/hallway/primary/central) "qC" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/effect/landmark/start{name = "Cook"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "qD" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/hallway/primary/central) @@ -871,7 +871,7 @@ "qM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/command{name = "Head of Personnel Office"; req_access = null; req_access_txt = "57"},/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "qN" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) "qO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"qP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/obj/structure/table,/obj/item/stack/packageWrap,/obj/item/weapon/hand_labeler,/obj/item/device/radio/headset/headset_med,/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/machinery/camera/autoname,/turf/simulated/floor/plasteel{tag = "icon-whiteyellowcorner"; icon_state = "whiteyellowcorner"; dir = 2},/area/medical/medbay) +"qP" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/obj/structure/table,/obj/item/stack/packageWrap,/obj/item/weapon/hand_labeler,/obj/item/device/radio/headset/headset_med,/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/machinery/camera/autoname,/turf/simulated/floor/plasteel{tag = "icon-whiteyellowcorner"; icon_state = "whiteyellowcorner"; dir = 2},/area/medical/medbay) "qQ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "qR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/camera/autoname,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "qS" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) @@ -896,7 +896,7 @@ "rl" = (/obj/machinery/computer/med_data,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "rm" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/engine/engineering) "rn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{tag = "icon-whiteyellow (WEST)"; icon_state = "whiteyellow"; dir = 8},/area/medical/medbay) -"ro" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{tag = "icon-whitebluecorner (EAST)"; icon_state = "whitebluecorner"; dir = 4},/area/medical/medbay) +"ro" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{tag = "icon-whitebluecorner (EAST)"; icon_state = "whitebluecorner"; dir = 4},/area/medical/medbay) "rp" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor/plasteel{tag = "icon-whitebluecorner (NORTH)"; icon_state = "whitebluecorner"; dir = 1},/area/medical/medbay) "rq" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "rr" = (/obj/machinery/vending/wallmed{pixel_y = -28},/obj/structure/table,/obj/item/weapon/storage/box/syringes,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -915,7 +915,7 @@ "rE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "rF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "rG" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"rH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) +"rH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) "rI" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/medbay) "rJ" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/white,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "rK" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) @@ -938,11 +938,11 @@ "sb" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) "sc" = (/obj/machinery/vending/medical{pixel_x = -2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "sd" = (/obj/machinery/chem_heater,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"se" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) +"se" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) "sf" = (/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/obj/item/weapon/wrench{pixel_x = 5; pixel_y = -5},/obj/structure/table/reinforced,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"sg" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) -"sh" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) -"si" = (/obj/machinery/atmospherics/unary/cold_sink/freezer,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) +"sg" = (/obj/machinery/atmospherics/components/unary/cryo_cell,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) +"sh" = (/obj/machinery/atmospherics/components/unary/portables_connector,/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) +"si" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) "sj" = (/obj/structure/stool/bed/roller,/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "sk" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "sl" = (/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) @@ -960,7 +960,7 @@ "sx" = (/turf/simulated/floor/plasteel{tag = "icon-whiteyellow (WEST)"; icon_state = "whiteyellow"; dir = 8},/area/medical/medbay) "sy" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/engine/engineering) "sz" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"},/area/medical/medbay) -"sA" = (/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/bar) +"sA" = (/obj/machinery/light/small,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/bar) "sB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "sC" = (/obj/structure/sign/chemistry,/turf/simulated/wall,/area/medical/medbay) "sD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{id_tag = "GeneticsDoor"; name = "Genetics"; req_access_txt = "45"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -968,12 +968,12 @@ "sF" = (/obj/machinery/telecomms/receiver/preset_left/ministation,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) "sG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitebluecorner"},/area/medical/medbay) "sH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) -"sI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{tag = "icon-whitebluecorner (WEST)"; icon_state = "whitebluecorner"; dir = 8},/area/medical/medbay) +"sI" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{tag = "icon-whitebluecorner (WEST)"; icon_state = "whitebluecorner"; dir = 8},/area/medical/medbay) "sJ" = (/obj/machinery/atmospherics/pipe/simple{dir = 5; icon_state = "intact"; level = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "sK" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "sL" = (/obj/machinery/atmospherics/pipe/simple{dir = 9; icon_state = "intact"; level = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"sM" = (/obj/machinery/light/small,/obj/structure/closet/gmcloset,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"sN" = (/obj/machinery/light/small,/obj/machinery/processor,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"sM" = (/obj/machinery/light/small,/obj/structure/closet/gmcloset,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"sN" = (/obj/machinery/light/small,/obj/machinery/processor,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) "sO" = (/obj/machinery/pipedispenser/disposal/transit_tube,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "sP" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/simulated/floor/plating,/area/shuttle/arrival) "sQ" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/engine/engineering) @@ -1000,13 +1000,13 @@ "tl" = (/obj/structure/table,/obj/machinery/door/window/southleft{layer = 3.1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "tm" = (/obj/structure/table,/obj/machinery/door/window/southright{layer = 3.1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "tn" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"to" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 5; pixel_y = -2},/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 5; pixel_y = -2},/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"tp" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/door_control{desc = "A remote control switch for the genetics doors."; id = "GeneticsDoor"; name = "Genetics Exit Button"; normaldoorcontrol = 1; pixel_x = 8; pixel_y = 24},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) +"to" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 5; pixel_y = -2},/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 5; pixel_y = -2},/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"tp" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/door_control{desc = "A remote control switch for the genetics doors."; id = "GeneticsDoor"; name = "Genetics Exit Button"; normaldoorcontrol = 1; pixel_x = 8; pixel_y = 24},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) "tq" = (/obj/machinery/smartfridge/chemistry,/turf/simulated/wall,/area/medical/medbay) "tr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{tag = "icon-whiteyellowcorner (WEST)"; icon_state = "whiteyellowcorner"; dir = 8},/area/medical/medbay) "ts" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Medbay Storage"; req_access_txt = "45"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "tt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Bar Storage"; req_access_txt = "25"},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"tu" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light,/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) +"tu" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light,/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "tv" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "tw" = (/obj/machinery/vending/wallmed{pixel_y = -28},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "tx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/engine/engineering) @@ -1028,14 +1028,14 @@ "tN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/hallway/primary/central) "tO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/camera/autoname{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "tP" = (/obj/structure/transit_tube{icon_state = "N-S"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/engine/engineering) -"tQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"tQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "tR" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/kitchen/fork,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "tS" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "tT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "tU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "tV" = (/obj/structure/table/reinforced,/obj/item/weapon/lighter,/obj/structure/sign/securearea{desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; icon_state = "monkey_painting"; name = "Mr. Deempisi portrait"; pixel_x = 4; pixel_y = 28},/turf/simulated/floor/carpet,/area/crew_quarters/bar) "tW" = (/obj/structure/stool,/turf/simulated/floor/carpet,/area/crew_quarters/bar) -"tX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/photocopier,/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) +"tX" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/photocopier,/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "tY" = (/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) "tZ" = (/obj/machinery/requests_console{department = "Garden"; departmentType = 2; pixel_x = 30; pixel_y = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "ua" = (/obj/machinery/chem_dispenser,/obj/item/weapon/reagent_containers/glass/beaker/large,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -1073,7 +1073,7 @@ "uG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/bar) "uH" = (/turf/simulated/floor/wood,/area/crew_quarters/bar) "uI" = (/obj/docking_port/stationary{dir = 8; dwidth = 2; height = 12; id = "ferry_home"; name = "station"; turf_type = /turf/space; width = 5},/turf/simulated/floor/plating/airless,/area/space) -"uJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"uJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "uK" = (/obj/machinery/vending/wallmed{pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "uL" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "uM" = (/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -1084,8 +1084,8 @@ "uR" = (/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/tcommsat/computer) "uS" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/closet/secure_closet/hop,/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "uT" = (/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/structure/closet/radiation,/turf/simulated/floor/plasteel,/area/engine/engineering) -"uU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"uV" = (/obj/structure/kitchenspike,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/bar) +"uU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"uV" = (/obj/structure/kitchenspike,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/bar) "uW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "uX" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 10},/area/hallway/primary/central) "uY" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -1100,11 +1100,11 @@ "vh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor/plasteel,/area/engine/engineering) "vi" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "vj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{tag = "icon-whitebluecorner (EAST)"; icon_state = "whitebluecorner"; dir = 4},/area/medical/medbay) -"vk" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{tag = "icon-whitebluecorner (NORTH)"; icon_state = "whitebluecorner"; dir = 1},/area/medical/medbay) +"vk" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{tag = "icon-whitebluecorner (NORTH)"; icon_state = "whitebluecorner"; dir = 1},/area/medical/medbay) "vl" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "vm" = (/turf/simulated/wall/shuttle{icon_state = "swall12"; dir = 2},/area/shuttle/arrival) "vn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/tcommsat/computer) -"vo" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1},/turf/simulated/floor/plating/airless,/area/space) +"vo" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1},/turf/simulated/floor/plating/airless,/area/space) "vp" = (/turf/simulated/wall/shuttle{icon_state = "swall14"; dir = 2},/area/shuttle/arrival) "vq" = (/obj/machinery/door/airlock/shuttle{name = "Arrivals Shuttle Airlock"},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/arrival) "vr" = (/turf/simulated/wall/shuttle{icon_state = "swall_s10"; dir = 2},/area/shuttle/arrival) @@ -1112,7 +1112,7 @@ "vt" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/airlock/maintenance{name = "Lieutenant Office Maintenance Access"; req_access_txt = "57"},/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "vu" = (/obj/machinery/vending/cart,/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "vv" = (/obj/machinery/pdapainter,/turf/simulated/floor/plasteel,/area/crew_quarters/heads{name = "\improper Job Assignment"}) -"vw" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"vw" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "vx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "vy" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "vz" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/bar) @@ -1127,8 +1127,8 @@ "vI" = (/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "vJ" = (/obj/structure/closet/wardrobe/chemistry_white,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellowcorner"},/area/medical/medbay) "vK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/structure/closet/secure_closet/engineering_personal,/turf/simulated/floor/plasteel,/area/engine/engineering) -"vL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small{dir = 8},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/plasteel{dir = 9; icon_state = "yellow"},/area/engine/engineering) -"vM" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 5},/area/engine/engineering) +"vL" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small{dir = 8},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/plasteel{dir = 9; icon_state = "yellow"},/area/engine/engineering) +"vM" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 5},/area/engine/engineering) "vN" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "vO" = (/obj/machinery/dna_scannernew,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) "vP" = (/obj/machinery/light,/obj/machinery/computer/cloning,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/medbay) @@ -1166,7 +1166,7 @@ "wv" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/arrival) "ww" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/landmark{name = "JoinLate"},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/arrival) "wx" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/arrival) -"wy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engine/engineering) +"wy" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engine/engineering) "wz" = (/obj/effect/landmark{name = "Observer-Start"},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/arrival) "wA" = (/obj/machinery/power/apc{auto_name = 1; dir = 1; name = "_North APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/crew_quarters/heads{name = "\improper Job Assignment"}) "wB" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/crew_quarters/heads{name = "\improper Job Assignment"}) @@ -1192,7 +1192,7 @@ "wV" = (/turf/simulated/wall/shuttle{icon_state = "swall13"; dir = 2},/area/shuttle/arrival) "wW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/hallway/primary/central) "wX" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 2},/area/hallway/primary/central) -"wY" = (/obj/machinery/atmospherics/binary/pump/on,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/hallway/primary/central) +"wY" = (/obj/machinery/atmospherics/components/binary/pump/on,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/hallway/primary/central) "wZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/machinery/meter{use_power = 0},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 1},/area/hallway/primary/central) "xa" = (/obj/structure/closet/crate{desc = "It's a storage unit for kitchen clothes and equipment."; name = "Kitchen Crate"},/obj/item/clothing/head/chefhat,/obj/item/clothing/under/rank/chef,/obj/item/weapon/storage/box/mousetraps{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/box/mousetraps,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/bar) "xb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/camera/autoname,/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/bar) @@ -1301,7 +1301,7 @@ "zc" = (/obj/structure/grille,/turf/simulated/wall/r_wall,/area/engine/engineering) "zd" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/grille,/turf/simulated/wall/r_wall,/area/engine/engineering) "ze" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/yellow/visible{tag = "icon-intact (NORTH)"; icon_state = "intact"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 1},/area/engine/engineering) -"zf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"zf" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "zg" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/engine/engineering) "zh" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/yellow/visible{tag = "icon-intact (NORTH)"; icon_state = "intact"; dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) "zi" = (/obj/machinery/computer/monitor,/obj/structure/cable,/turf/simulated/floor/plasteel,/area/engine/engineering) @@ -1331,7 +1331,7 @@ "zG" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plasteel,/area/engine/engineering) "zH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/engine/engineering) "zI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/meter,/turf/simulated/floor/plating,/area/engine/engineering) -"zJ" = (/obj/machinery/atmospherics/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/engine/engineering) +"zJ" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/engine/engineering) "zK" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{tag = "icon-intact (NORTH)"; icon_state = "intact"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) "zL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating/airless,/area/space) "zM" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{tag = "icon-intact (NORTH)"; icon_state = "intact"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) @@ -1357,7 +1357,7 @@ "Ah" = (/obj/machinery/vending/engivend,/turf/simulated/floor/plasteel,/area/engine/engineering) "Ai" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/engine/engineering) "Aj" = (/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/engine/engineering) -"Ak" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8; icon_state = "grey"},/turf/simulated/floor/plating,/area/tcommsat/computer) +"Ak" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 8; icon_state = "grey"},/turf/simulated/floor/plating,/area/tcommsat/computer) "Am" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/engine/engineering) "An" = (/obj/machinery/pipedispenser,/turf/simulated/floor/plasteel,/area/engine/engineering) "Ao" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel,/area/engine/engineering) @@ -1383,9 +1383,9 @@ "AM" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "AO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 1},/area/engine/engineering) "AP" = (/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC"; pixel_y = 30},/turf/simulated/floor/plasteel,/area/engine/engineering) -"AR" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) -"AS" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/engine/engineering) -"AT" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) +"AR" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"AS" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/engine/engineering) +"AT" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) "AU" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/belt/utility,/obj/item/weapon/wrench,/obj/item/weapon/weldingtool,/obj/item/clothing/head/welding{pixel_x = -3; pixel_y = 5},/turf/simulated/floor/plasteel,/area/engine/engineering) "AV" = (/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 1},/area/engine/engineering) "AW" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plasteel,/area/engine/engineering) @@ -1396,19 +1396,19 @@ "Bb" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/cyan/visible{tag = "icon-intact (NORTH)"; icon_state = "intact"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) "Be" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 9},/area/engine/engineering) "Bf" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/yellow/visible{tag = "icon-intact (NORTH)"; icon_state = "intact"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) -"Bg" = (/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/engine/engineering) +"Bg" = (/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/engine/engineering) "Bh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/engine/engineering) -"Bi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) -"Bj" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) +"Bi" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"Bj" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) "Bk" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 5},/area/engine/engineering) "Bn" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/cyan/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/engine/engineering) "Bo" = (/obj/structure/closet/crate{name = "solar pack crate"},/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/weapon/circuitboard/solar_control,/obj/item/weapon/tracker_electronics,/obj/item/weapon/paper/solar,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) "Bp" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) "Bq" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) "Br" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible,/turf/simulated/floor/plating,/area/engine/engineering) -"Bs" = (/obj/machinery/atmospherics/binary/circulator,/turf/simulated/floor/plating,/area/engine/engineering) +"Bs" = (/obj/machinery/atmospherics/components/binary/circulator,/turf/simulated/floor/plating,/area/engine/engineering) "Bt" = (/obj/machinery/power/generator,/obj/structure/cable,/turf/simulated/floor/plating,/area/engine/engineering) -"Bu" = (/obj/machinery/atmospherics/binary/circulator{icon_state = "circ2-off"},/turf/simulated/floor/plating,/area/engine/engineering) +"Bu" = (/obj/machinery/atmospherics/components/binary/circulator{icon_state = "circ2-off"},/turf/simulated/floor/plating,/area/engine/engineering) "Bv" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 4},/area/engine/engineering) "Bw" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) "Bx" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/engine/engineering) @@ -1461,25 +1461,25 @@ "Cz" = (/obj/structure/table,/turf/simulated/floor/plasteel,/area/engine/engineering) "CA" = (/obj/structure/transit_tube{icon_state = "S-NW"},/obj/structure/lattice,/turf/space,/area/space) "CB" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{tag = "icon-manifold (NORTH)"; icon_state = "manifold"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 8},/area/engine/engineering) -"CC" = (/obj/machinery/atmospherics/binary/pump{target_pressure = 1000},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 4},/area/engine/engineering) +"CC" = (/obj/machinery/atmospherics/components/binary/pump{target_pressure = 1000},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 4},/area/engine/engineering) "CD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/engine/engineering) "CE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/engine/engineering) "CF" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/engine/engineering) "CG" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{tag = "icon-manifold (NORTH)"; icon_state = "manifold"; dir = 1},/turf/simulated/floor/engine/vacuum,/area/engine/engineering) "CH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/wall,/area/engine/engineering) -"CI" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1443; id = "air_in"; on = 1},/turf/simulated/floor/engine/vacuum,/area/engine/engineering) +"CI" = (/obj/machinery/atmospherics/components/unary/outlet_injector{dir = 8; frequency = 1443; id = "air_in"; on = 1},/turf/simulated/floor/engine/vacuum,/area/engine/engineering) "CJ" = (/obj/structure/sign/fire,/turf/simulated/wall,/area/engine/engineering) "CK" = (/obj/structure/transit_tube{tag = "icon-N-S-Pass"; icon_state = "N-S-Pass"},/turf/space,/area/space) "CL" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/obj/structure/lattice,/turf/space,/area/engine/engineering) "CM" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/lattice,/obj/machinery/light/small{dir = 1},/turf/space,/area/engine/engineering) "CN" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/lattice,/turf/space,/area/engine/engineering) "CO" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/obj/structure/lattice,/turf/space,/area/engine/engineering) -"CP" = (/obj/machinery/atmospherics/binary/valve,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) -"CQ" = (/obj/machinery/atmospherics/binary/valve,/turf/simulated/floor/plating,/area/engine/engineering) -"CR" = (/obj/machinery/atmospherics/binary/pump{target_pressure = 1500},/turf/simulated/floor/plating,/area/engine/engineering) -"CS" = (/obj/machinery/atmospherics/binary/pump{dir = 1; target_pressure = 2000},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) -"CT" = (/obj/machinery/atmospherics/binary/pump{dir = 1; target_pressure = 2000},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) -"CU" = (/obj/machinery/atmospherics/binary/valve,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) +"CP" = (/obj/machinery/atmospherics/components/binary/valve,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) +"CQ" = (/obj/machinery/atmospherics/components/binary/valve,/turf/simulated/floor/plating,/area/engine/engineering) +"CR" = (/obj/machinery/atmospherics/components/binary/pump{target_pressure = 1500},/turf/simulated/floor/plating,/area/engine/engineering) +"CS" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; target_pressure = 2000},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) +"CT" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; target_pressure = 2000},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) +"CU" = (/obj/machinery/atmospherics/components/binary/valve,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering) "CV" = (/obj/machinery/door_control{id = "burndoor"; name = "Burn Chamber Vent Control"; pixel_x = 25; pixel_y = 5; req_access_txt = "0"},/turf/simulated/floor/plasteel,/area/engine/engineering) "CW" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/obj/machinery/sparker{id = "burnchamber"; pixel_x = -25},/turf/simulated/floor/engine/vacuum,/area/engine/engineering) "CX" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/meter/turf{pixel_y = 24},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/engine/vacuum,/area/engine/engineering) @@ -1489,25 +1489,25 @@ "Db" = (/obj/structure/transit_tube{icon_state = "N-S"},/turf/space,/area/space) "Dc" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/structure/lattice,/turf/space,/area/engine/engineering) "Dd" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/obj/structure/lattice,/turf/space,/area/engine/engineering) -"De" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) -"Df" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) -"Dg" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) +"De" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) +"Df" = (/obj/machinery/light,/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) +"Dg" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) "Dh" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/plating,/area/engine/engineering) "Di" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (NORTHWEST)"; icon_state = "intact"; dir = 9},/turf/simulated/floor/plating,/area/engine/engineering) "Dj" = (/obj/machinery/sparker{id = "burnchamber"; pixel_x = -25},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/engine/vacuum,/area/engine/engineering) -"Dk" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"Dl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plating,/area/tcommsat/computer) -"Dm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/camera/autoname{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) +"Dk" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) +"Dl" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plating,/area/tcommsat/computer) +"Dm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/camera/autoname{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "Dn" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 4},/turf/simulated/wall,/area/engine/engineering) "Do" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/turf/simulated/floor/engine/vacuum,/area/engine/engineering) "Dp" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/engine/vacuum,/area/engine/engineering) "Dq" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/engine/vacuum,/area/engine/engineering) "Dr" = (/obj/machinery/door/poddoor{id = "burndoor"; name = "Mixer Room Vent"},/turf/simulated/floor/plating/airless,/area/engine/engineering) -"Dt" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"Du" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"Dv" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) +"Dt" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) +"Du" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) +"Dv" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) "Dw" = (/obj/item/device/analyzer,/obj/item/weapon/wrench,/turf/simulated/floor/plasteel,/area/engine/engineering) -"DG" = (/obj/machinery/atmospherics/binary/volume_pump{dir = 4},/turf/simulated/floor/plating,/area/engine/engineering) +"DG" = (/obj/machinery/atmospherics/components/binary/volume_pump{dir = 4},/turf/simulated/floor/plating,/area/engine/engineering) "DL" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/obj/structure/lattice,/turf/space,/area/engine/engineering) "DP" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera/autoname{dir = 1},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/plating,/area/engine/engineering) "DS" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching the burn chamber."; dir = 8; layer = 4; name = "Burn Chamber Telescreen"; network = list("burnchamber"); pixel_x = 0; pixel_y = -30},/obj/structure/stool,/turf/simulated/floor/plating,/area/engine/engineering) @@ -1525,10 +1525,10 @@ "Eh" = (/turf/simulated/floor/plating,/area/tcommsat/computer) "Ei" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating,/area/tcommsat/computer) "Ej" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/computer) -"Ek" = (/obj/machinery/atmospherics/binary/pump/on{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/computer) +"Ek" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/computer) "El" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer) "Em" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/meter,/turf/simulated/floor/plating,/area/tcommsat/computer) -"Eo" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8},/turf/simulated/floor/plating/airless,/area/space) +"Eo" = (/obj/machinery/atmospherics/components/unary/outlet_injector{dir = 8},/turf/simulated/floor/plating/airless,/area/space) "Ep" = (/obj/structure/transit_tube{icon_state = "D-NE"},/turf/space,/area/space) "Eq" = (/obj/structure/transit_tube{icon_state = "E-NW"},/turf/space,/area/space) "Er" = (/obj/structure/lattice,/obj/structure/transit_tube{tag = "icon-E-W-Pass"; icon_state = "E-W-Pass"},/turf/space,/area/space) @@ -1539,7 +1539,7 @@ "Ew" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/tcommsat/computer) "Ex" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/tcommsat/computer) "Ey" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/tcommsat/computer) -"Ez" = (/obj/machinery/atmospherics/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/tcommsat/computer) +"Ez" = (/obj/machinery/atmospherics/components/binary/pump/on{dir = 8},/turf/simulated/floor/plating,/area/tcommsat/computer) "EA" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/machinery/light/small,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer) "EB" = (/obj/structure/transit_tube{icon_state = "NW-SE"},/obj/structure/lattice,/turf/space,/area/space) "ED" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/tcommsat/computer) @@ -1551,7 +1551,7 @@ "EJ" = (/turf/simulated/wall/r_wall,/area/engine/gravity_generator) "EL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall/r_wall,/area/tcommsat/computer) "EM" = (/obj/machinery/computer/telecomms/traffic{network = "tcommsat"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/tcommsat/computer) -"EO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) +"EO" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "EP" = (/obj/structure/table,/obj/item/weapon/paper_bin,/obj/item/weapon/paper/monitorkey,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/tcommsat/computer) "EQ" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "ER" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/engine/gravity_generator) @@ -1589,11 +1589,11 @@ "FD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/tcommsat/computer) "FE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/tcommsat/computer) "FF" = (/obj/structure/closet/emcloset,/obj/machinery/camera/autoname{network = list("SS13")},/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"FG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) +"FG" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "FH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "FI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "FK" = (/obj/structure/transit_tube{tag = "icon-Block (NORTH)"; icon_state = "Block"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer) -"FL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/tcommsat/computer) +"FL" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/tcommsat/computer) "FM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/tcommsat/computer) "FN" = (/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) "FO" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 0},/turf/simulated/wall,/area/tcommsat/computer) @@ -1625,7 +1625,7 @@ "Gt" = (/obj/structure/table,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/tcommsat/computer) "Gw" = (/obj/machinery/door/airlock/engineering{name = "Telecommunications"; req_access_txt = "61"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "Gx" = (/obj/machinery/power/apc{dir = 8; name = "Gravity Generator APC"; pixel_x = -25; pixel_y = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) -"Gy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) +"Gy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) "Gz" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) "GB" = (/turf/simulated/floor/plasteel,/area/engine/gravity_generator) "GC" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_se"; name = "southeast of station"; turf_type = /turf/simulated/floor/plating/snow; width = 18},/turf/space,/area/space) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index dfc67d1bd31..5ecc04343bb 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -39,7 +39,7 @@ "aaM" = (/obj/machinery/washing_machine,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/security/prison) "aaN" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/turf/simulated/wall,/area/security/transfer) "aaO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall,/area/security/transfer) -"aaP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHEAST)"; icon_state = "warndark"; dir = 5},/area/security/transfer) +"aaP" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHEAST)"; icon_state = "warndark"; dir = 5},/area/security/transfer) "aaQ" = (/obj/machinery/computer/libraryconsole/bookmanagement{pixel_y = 0},/obj/structure/table,/obj/machinery/newscaster{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaR" = (/obj/structure/table,/obj/item/weapon/storage/pill_bottle/dice,/turf/simulated/floor/plasteel,/area/security/prison) "aaS" = (/obj/structure/table,/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/security/prison) @@ -48,7 +48,7 @@ "aaV" = (/obj/structure/lattice,/obj/structure/sign/securearea{pixel_y = -32},/turf/space,/area/space) "aaW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/security/transfer) "aaX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/security/prison) -"aaY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHWEST)"; icon_state = "warndark"; dir = 9},/area/security/transfer) +"aaY" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHWEST)"; icon_state = "warndark"; dir = 9},/area/security/transfer) "aaZ" = (/obj/machinery/computer/arcade,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aba" = (/obj/structure/table,/obj/item/toy/cards/deck,/turf/simulated/floor/plasteel,/area/security/prison) "abb" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/security/prison) @@ -57,7 +57,7 @@ "abe" = (/obj/structure/grille,/obj/structure/lattice,/obj/structure/lattice,/turf/space,/area/space) "abf" = (/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/space) "abg" = (/obj/machinery/door/poddoor{id = "executionspaceblast"; name = "blast door"},/turf/simulated/floor/plating,/area/security/transfer) -"abh" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 9},/area/security/transfer) +"abh" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 9},/area/security/transfer) "abi" = (/obj/machinery/vending/sustenance,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abj" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abk" = (/obj/machinery/light/small{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/security/prison) @@ -68,13 +68,13 @@ "abp" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/hos) "abq" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/structure/lattice,/turf/space,/area/space) "abr" = (/obj/machinery/light/small{dir = 1},/obj/machinery/flasher{id = "executionflash"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTH)"; icon_state = "warndark"; dir = 1},/area/security/transfer) -"abs" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/door/poddoor/preopen{id = "executionfireblast"; layer = 2.9; name = "blast door"},/obj/machinery/atmospherics/pipe/simple/general/hidden,/obj/machinery/door/firedoor,/obj/machinery/door/window/westright{dir = 1; name = "Transfer Room"; req_access_txt = "2"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/prison) +"abs" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/door/poddoor/preopen{id = "executionfireblast"; layer = 2.9; name = "blast door"},/obj/machinery/atmospherics/pipe/simple/general/hidden,/obj/machinery/door/firedoor,/obj/machinery/door/window/westright{dir = 1; name = "Transfer Room"; req_access_txt = "2"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/prison) "abt" = (/turf/simulated/wall,/area/space) "abu" = (/obj/machinery/vending/cola,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"abv" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"abv" = (/obj/machinery/light,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"aby" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"aby" = (/obj/machinery/light,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abB" = (/obj/machinery/door/window/westleft{base_state = "right"; dir = 8; icon_state = "right"; name = "Unisex Showers"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/security/prison) @@ -92,15 +92,15 @@ "abN" = (/turf/simulated/floor/plasteel{tag = "icon-warndark (WEST)"; icon_state = "warndark"; dir = 8},/area/security/transfer) "abO" = (/obj/machinery/sparker{dir = 2; id = "executionburn"; pixel_x = 25},/turf/simulated/floor/plasteel{tag = "icon-warndark (EAST)"; icon_state = "warndark"; dir = 4},/area/security/prison) "abP" = (/obj/structure/stool/bed,/obj/effect/landmark{name = "revenantspawn"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/transfer) -"abQ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{tag = "icon-warndark (SOUTHWEST)"; icon_state = "warndark"; dir = 10},/area/security/transfer) -"abR" = (/obj/machinery/atmospherics/unary/outlet_injector,/turf/simulated/floor/plasteel{tag = "icon-warndark (SOUTHEAST)"; icon_state = "warndark"; dir = 6},/area/security/prison) +"abQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{tag = "icon-warndark (SOUTHWEST)"; icon_state = "warndark"; dir = 10},/area/security/transfer) +"abR" = (/obj/machinery/atmospherics/components/unary/outlet_injector,/turf/simulated/floor/plasteel{tag = "icon-warndark (SOUTHEAST)"; icon_state = "warndark"; dir = 6},/area/security/prison) "abS" = (/turf/simulated/wall,/area/security/prison) "abT" = (/obj/machinery/door/poddoor/preopen{id = "permacell3"; name = "cell blast door"},/obj/machinery/door/airlock/glass{id_tag = "permabolt3"; name = "Cell 3"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abU" = (/obj/machinery/door/poddoor/preopen{id = "permacell2"; name = "cell blast door"},/obj/machinery/door/airlock/glass{id_tag = "permabolt2"; name = "Cell 2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/poddoor/preopen{id = "permacell1"; name = "cell blast door"},/obj/machinery/door/airlock/glass{id_tag = "permabolt1"; name = "Cell 1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abW" = (/obj/machinery/door/airlock{name = "Unisex Restroom"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/security/prison) "abX" = (/obj/structure/closet/wardrobe/red,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/main) -"abY" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/main) +"abY" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/main) "abZ" = (/obj/structure/stool/bed/chair/comfy/black,/turf/simulated/floor/carpet,/area/security/hos) "aca" = (/obj/machinery/newscaster/security_unit{pixel_x = -30; pixel_y = 0},/obj/machinery/camera{c_tag = "Head of Security's Office"; dir = 4; network = list("SS13")},/obj/machinery/recharger{pixel_y = 4},/obj/structure/table/wood,/turf/simulated/floor/carpet,/area/security/hos) "acb" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/carpet,/area/security/hos) @@ -132,13 +132,13 @@ "acB" = (/obj/machinery/door/airlock/external{name = "Security External Airlock"; req_access_txt = "63; 13"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "acC" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/tracker,/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/solar/auxport) "acD" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "executionfireblast"; layer = 2.9; name = "blast door"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/security/transfer) -"acE" = (/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/storage/box/hug,/obj/item/weapon/razor{pixel_x = -6},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/security/prison) +"acE" = (/obj/structure/table,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/storage/box/hug,/obj/item/weapon/razor{pixel_x = -6},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/security/prison) "acF" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/scalpel{pixel_y = 12},/obj/item/weapon/circular_saw,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/surgical_drapes,/obj/item/weapon/razor,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/transfer) "acG" = (/obj/machinery/flasher_button{id = "executionflash"; pixel_x = 24; pixel_y = 5},/obj/machinery/door_control{id = "executionspaceblast"; name = "Vent to Space"; pixel_x = 25; pixel_y = -5; req_access_txt = "7"},/obj/machinery/atmospherics/pipe/simple/general/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/prison) -"acH" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 3"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"acI" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"acJ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 2"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"acK" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 1"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"acH" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 3"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"acI" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"acJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 2"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"acK" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/flasher{id = "PCell 1"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "acL" = (/obj/structure/toilet{dir = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/security/prison) "acM" = (/obj/machinery/deployable/barrier,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/ai_monitored/security/armory) "acN" = (/obj/machinery/deployable/barrier,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/camera/motion{c_tag = "Armory Motion Sensor"; dir = 2; name = "motion-sensitive security camera"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/ai_monitored/security/armory) @@ -150,15 +150,15 @@ "acT" = (/obj/structure/closet/l3closet/security,/obj/machinery/camera{c_tag = "Brig Equipment Room"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/main) "acU" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/table/wood,/obj/item/weapon/storage/box/seccarts{pixel_x = 3; pixel_y = 2},/obj/item/weapon/storage/box/deputy,/turf/simulated/floor/carpet,/area/security/hos) "acV" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/carpet,/area/security/hos) -"acW" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/carpet,/area/security/hos) -"acX" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/security/hos) +"acW" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/carpet,/area/security/hos) +"acX" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/security/hos) "acY" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "acZ" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar{id = "auxsolareast"; name = "Port Auxiliary Solar Array"},/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/solar/auxstarboard) "ada" = (/obj/structure/cable,/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxstarboard) "adb" = (/obj/structure/grille,/turf/space,/area/space) "adc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxport) "add" = (/obj/structure/table,/obj/item/weapon/folder/red{pixel_x = 3},/obj/item/device/taperecorder{pixel_x = -3; pixel_y = 0},/obj/item/device/flash/handheld,/obj/item/weapon/reagent_containers/spray/pepper,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/transfer) -"ade" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/security/transfer) +"ade" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/security/transfer) "adf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/security/prison) "adg" = (/obj/machinery/door/airlock/glass_security{name = "Long-Term Cell 3"; req_access_txt = "2"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "adh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/security/prison) @@ -185,7 +185,7 @@ "adC" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxstarboard) "adD" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/prison) "adE" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/security/transfer) -"adF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/ignition_switch{id = "executionburn"; pixel_x = 24; pixel_y = 5},/obj/machinery/door_control{id = "executionfireblast"; name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/simple/general/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/prison) +"adF" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/ignition_switch{id = "executionburn"; pixel_x = 24; pixel_y = 5},/obj/machinery/door_control{id = "executionfireblast"; name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/simple/general/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/prison) "adG" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/prison) "adH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/prison) "adI" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/wall,/area/security/prison) @@ -205,9 +205,9 @@ "adW" = (/obj/structure/rack,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/ai_monitored/security/armory) "adX" = (/obj/structure/rack,/obj/item/weapon/gun/projectile/shotgun/riot{pixel_x = 3; pixel_y = 3},/obj/item/weapon/gun/projectile/shotgun/riot,/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/ai_monitored/security/armory) "adY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/ai_monitored/security/armory) -"adZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/security/armory) +"adZ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/security/armory) "aea" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor{base_state = "rightsecure"; dir = 8; icon_state = "rightsecure"; name = "Armory Desk"; req_access_txt = "3"},/obj/machinery/door/window/eastleft{name = "Reception Desk"; req_access_txt = "1"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/ai_monitored/security/armory) -"aeb" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/main) +"aeb" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/main) "aec" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/main) "aed" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/hos) "aee" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/carpet,/area/security/hos) @@ -234,7 +234,7 @@ "aez" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/prison) "aeA" = (/obj/machinery/flasher/portable,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/ai_monitored/security/armory) "aeB" = (/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/ai_monitored/security/armory) -"aeC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/ai_monitored/security/armory) +"aeC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/ai_monitored/security/armory) "aeD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/ai_monitored/security/armory) "aeE" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/ai_monitored/security/armory) "aeF" = (/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 1},/area/ai_monitored/security/armory) @@ -316,17 +316,17 @@ "agd" = (/obj/structure/table,/obj/machinery/syndicatebomb/training,/obj/item/weapon/gun/energy/laser/practice,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/main) "age" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/main) "agf" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/main) -"agg" = (/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_y = 30},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/main) +"agg" = (/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_y = 30},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/main) "agh" = (/obj/effect/landmark/start{name = "Security Officer"},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/main) "agi" = (/obj/structure/table,/obj/item/device/flash/handheld,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/main) "agj" = (/obj/machinery/hologram/holopad,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/security/main) "agk" = (/obj/structure/table,/obj/item/weapon/folder/red,/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/security/main) -"agl" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/landmark/start{name = "Security Officer"},/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel,/area/security/main) +"agl" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/landmark/start{name = "Security Officer"},/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel,/area/security/main) "agm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/main) "agn" = (/obj/structure/table,/obj/item/weapon/folder/red,/obj/item/weapon/pen,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"},/area/security/prison) "ago" = (/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/security/prison) "agp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 5},/area/security/prison) -"agq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"agq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "agr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "ags" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "agt" = (/obj/item/weapon/cigbutt,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) @@ -336,10 +336,10 @@ "agx" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/warden) "agy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "agz" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) -"agA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) +"agA" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "agB" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "agC" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) -"agD" = (/obj/structure/table,/obj/machinery/recharger,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) +"agD" = (/obj/structure/table,/obj/machinery/recharger,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "agE" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/warden) "agF" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/main) "agG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/security/main) @@ -357,9 +357,9 @@ "agS" = (/obj/machinery/recharger,/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/main) "agT" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "agU" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/fsmaint) -"agV" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) +"agV" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "agW" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) -"agX" = (/obj/machinery/flasher{id = "insaneflash"; pixel_x = 26},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) +"agX" = (/obj/machinery/flasher{id = "insaneflash"; pixel_x = 26},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "agY" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "agZ" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aha" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) @@ -421,7 +421,7 @@ "aie" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/morphine,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aif" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/prison) "aig" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) -"aih" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"aih" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aii" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aij" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aik" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/brig) @@ -444,14 +444,14 @@ "aiB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/security/brig) "aiC" = (/obj/machinery/door/airlock/security{name = "Interrogation"; req_access = null; req_access_txt = "63"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aiD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/security/brig) -"aiE" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/security/brig) +"aiE" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/security/brig) "aiF" = (/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/brig) -"aiG" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/brig) +"aiG" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/brig) "aiH" = (/obj/structure/sign/goldenplaque{pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/brig) "aiI" = (/obj/machinery/camera{c_tag = "Brig East"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/brig) "aiJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/brig) "aiK" = (/obj/machinery/light_switch{pixel_y = 28},/obj/structure/closet/secure_closet/courtroom,/obj/effect/decal/cleanable/cobweb,/obj/structure/sign/securearea{pixel_x = -32},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) -"aiL" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/camera{c_tag = "Courtroom North"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) +"aiL" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/camera{c_tag = "Courtroom North"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) "aiM" = (/obj/structure/stool/bed/chair{name = "Judge"},/turf/simulated/floor/plasteel{dir = 9; icon_state = "blue"},/area/crew_quarters/courtroom) "aiN" = (/obj/structure/stool/bed/chair{name = "Judge"},/obj/machinery/status_display{density = 0; layer = 3; pixel_x = 0; pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "blue"},/area/crew_quarters/courtroom) "aiO" = (/obj/structure/stool/bed/chair{name = "Judge"},/turf/simulated/floor/plasteel{dir = 5; icon_state = "blue"},/area/crew_quarters/courtroom) @@ -523,7 +523,7 @@ "akc" = (/obj/structure/grille,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/window/shuttle,/turf/simulated/floor/plating,/area/shuttle/labor) "akd" = (/obj/structure/grille,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/processing) "ake" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/security/processing) -"akf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/processing) +"akf" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/security/processing) "akg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/security/processing) "akh" = (/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/security/processing) "aki" = (/obj/machinery/door/airlock/security{name = "Evidence Storage"; req_access = null; req_access_txt = "63"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) @@ -561,24 +561,24 @@ "akO" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/processing) "akP" = (/obj/structure/closet{name = "Evidence Closet"},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) "akQ" = (/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/brig) -"akR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/device/radio/intercom{desc = "Talk through this. It looks like it has been modified to not broadcast."; dir = 2; name = "Prison Intercom (General)"; pixel_x = -25; pixel_y = -2; prison_radio = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"akR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/device/radio/intercom{desc = "Talk through this. It looks like it has been modified to not broadcast."; dir = 2; name = "Prison Intercom (General)"; pixel_x = -25; pixel_y = -2; prison_radio = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "akS" = (/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) -"akT" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) -"akU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/device/radio/intercom{desc = "Talk through this. It looks like it has been modified to not broadcast."; dir = 2; name = "Prison Intercom (General)"; pixel_x = -25; pixel_y = -2; prison_radio = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"akT" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"akU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/device/radio/intercom{desc = "Talk through this. It looks like it has been modified to not broadcast."; dir = 2; name = "Prison Intercom (General)"; pixel_x = -25; pixel_y = -2; prison_radio = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "akV" = (/obj/machinery/door_control{id = "briggate"; name = "Desk Shutters"; pixel_x = -26; pixel_y = 6; req_access_txt = "0"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/flasher_button{id = "brigentry"; pixel_x = -28; pixel_y = -8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "akW" = (/obj/machinery/computer/secure_data,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "akX" = (/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "briggate"; name = "security shutters"},/obj/machinery/door/window/eastleft{name = "Brig Desk"; req_access_txt = "1"},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "akY" = (/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/brig) -"akZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"akZ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "ala" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) -"alb" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/flasher{id = "Cell 4"; pixel_x = 28},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) +"alb" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/flasher{id = "Cell 4"; pixel_x = 28},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) "alc" = (/obj/structure/stool/bed/chair{dir = 4; name = "Prosecution"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/crew_quarters/courtroom) "ald" = (/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 10},/area/crew_quarters/courtroom) "ale" = (/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/courtroom) "alf" = (/obj/item/device/radio/beacon,/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/courtroom) "alg" = (/obj/structure/table/wood,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 6},/area/crew_quarters/courtroom) "alh" = (/obj/structure/stool/bed/chair{dir = 8; name = "Defense"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 6},/area/crew_quarters/courtroom) -"ali" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) +"ali" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/courtroom) "alj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxstarboard) "alk" = (/obj/machinery/power/tracker,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/solar/port) "all" = (/turf/simulated/wall,/area/maintenance/fsmaint2) @@ -589,7 +589,7 @@ "alq" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/labor) "alr" = (/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/labor) "als" = (/obj/machinery/computer/shuttle/labor,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/security/processing) -"alt" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/processing) +"alt" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/processing) "alu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/security/processing) "alv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/processing) "alw" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/flasher{id = "Cell 1"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/brig) @@ -638,7 +638,7 @@ "amn" = (/obj/machinery/door/airlock/shuttle{name = "Labor Shuttle Airlock"; req_access_txt = "2"},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/labor) "amo" = (/obj/machinery/door/airlock/shuttle{name = "Escape Pod Airlock"},/obj/docking_port/mobile/pod{dir = 4; id = "pod3"; name = "escape pod 3"},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/pod_3) "amp" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/security/processing) -"amq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/processing) +"amq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/processing) "amr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/processing) "ams" = (/obj/machinery/door_control{desc = "A remote control switch for the exit."; id = "laborexit"; name = "exit button"; normaldoorcontrol = 1; pixel_x = 26; pixel_y = -6; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/processing) "amt" = (/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 1},/area/hallway/primary/fore) @@ -661,16 +661,16 @@ "amK" = (/obj/machinery/door/airlock/external{name = "Labor Camp Shuttle Airlock"},/turf/simulated/floor/plating,/area/security/processing) "amL" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/security{id_tag = "laborexit"; name = "Labor Shuttle"; req_access = null; req_access_txt = "63"},/turf/simulated/floor/plasteel,/area/security/processing) "amM" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) -"amN" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) +"amN" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "amO" = (/obj/machinery/bot/secbot/beepsky{name = "Officer Beepsky"},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "amP" = (/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Fitness Ring"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness) -"amQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) +"amQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/fore) "amR" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Courtroom"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) -"amS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) +"amS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "amT" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "amU" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "amV" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/camera{c_tag = "Courtroom South"; dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) -"amW" = (/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) +"amW" = (/obj/machinery/light/small,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/courtroom) "amX" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "amY" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "amZ" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint) @@ -687,7 +687,7 @@ "ank" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/main) "anl" = (/obj/structure/grille,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/processing) "anm" = (/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/security/processing) -"ann" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/processing) +"ann" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/processing) "ano" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/camera{c_tag = "Labor Shuttle Dock South"; dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/processing) "anp" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/processing) "anq" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) @@ -706,15 +706,15 @@ "anD" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "anE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "anF" = (/obj/machinery/light/small{dir = 8},/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 9},/area/maintenance/fsmaint) -"anG" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Air Out"; on = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 5},/area/maintenance/fsmaint) +"anG" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Air Out"; on = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 5},/area/maintenance/fsmaint) "anH" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "anI" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "anJ" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/terminal,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "anK" = (/obj/structure/rack,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "anL" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) -"anM" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) -"anN" = (/obj/machinery/atmospherics/trinary/filter{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) -"anO" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) +"anM" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) +"anN" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) +"anO" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "anP" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "Fore Port Solar APC"; pixel_x = -25; pixel_y = 3},/obj/machinery/camera{c_tag = "Fore Port Solar Control"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "anQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "anR" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes,/turf/simulated/floor/plating,/area/maintenance/auxsolarport) @@ -743,7 +743,7 @@ "aoo" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aop" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aoq" = (/obj/machinery/door/airlock/atmos{name = "Atmospherics Maintenance"; req_access_txt = "12;24"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) -"aor" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "Air In"; on = 1},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/fsmaint) +"aor" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "Air In"; on = 1},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/fsmaint) "aos" = (/obj/item/weapon/wrench,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fsmaint) "aot" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "Fore Starboard Solar APC"; pixel_x = -25; pixel_y = 3},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "aou" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) @@ -752,9 +752,9 @@ "aox" = (/obj/structure/closet/wardrobe/mixed,/obj/item/clothing/shoes/jackboots,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aoy" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aoz" = (/obj/structure/table,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/fpmaint2) -"aoA" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/fpmaint2) +"aoA" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/fpmaint2) "aoB" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/fpmaint2) -"aoC" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) +"aoC" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "aoD" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "aoE" = (/obj/machinery/door/airlock/engineering{icon_state = "door_closed"; locked = 0; name = "Fore Port Solar Access"; req_access_txt = "10"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "aoF" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/maintenance/auxsolarport) @@ -767,7 +767,7 @@ "aoM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/lawoffice) "aoN" = (/obj/machinery/light_switch{pixel_x = -20; pixel_y = 0},/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/lawoffice) "aoO" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/lawoffice) -"aoP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/lawoffice) +"aoP" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/lawoffice) "aoQ" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/wood,/area/lawoffice) "aoR" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) "aoS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/maintenance/fsmaint) @@ -782,7 +782,7 @@ "apb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "apc" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/light/small{dir = 4},/obj/machinery/power/apc{dir = 2; name = "Fitness Room APC"; pixel_x = 0; pixel_y = -24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/crew_quarters/fitness) "apd" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/internals/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 10},/area/maintenance/fsmaint) -"ape" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/maintenance/fsmaint) +"ape" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/maintenance/fsmaint) "apf" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) "apg" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) "aph" = (/obj/structure/grille,/obj/effect/landmark{name = "Syndicate Breach Area"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) @@ -801,7 +801,7 @@ "apu" = (/obj/machinery/door/airlock/external{name = "External Access"; req_access = null; req_access_txt = "13"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "apv" = (/obj/structure/stool,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/fpmaint2) "apw" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) -"apx" = (/obj/machinery/atmospherics/binary/valve{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) +"apx" = (/obj/machinery/atmospherics/components/binary/valve{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "apy" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "apz" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "apA" = (/obj/structure/closet,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) @@ -868,20 +868,20 @@ "aqJ" = (/obj/structure/filingcabinet/chestdrawer,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/lawoffice) "aqK" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/lawoffice) "aqL" = (/obj/structure/table/wood,/obj/item/weapon/folder/blue,/obj/item/weapon/folder/blue,/obj/item/weapon/folder/blue,/obj/item/weapon/folder/blue,/obj/item/weapon/stamp/law,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/lawoffice) -"aqM" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Lawyer"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/lawoffice) +"aqM" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Lawyer"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/lawoffice) "aqN" = (/obj/machinery/status_display{density = 0; layer = 3; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) "aqO" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) -"aqP" = (/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) +"aqP" = (/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) "aqQ" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/door_control{id = "Dorm4"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) "aqR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/sleep) "aqS" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 9},/area/crew_quarters/sleep) "aqT" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 5},/area/crew_quarters/sleep) -"aqU" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"aqU" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "aqV" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) -"aqW" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/closet/secure_closet/personal/cabinet,/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"aqW" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/closet/secure_closet/personal/cabinet,/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "aqX" = (/obj/structure/dresser,/turf/simulated/floor/wood,/area/crew_quarters/sleep) -"aqY" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) -"aqZ" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/closet/secure_closet/personal/cabinet,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"aqY" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep) +"aqZ" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/closet/secure_closet/personal/cabinet,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "ara" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/junction{icon_state = "pipe-j2"; dir = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 9},/area/crew_quarters/fitness) "arb" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) "arc" = (/obj/structure/closet/athletic_mixed,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) @@ -916,7 +916,7 @@ "arF" = (/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "arG" = (/obj/machinery/requests_console{department = "Detective's office"; pixel_x = -30; pixel_y = 0},/obj/structure/table/wood,/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "arH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet,/area/security/detectives_office) -"arI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/carpet,/area/security/detectives_office) +"arI" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/carpet,/area/security/detectives_office) "arJ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/computer/secure_data,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "arK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/security/detectives_office) "arL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -925,7 +925,7 @@ "arO" = (/obj/structure/stool/bed/chair/office/dark,/obj/effect/landmark/start{name = "Lawyer"},/turf/simulated/floor/wood,/area/lawoffice) "arP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) "arQ" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) -"arR" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) +"arR" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) "arS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) "arT" = (/obj/machinery/door/airlock{id_tag = "Dorm4"; name = "Dorm 4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "arU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep) @@ -937,7 +937,7 @@ "asa" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/obj/machinery/door_control{id = "Dorm6"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 0; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/sleep) "asb" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/crew_quarters/fitness) "asc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) -"asd" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) +"asd" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "ase" = (/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "asf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "asg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/crew_quarters/fitness) @@ -965,14 +965,14 @@ "asC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/wall,/area/maintenance/fpmaint2) "asD" = (/turf/simulated/floor/plasteel/airless{icon_state = "damaged3"},/area/space) "asE" = (/obj/item/weapon/paper/crumpled,/turf/simulated/floor/plasteel/airless{icon_state = "damaged2"},/area/space) -"asF" = (/obj/machinery/atmospherics/binary/valve,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) +"asF" = (/obj/machinery/atmospherics/components/binary/valve,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "asG" = (/obj/structure/closet,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "asH" = (/obj/structure/grille,/obj/structure/window/fulltile{health = 35},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "asI" = (/obj/structure/rack{dir = 1},/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "asJ" = (/turf/simulated/floor/plating,/area/maintenance/fpmaint) "asK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "asL" = (/obj/structure/table/wood,/obj/item/device/taperecorder{pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) -"asM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) +"asM" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "asN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "asO" = (/obj/machinery/camera{c_tag = "Detective's Office"; dir = 1},/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "asP" = (/obj/machinery/computer/med_data,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) @@ -993,13 +993,13 @@ "ate" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "atf" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "atg" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness) -"ath" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness) +"ath" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness) "ati" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "atj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/crew_quarters/fitness) "atk" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "atl" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "atm" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) -"atn" = (/obj/machinery/camera{c_tag = "Holodeck"},/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) +"atn" = (/obj/machinery/camera{c_tag = "Holodeck"},/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "ato" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) "atp" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "atq" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) @@ -1029,7 +1029,7 @@ "atO" = (/obj/effect/decal/cleanable/cobweb2,/obj/structure/stool/bed/chair,/obj/item/weapon/reagent_containers/blood/random,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "atP" = (/obj/item/weapon/airlock_painter,/obj/structure/lattice,/obj/structure/closet,/turf/space,/area/space) "atQ" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{tag = "icon-manifold (WEST)"; icon_state = "manifold"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) -"atR" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) +"atR" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "atS" = (/obj/machinery/door/airlock/external{req_access_txt = "13"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "atT" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "atU" = (/obj/machinery/door/airlock/maintenance{name = "Chemical Storage"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -1041,7 +1041,7 @@ "aua" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/door_control{id = "Dorm3"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) "aub" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep) "auc" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 4},/area/crew_quarters/sleep) -"aud" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep) +"aud" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep) "aue" = (/obj/machinery/requests_console{department = "Crew Quarters"; pixel_y = 30},/obj/machinery/camera{c_tag = "Dormitory North"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep) "auf" = (/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep) "aug" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep) @@ -1064,7 +1064,7 @@ "aux" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/electrical) "auy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/electrical) "auz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/electrical) -"auA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/maintenance/electrical) +"auA" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/maintenance/electrical) "auB" = (/obj/machinery/power/apc{dir = 1; name = "Electrical Maintenance APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/electrical) "auC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/electrical) "auD" = (/obj/structure/table,/obj/item/clothing/gloves/color/fyellow,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/device/multitool,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/electrical) @@ -1176,7 +1176,7 @@ "awF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Fitness"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "awG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "awH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) -"awI" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness) +"awI" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness) "awJ" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness) "awK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/storage/primary) "awL" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) @@ -1184,14 +1184,14 @@ "awN" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "awO" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "awP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) -"awQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) +"awQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "awR" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "awS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "awT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "awU" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/electrical) "awV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/electrical) "awW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/electrical) -"awX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating,/area/maintenance/electrical) +"awX" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating,/area/maintenance/electrical) "awY" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/maintenance/electrical) "awZ" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/entry) "axa" = (/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) @@ -1228,11 +1228,11 @@ "axF" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/sign/securearea{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "axG" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/device/multitool,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "axH" = (/obj/machinery/light{dir = 1},/obj/structure/table,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) -"axI" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) +"axI" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "axJ" = (/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/head/welding,/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "axK" = (/turf/simulated/wall,/area/ai_monitored/storage/eva) -"axL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore) -"axM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/fore) +"axL" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore) +"axM" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/fore) "axN" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/door_control{id = "Dorm2"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) "axO" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep) "axP" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) @@ -1247,7 +1247,7 @@ "axY" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "axZ" = (/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "aya" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) -"ayb" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) +"ayb" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "ayc" = (/obj/machinery/camera{c_tag = "Fitness Room South"; dir = 1},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/crew_quarters/fitness) "ayd" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) "aye" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) @@ -1292,7 +1292,7 @@ "ayR" = (/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/fore) "ayS" = (/obj/machinery/door/airlock{id_tag = "Dorm2"; name = "Dorm 2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "ayT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 2},/area/crew_quarters/sleep) -"ayU" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/sleep) +"ayU" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/sleep) "ayV" = (/obj/machinery/light_switch{pixel_y = -25},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/sleep) "ayW" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/sleep) "ayX" = (/obj/structure/closet/wardrobe/pjs,/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/sleep) @@ -1305,7 +1305,7 @@ "aze" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/fitness) "azf" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "neutral"},/area/crew_quarters/fitness) "azg" = (/obj/structure/reagent_dispensers/water_cooler,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 6},/area/crew_quarters/fitness) -"azh" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) +"azh" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "azi" = (/obj/structure/closet,/obj/effect/decal/cleanable/cobweb,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "azj" = (/obj/structure/closet,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "azk" = (/obj/machinery/door/poddoor/preopen{id = "maint2"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) @@ -1355,7 +1355,7 @@ "aAc" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/ai_monitored/storage/eva) "aAd" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/ai_monitored/storage/eva) "aAe" = (/obj/structure/grille,/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) -"aAf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) +"aAf" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "aAg" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "aAh" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/fore) "aAi" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep) @@ -1389,12 +1389,12 @@ "aAK" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/gateway) "aAL" = (/obj/machinery/gateway,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/gateway) "aAM" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/gateway) -"aAN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/requests_console{department = "EVA"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) +"aAN" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/requests_console{department = "EVA"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) "aAO" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "aAP" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "aAQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "aAR" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/item/weapon/pen{desc = "Writes upside down!"; name = "astronaut pen"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) -"aAS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) +"aAS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "aAT" = (/obj/structure/grille,/obj/structure/cable,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "aAU" = (/obj/machinery/camera{c_tag = "EVA East"; dir = 1},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "aAV" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/door_control{id = "Dorm1"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) @@ -1403,14 +1403,14 @@ "aAY" = (/obj/structure/urinal{pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aAZ" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/item/weapon/bikehorn/rubberducky,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aBa" = (/obj/structure/table/wood,/obj/machinery/requests_console{department = "Theatre"; departmentType = 0; name = "theatre RC"; pixel_x = -32; pixel_y = 0},/obj/item/weapon/reagent_containers/food/snacks/baguette,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 4},/area/crew_quarters/theatre) -"aBb" = (/obj/machinery/camera{c_tag = "Theatre Storage"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 4},/area/crew_quarters/theatre) +"aBb" = (/obj/machinery/camera{c_tag = "Theatre Storage"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 4},/area/crew_quarters/theatre) "aBc" = (/obj/machinery/vending/autodrobe,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 4},/area/crew_quarters/theatre) "aBd" = (/turf/simulated/wall,/area/crew_quarters/theatre) "aBe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aBf" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) "aBg" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) "aBh" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) -"aBi" = (/obj/machinery/atmospherics/binary/valve,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) +"aBi" = (/obj/machinery/atmospherics/components/binary/valve,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aBj" = (/obj/effect/decal/cleanable/oil,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aBk" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aBl" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/window{tag = "icon-window (EAST)"; icon_state = "window"; dir = 4},/obj/structure/window,/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fsmaint2) @@ -1435,7 +1435,7 @@ "aBE" = (/turf/simulated/wall/shuttle{icon_state = "swall12"; dir = 2},/area/shuttle/arrival) "aBF" = (/turf/space,/turf/simulated/wall/shuttle{icon_state = "swall_f5"; dir = 2},/area/shuttle/arrival) "aBG" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/entry) -"aBH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/camera{c_tag = "Arrivals North"; dir = 8; network = list("SS13")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry) +"aBH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/camera{c_tag = "Arrivals North"; dir = 8; network = list("SS13")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry) "aBI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/security/checkpoint2) "aBJ" = (/obj/structure/closet/secure_closet/security,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/checkpoint2) "aBK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Chapel Maintenance"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) @@ -1454,16 +1454,16 @@ "aBX" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor/plasteel,/area/storage/primary) "aBY" = (/turf/simulated/floor/plasteel,/area/storage/primary) "aBZ" = (/obj/machinery/vending/tool,/turf/simulated/floor/plasteel,/area/storage/primary) -"aCa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/ai_monitored/nuke_storage) +"aCa" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/ai_monitored/nuke_storage) "aCb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; luminosity = 2},/area/ai_monitored/nuke_storage) "aCc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; luminosity = 2},/area/ai_monitored/nuke_storage) "aCd" = (/obj/machinery/nuclearbomb/selfdestruct{layer = 2},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/ai_monitored/nuke_storage) -"aCe" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/nuke_storage) -"aCf" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) +"aCe" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/nuke_storage) +"aCf" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) "aCg" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) "aCh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/window{name = "Gateway Chamber"; req_access_txt = "62"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) "aCi" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) -"aCj" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) +"aCj" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/gateway) "aCk" = (/obj/structure/rack{dir = 1},/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "aCl" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/ai_monitored/storage/eva) "aCm" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/ai_monitored/storage/eva) @@ -1475,10 +1475,10 @@ "aCs" = (/obj/machinery/door/airlock/command{name = "Command EVA"; req_access = null; req_access_txt = "19"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/eva) "aCt" = (/obj/machinery/door/airlock{id_tag = "Dorm1"; name = "Dorm 1"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "aCu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 4},/area/crew_quarters/sleep) -"aCv" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) -"aCw" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) +"aCv" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) +"aCw" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aCx" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) -"aCy" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) +"aCy" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aCz" = (/obj/structure/table/wood,/obj/structure/mirror{pixel_x = -28},/obj/item/weapon/lipstick/random,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 4},/area/crew_quarters/theatre) "aCA" = (/obj/structure/stool,/obj/effect/landmark/start{name = "Mime"},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 4},/area/crew_quarters/theatre) "aCB" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 4},/area/crew_quarters/theatre) @@ -1515,11 +1515,11 @@ "aDg" = (/obj/machinery/door/airlock/shuttle{name = "Arrivals Shuttle Airlock"},/turf/simulated/floor/plating,/area/shuttle/arrival) "aDh" = (/obj/machinery/power/apc{dir = 4; name = "Entry Hall APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable,/turf/simulated/floor/plasteel{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry) "aDi" = (/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/checkpoint2) -"aDj" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/checkpoint2) +"aDj" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/checkpoint2) "aDk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/checkpoint2) "aDl" = (/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/checkpoint2) "aDm" = (/turf/simulated/floor/plasteel,/area/security/checkpoint2) -"aDn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint2) +"aDn" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint2) "aDo" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/food/snacks/grown/wheat,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange,/obj/item/weapon/reagent_containers/food/snacks/grown/grapes,/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hallway/secondary/construction{name = "\improper Garden"}) "aDp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) "aDq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) @@ -1553,7 +1553,7 @@ "aDS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall,/area/crew_quarters/toilet) "aDT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/crew_quarters/toilet) "aDU" = (/obj/machinery/light/small{dir = 8},/obj/structure/dresser,/turf/simulated/floor/plasteel{tag = "icon-redblue"; icon_state = "redblue"},/area/crew_quarters/theatre) -"aDV" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-redblue"; icon_state = "redblue"},/area/crew_quarters/theatre) +"aDV" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-redblue"; icon_state = "redblue"},/area/crew_quarters/theatre) "aDW" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{tag = "icon-redblue"; icon_state = "redblue"},/area/crew_quarters/theatre) "aDX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aDY" = (/obj/effect/spawner/lootdrop/maintenance,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) @@ -1582,16 +1582,16 @@ "aEv" = (/obj/machinery/door/firedoor,/obj/structure/table/reinforced,/obj/item/weapon/paper,/obj/machinery/door/window/westright{dir = 1; name = "Security Checkpoint"; req_access_txt = "1"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hallway/secondary/entry) "aEw" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/wirecutters,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "aEx" = (/obj/structure/table/glass,/obj/item/weapon/cultivator,/obj/item/weapon/hatchet,/obj/item/weapon/crowbar,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hallway/secondary/construction{name = "\improper Garden"}) -"aEy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) +"aEy" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) "aEz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) -"aEA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) +"aEA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) "aEB" = (/obj/machinery/camera{c_tag = "Garden"; dir = 8; network = list("SS13")},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) "aEC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/hallway/secondary/construction{name = "\improper Garden"}) "aED" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = 2; pixel_y = -2},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/screwdriver{pixel_y = 16},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/storage/primary) "aEE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/storage/primary) "aEF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plasteel,/area/storage/primary) "aEG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/storage/primary) -"aEH" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/storage/primary) +"aEH" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/storage/primary) "aEI" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel,/area/storage/primary) "aEJ" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/ai_monitored/nuke_storage) "aEK" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "vault"},/area/ai_monitored/nuke_storage) @@ -1650,12 +1650,12 @@ "aFL" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/wood,/area/library) "aFM" = (/obj/machinery/door/airlock/maintenance{name = "Crematorium Maintenance"; req_access_txt = "27"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/chapel/office) "aFN" = (/obj/structure/closet/wardrobe/chaplain_black,/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) -"aFO" = (/obj/machinery/light/small{dir = 1},/obj/machinery/requests_console{department = "Chapel"; departmentType = 2; pixel_y = 30},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) +"aFO" = (/obj/machinery/light/small{dir = 1},/obj/machinery/requests_console{department = "Chapel"; departmentType = 2; pixel_y = 30},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "aFP" = (/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/camera{c_tag = "Chapel Office"; dir = 2; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) -"aFQ" = (/obj/machinery/alarm{pixel_y = 25},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) +"aFQ" = (/obj/machinery/alarm{pixel_y = 25},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) "aFR" = (/obj/structure/closet/coffin,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "aFS" = (/obj/structure/closet/coffin,/obj/machinery/door/window/eastleft{name = "Coffin Storage"; req_access_txt = "22"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) -"aFT" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"aFT" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "aFU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "aFV" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "aFW" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/chapel/main) @@ -1672,8 +1672,8 @@ "aGh" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel{dir = 5; icon_state = "green"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aGi" = (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/weapon/reagent_containers/spray/pestspray{pixel_x = 3; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh{pixel_x = 2; pixel_y = 1},/obj/structure/table/glass,/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "green"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aGj" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/storage/primary) -"aGk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/storage/primary) -"aGl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) +"aGk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/storage/primary) +"aGl" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aGm" = (/obj/structure/table,/obj/item/weapon/weldingtool,/obj/item/weapon/crowbar,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/turf/simulated/floor/plasteel,/area/storage/primary) "aGn" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/ai_monitored/nuke_storage) "aGo" = (/obj/machinery/door/airlock/vault{icon_state = "door_locked"; locked = 1; req_access_txt = "53"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/ai_monitored/nuke_storage) @@ -1729,7 +1729,7 @@ "aHm" = (/obj/structure/table/glass,/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/chapel/main) "aHn" = (/turf/space,/turf/simulated/wall/shuttle{dir = 2; icon_state = "swall_f10"; layer = 2},/area/shuttle/pod_2) "aHo" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/simulated/floor/plating,/area/shuttle/pod_2) -"aHp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/entry) +"aHp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hallway/secondary/entry) "aHq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aHr" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aHs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/hallway/secondary/entry) @@ -1752,13 +1752,13 @@ "aHJ" = (/obj/structure/disposalpipe/trunk,/obj/machinery/disposal,/turf/simulated/floor/plasteel,/area/storage/primary) "aHK" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/hallway/primary/port) "aHL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/hallway/primary/port) -"aHM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/door_control{id = "stationawaygate"; name = "Gateway Access Shutter Control"; pixel_x = -1; pixel_y = -24; req_access_txt = "31"},/turf/simulated/floor/plasteel,/area/gateway) +"aHM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/door_control{id = "stationawaygate"; name = "Gateway Access Shutter Control"; pixel_x = -1; pixel_y = -24; req_access_txt = "31"},/turf/simulated/floor/plasteel,/area/gateway) "aHN" = (/turf/simulated/floor/plasteel,/area/gateway) -"aHO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/gateway) +"aHO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/gateway) "aHP" = (/obj/machinery/light{dir = 4},/obj/structure/closet/secure_closet/exile,/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/gateway) "aHQ" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/weapon/extinguisher,/obj/item/weapon/extinguisher,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) -"aHR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) -"aHS" = (/obj/machinery/camera{c_tag = "EVA South"; dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) +"aHR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) +"aHS" = (/obj/machinery/camera{c_tag = "EVA South"; dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/ai_monitored/storage/eva) "aHT" = (/obj/structure/dispenser/oxygen,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "aHU" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/hallway/primary/central) "aHV" = (/turf/simulated/floor/plasteel{dir = 9; icon_state = "blue"},/area/hallway/primary/central) @@ -1834,7 +1834,7 @@ "aJn" = (/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/light{dir = 1},/obj/structure/table/wood,/obj/item/weapon/lipstick,/turf/simulated/floor/wood,/area/crew_quarters/theatre) "aJo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/theatre) "aJp" = (/obj/machinery/alarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/theatre) -"aJq" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/camera{c_tag = "Theatre Stage"; dir = 2},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/theatre) +"aJq" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/camera{c_tag = "Theatre Stage"; dir = 2},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "aJr" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "aJs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aJt" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -1847,16 +1847,16 @@ "aJA" = (/obj/machinery/door/window/southleft{base_state = "left"; dir = 2; icon_state = "left"; name = "Kitchen Delivery"; req_access_txt = "28"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/kitchen) "aJB" = (/obj/machinery/door/window/eastright{name = "Hydroponics Delivery"; req_access_txt = "35"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/hydroponics) "aJC" = (/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) -"aJD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/sink{pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) +"aJD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/sink{pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "aJE" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "aJF" = (/obj/structure/closet/secure_closet/hydroponics,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "aJG" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/camera{c_tag = "Hydroponics Storage"},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) -"aJH" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) +"aJH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "aJI" = (/obj/structure/table,/obj/item/weapon/reagent_containers/spray/plantbgone{pixel_x = 0; pixel_y = 3},/obj/item/weapon/reagent_containers/spray/plantbgone{pixel_x = 8; pixel_y = 8},/obj/item/weapon/reagent_containers/spray/plantbgone{pixel_x = 13; pixel_y = 5},/obj/item/weapon/watertank,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "aJJ" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/wood,/area/library) "aJK" = (/obj/structure/table/wood,/turf/simulated/floor/wood,/area/library) "aJL" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/wood,/area/library) -"aJM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/camera{c_tag = "Chapel Crematorium"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) +"aJM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/camera{c_tag = "Chapel Crematorium"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "aJN" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "aJO" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock{name = "Crematorium"; req_access_txt = "27"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "aJP" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) @@ -1880,7 +1880,7 @@ "aKh" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/primary/port) "aKi" = (/turf/simulated/floor/plasteel,/area/hallway/primary/port) "aKj" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{name = "Port Hall APC"; dir = 1; pixel_y = 26},/turf/simulated/floor/plasteel,/area/hallway/primary/port) -"aKk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/port) +"aKk" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "aKl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/port) "aKm" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/port) "aKn" = (/obj/machinery/light{dir = 1},/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 8},/area/hallway/primary/port) @@ -1888,12 +1888,12 @@ "aKp" = (/obj/machinery/camera{c_tag = "Port Hallway 2"; dir = 2},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/primary/port) "aKq" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/primary/port) "aKr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/primary/port) -"aKs" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/primary/port) +"aKs" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/primary/port) "aKt" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/hallway/primary/port) "aKu" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/hallway/primary/port) -"aKv" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 8},/area/hallway/primary/port) +"aKv" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 8},/area/hallway/primary/port) "aKw" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/hallway/primary/port) -"aKx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 30},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"aKx" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 30},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "aKy" = (/obj/machinery/camera{c_tag = "Central Hallway North-West"; dir = 2},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "aKz" = (/obj/machinery/light{dir = 1},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "aKA" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/primary/central) @@ -1905,7 +1905,7 @@ "aKG" = (/turf/simulated/floor/plasteel{icon_state = "L11"},/area/hallway/primary/central) "aKH" = (/turf/simulated/floor/plasteel{desc = ""; icon_state = "L13"; name = "floor"},/area/hallway/primary/central) "aKI" = (/turf/simulated/floor/plasteel{icon_state = "L8"},/area/hallway/primary/central) -"aKJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"aKJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "aKK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 4},/area/hallway/primary/central) "aKL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 1},/area/hallway/primary/central) "aKM" = (/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 4},/area/hallway/primary/central) @@ -1923,9 +1923,9 @@ "aKY" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aKZ" = (/obj/structure/stool,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aLa" = (/obj/machinery/computer/slot_machine,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"aLb" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/light/small{dir = 8},/obj/structure/reagent_dispensers/beerkeg,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"aLb" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/light/small{dir = 8},/obj/structure/reagent_dispensers/beerkeg,/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aLc" = (/obj/structure/disposalpipe/segment,/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"aLd" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"aLd" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aLe" = (/obj/machinery/vending/cola,/turf/simulated/floor/wood,/area/crew_quarters/bar) "aLf" = (/obj/machinery/vending/coffee,/turf/simulated/floor/wood,/area/crew_quarters/bar) "aLg" = (/obj/machinery/icecream_vat,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) @@ -1940,16 +1940,16 @@ "aLp" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "aLq" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "aLr" = (/obj/machinery/chem_master/condimaster,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) -"aLs" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/library) +"aLs" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/library) "aLt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/library) "aLu" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/wood,/area/library) "aLv" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/wood,/area/library) "aLw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/library) -"aLx" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/library) +"aLx" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/library) "aLy" = (/obj/structure/bodycontainer/crematorium,/obj/effect/landmark{name = "revenantspawn"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) -"aLz" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) +"aLz" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "aLA" = (/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/chapel/office) -"aLB" = (/obj/machinery/camera{c_tag = "Chapel North"; dir = 2; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"aLB" = (/obj/machinery/camera{c_tag = "Chapel North"; dir = 2; network = list("SS13")},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "aLC" = (/turf/simulated/wall,/area/hallway/secondary/exit) "aLD" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/hallway/secondary/exit) "aLE" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) @@ -2035,16 +2035,16 @@ "aNg" = (/obj/machinery/light,/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = -32},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central) "aNh" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = -32},/obj/machinery/door/firedoor,/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central) "aNi" = (/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/crew_quarters/theatre) -"aNj" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/theatre) +"aNj" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "aNk" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "aNl" = (/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aNm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/crew_quarters/bar) "aNn" = (/obj/machinery/door/airlock{name = "Bar Storage"; req_access_txt = "25"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "wood"},/area/crew_quarters/bar) "aNo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/crew_quarters/bar) "aNp" = (/obj/effect/landmark{name = "blobstart"},/obj/item/toy/beach_ball/holoball,/turf/simulated/floor/plating,/area/crew_quarters/bar) -"aNq" = (/obj/structure/kitchenspike,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) +"aNq" = (/obj/structure/kitchenspike,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aNr" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) -"aNs" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) +"aNs" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aNt" = (/obj/machinery/gibber,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aNu" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hydroponics) "aNv" = (/obj/machinery/requests_console{department = "Hydroponics"; departmentType = 2; pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hydroponics) @@ -2068,7 +2068,7 @@ "aNN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/chapel/main) "aNO" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted/fulltile,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "aNP" = (/obj/machinery/camera{c_tag = "Escape Arm Holding Area"; dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/hallway/secondary/exit) -"aNQ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"aNQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "aNR" = (/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "aNS" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit) "aNT" = (/obj/machinery/vending/snack,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/hallway/secondary/entry) @@ -2103,7 +2103,7 @@ "aOw" = (/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/plasteel,/area/storage/primary) "aOx" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/transfer) "aOy" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/security/prison) -"aOz" = (/obj/machinery/atmospherics/binary/pump{dir = 4; layer = 2.4},/obj/machinery/door/window/southleft{base_state = "right"; dir = 4; icon_state = "right"; name = "Armory"; req_access_txt = "2"},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/security/transfer) +"aOz" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; layer = 2.4},/obj/machinery/door/window/southleft{base_state = "right"; dir = 4; icon_state = "right"; name = "Armory"; req_access_txt = "2"},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/security/transfer) "aOA" = (/obj/structure/table,/obj/machinery/computer/security/telescreen/entertainment{pixel_x = -31},/obj/item/clothing/head/cakehat,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aOB" = (/obj/structure/stool,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aOC" = (/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -2131,7 +2131,7 @@ "aOY" = (/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25},/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "aOZ" = (/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/hallway/secondary/exit) "aPa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) -"aPb" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"aPb" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "aPc" = (/obj/machinery/door/airlock/external{name = "Security Escape Airlock"; req_access_txt = "2"},/turf/simulated/floor/plating,/area/hallway/secondary/exit) "aPd" = (/turf/simulated/floor/plating,/area/hallway/secondary/exit) "aPe" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry) @@ -2152,7 +2152,7 @@ "aPt" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aPu" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aPv" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/plasteel,/area/crew_quarters/locker) -"aPw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/turf/simulated/floor/plasteel,/area/storage/art) +"aPw" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/turf/simulated/floor/plasteel,/area/storage/art) "aPx" = (/turf/simulated/floor/plasteel,/area/storage/art) "aPy" = (/obj/machinery/light/small{dir = 4},/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor/plasteel,/area/storage/art) "aPz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/port) @@ -2184,11 +2184,11 @@ "aPZ" = (/obj/structure/sink/kitchen{pixel_y = 28},/obj/machinery/food_cart,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "aQa" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "aQb" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) -"aQc" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/camera{c_tag = "Kitchen"; dir = 2},/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) +"aQc" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/camera{c_tag = "Kitchen"; dir = 2},/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "aQd" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/machinery/alarm{pixel_y = 24},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "aQe" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "aQf" = (/obj/structure/closet/secure_closet/freezer/kitchen,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) -"aQg" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 8},/area/hydroponics) +"aQg" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 8},/area/hydroponics) "aQh" = (/turf/simulated/floor/plasteel,/area/hydroponics) "aQi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hydroponics) "aQj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hydroponics) @@ -2206,15 +2206,15 @@ "aQv" = (/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 2; icon_state = "arrival"},/area/hallway/secondary/entry) "aQw" = (/turf/simulated/floor/plasteel{dir = 2; icon_state = "arrival"},/area/hallway/secondary/entry) "aQx" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitecorner"},/area/hallway/secondary/entry) -"aQy" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) +"aQy" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aQz" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aQA" = (/obj/machinery/firealarm{dir = 2; pixel_y = -24},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) -"aQB" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) +"aQB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aQC" = (/obj/machinery/light,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aQD" = (/obj/machinery/camera{c_tag = "Arrivals Hallway"; dir = 8; network = list("SS13")},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aQE" = (/turf/simulated/floor/plating,/area/maintenance/port) "aQF" = (/obj/structure/closet/wardrobe/mixed,/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) -"aQG" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) +"aQG" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aQH" = (/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aQI" = (/obj/structure/table,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/turf/simulated/floor/plasteel,/area/storage/art) "aQJ" = (/obj/machinery/light_switch{pixel_y = 28},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency2) @@ -2293,27 +2293,27 @@ "aSe" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/camera{c_tag = "Locker Room East"; dir = 8; network = list("SS13")},/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aSf" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/turf/simulated/floor/plasteel,/area/storage/art) "aSg" = (/obj/structure/table,/obj/item/weapon/storage/crayons,/obj/item/weapon/storage/crayons,/turf/simulated/floor/plasteel,/area/storage/art) -"aSh" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/device/camera_film,/obj/item/device/camera,/turf/simulated/floor/plasteel,/area/storage/art) +"aSh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/device/camera_film,/obj/item/device/camera,/turf/simulated/floor/plasteel,/area/storage/art) "aSi" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/storage/emergency2) "aSj" = (/obj/machinery/light/small,/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/storage/emergency2) "aSk" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/storage/emergency2) "aSl" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/storage/emergency2) -"aSm" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/storage/tools) +"aSm" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/storage/tools) "aSn" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/plasteel,/area/storage/tools) "aSo" = (/obj/structure/table,/obj/item/weapon/module/power_control,/obj/item/weapon/airlock_electronics,/turf/simulated/floor/plasteel,/area/storage/tools) -"aSp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/storage/tools) +"aSp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/storage/tools) "aSq" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plasteel,/area/storage/tools) "aSr" = (/turf/simulated/wall,/area/bridge) "aSs" = (/obj/machinery/computer/prisoner,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/bridge) "aSt" = (/obj/machinery/computer/security,/turf/simulated/floor/plasteel{icon_state = "red"},/area/bridge) "aSu" = (/obj/machinery/computer/secure_data,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/bridge) "aSv" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/floor/plasteel,/area/bridge) -"aSw" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/bridge) +"aSw" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/bridge) "aSx" = (/turf/simulated/floor/plasteel,/area/bridge) "aSy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/bridge) "aSz" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "bluecorner"},/area/bridge) "aSA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "bluecorner"},/area/bridge) -"aSB" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/bridge) +"aSB" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/bridge) "aSC" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/plasteel,/area/bridge) "aSD" = (/obj/machinery/computer/teleporter,/turf/simulated/floor/plasteel{dir = 10; icon_state = "brown"},/area/bridge) "aSE" = (/obj/machinery/computer/ordercomp,/turf/simulated/floor/plasteel{dir = 2; icon_state = "brown"},/area/bridge) @@ -2395,7 +2395,7 @@ "aUc" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/item/weapon/reagent_containers/food/snacks/pie/cream,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "aUd" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = -31},/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aUe" = (/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) -"aUf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) +"aUf" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "aUg" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/enzyme{layer = 5},/obj/item/stack/packageWrap,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "aUh" = (/obj/structure/table,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "aUi" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) @@ -2406,7 +2406,7 @@ "aUn" = (/turf/simulated/floor/plasteel{icon_state = "green"; dir = 8},/area/hydroponics) "aUo" = (/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor/plasteel,/area/hydroponics) "aUp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hydroponics) -"aUq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hydroponics) +"aUq" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hydroponics) "aUr" = (/obj/machinery/hydroponics/constructable,/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hydroponics) "aUs" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aUt" = (/obj/structure/table/wood,/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/library) @@ -2420,9 +2420,9 @@ "aUB" = (/obj/item/device/radio/intercom{pixel_x = -25},/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/hallway/secondary/exit) "aUC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "aUD" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) -"aUE" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit) +"aUE" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit) "aUF" = (/obj/structure/grille,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/hallway/secondary/entry) -"aUG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) +"aUG" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aUH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/security/vacantoffice) "aUI" = (/obj/machinery/camera{c_tag = "Vacant Office"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/security/vacantoffice) "aUJ" = (/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/security/vacantoffice) @@ -2440,7 +2440,7 @@ "aUV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aUW" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aUX" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) -"aUY" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) +"aUY" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aUZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/port) "aVa" = (/obj/machinery/power/apc{dir = 1; name = "Art Storage"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/storage/art) "aVb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port) @@ -2513,11 +2513,11 @@ "aWq" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit) "aWr" = (/obj/docking_port/stationary{dir = 8; dwidth = 2; height = 12; id = "ferry_home"; name = "port bay 2"; turf_type = /turf/space; width = 5},/turf/space,/area/space) "aWs" = (/obj/machinery/door/airlock/external{id_tag = null; name = "Port Docking Bay 2"; req_access_txt = "0"},/turf/simulated/floor/plating,/area/hallway/secondary/entry) -"aWt" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/wood,/area/security/vacantoffice) +"aWt" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/wood,/area/security/vacantoffice) "aWu" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/wood,/area/security/vacantoffice) "aWv" = (/turf/simulated/floor/carpet,/area/security/vacantoffice) "aWw" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/carpet,/area/security/vacantoffice) -"aWx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/security/vacantoffice) +"aWx" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/security/vacantoffice) "aWy" = (/obj/machinery/light{dir = 4},/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/wood,/area/security/vacantoffice) "aWz" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/port) "aWA" = (/turf/simulated/wall,/area/crew_quarters/locker/locker_toilet) @@ -2563,7 +2563,7 @@ "aXo" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 10},/area/hallway/primary/central) "aXp" = (/obj/machinery/power/apc{dir = 2; name = "Central Hall APC"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/plasteel{dir = 0; icon_state = "blue"},/area/hallway/primary/central) "aXq" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central) -"aXr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"aXr" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aXs" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aXt" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Kitchen"; req_access_txt = "28"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/kitchen) "aXu" = (/obj/machinery/light_switch{pixel_y = -25},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) @@ -2599,7 +2599,7 @@ "aXY" = (/obj/structure/stool/bed/chair/office/dark,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/security/vacantoffice) "aXZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/carpet,/area/security/vacantoffice) "aYa" = (/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor/wood,/area/security/vacantoffice) -"aYb" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/unary/tank/air{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port) +"aYb" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/components/unary/tank/air{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port) "aYc" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/port) "aYd" = (/obj/structure/toilet{pixel_y = 8},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aYe" = (/obj/machinery/door/airlock{name = "Unit 1"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) @@ -2640,7 +2640,7 @@ "aYN" = (/obj/machinery/newscaster{pixel_y = -28},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aYO" = (/obj/machinery/light,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aYP" = (/obj/machinery/light,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"aYQ" = (/obj/machinery/camera{c_tag = "Bar South"; dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"aYQ" = (/obj/machinery/camera{c_tag = "Bar South"; dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aYR" = (/obj/structure/noticeboard{pixel_y = -27},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aYS" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aYT" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -2658,12 +2658,12 @@ "aZf" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/library) "aZg" = (/obj/structure/table/wood,/obj/item/weapon/pen,/turf/simulated/floor/wood,/area/library) "aZh" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel,/area/quartermaster/office) -"aZi" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/wood,/area/library) +"aZi" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/wood,/area/library) "aZj" = (/obj/structure/stool/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/wood,/area/library) -"aZk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/wood,/area/library) -"aZl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"aZk" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/wood,/area/library) +"aZl" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "aZm" = (/turf/simulated/floor/carpet{icon_state = "carpetsymbol"},/area/chapel/main) -"aZn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) +"aZn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "aZo" = (/obj/machinery/power/apc{dir = 8; name = "Escape Hallway APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/hallway/secondary/exit) "aZp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "aZq" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) @@ -2673,14 +2673,14 @@ "aZu" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/wood,/area/security/vacantoffice) "aZv" = (/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/security/vacantoffice) "aZw" = (/obj/structure/table/wood,/obj/item/weapon/folder/blue,/turf/simulated/floor/wood,/area/security/vacantoffice) -"aZx" = (/obj/machinery/atmospherics/unary/tank/air{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port) +"aZx" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port) "aZy" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/port) "aZz" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/power/apc{dir = 4; name = "Locker Restrooms APC"; pixel_x = 27; pixel_y = 2},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/crew_quarters/locker/locker_toilet) "aZA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aZB" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) -"aZC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/crew_quarters/locker) +"aZC" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/crew_quarters/locker) "aZD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=AIE"; location = "AftH"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) -"aZE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/crew_quarters/locker) +"aZE" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/crew_quarters/locker) "aZF" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/stack/sheet/cardboard,/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) "aZG" = (/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) "aZH" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/module/power_control,/obj/item/weapon/stock_parts/cell{maxcharge = 2000},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) @@ -2688,7 +2688,7 @@ "aZJ" = (/obj/structure/stool,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/quartermaster/office) "aZK" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/quartermaster/office) "aZL" = (/obj/machinery/conveyor_switch/oneway{id = "packageSort2"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/quartermaster/office) -"aZM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/central) +"aZM" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/central) "aZN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/bridge/meeting_room) "aZO" = (/obj/machinery/photocopier,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/bridge/meeting_room) "aZP" = (/obj/machinery/door_control{id = "heads_meeting"; name = "Security Shutters"; pixel_x = 0; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/bridge/meeting_room) @@ -2730,7 +2730,7 @@ "baz" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/port) "baA" = (/obj/structure/table,/obj/item/weapon/aiModule/supplied/oxygen,/obj/item/weapon/aiModule/zeroth/oneHuman,/obj/machinery/door/window{base_state = "left"; dir = 8; icon_state = "left"; name = "High-Risk Modules"; req_access_txt = "20"},/obj/item/weapon/aiModule/reset/purge,/obj/structure/window/reinforced,/obj/item/weapon/aiModule/core/full/antimov,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/aiModule/supplied/protectStation,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "baB" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) -"baC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) +"baC" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "baD" = (/obj/machinery/washing_machine,/turf/simulated/floor/plasteel{icon_state = "barber"},/area/crew_quarters/locker) "baE" = (/obj/machinery/washing_machine,/obj/machinery/light,/turf/simulated/floor/plasteel{icon_state = "barber"},/area/crew_quarters/locker) "baF" = (/obj/structure/closet/crate,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) @@ -2754,7 +2754,7 @@ "baX" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/wood,/area/crew_quarters/captain) "baY" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/captain) "baZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bba" = (/obj/structure/table/wood,/obj/item/weapon/storage/fancy/donut_box,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bba" = (/obj/structure/table/wood,/obj/item/weapon/storage/fancy/donut_box,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bbb" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bbc" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bbd" = (/obj/structure/displaycase,/turf/simulated/floor/wood,/area/crew_quarters/captain) @@ -2770,7 +2770,7 @@ "bbn" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitecorner"},/area/hallway/secondary/exit) "bbo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "bbp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) -"bbq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) +"bbq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/exit) "bbr" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit) "bbs" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "bluecorner"},/area/hallway/secondary/entry) "bbt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) @@ -2789,14 +2789,14 @@ "bbG" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) "bbH" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) "bbI" = (/obj/machinery/conveyor_switch/oneway{id = "packageSort1"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/quartermaster/office) -"bbJ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"bbJ" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) "bbK" = (/obj/structure/table,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 4},/area/quartermaster/office) "bbL" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bbM" = (/obj/item/weapon/hand_labeler,/obj/item/device/assembly/timer,/obj/structure/table,/turf/simulated/floor/wood,/area/bridge/meeting_room) "bbN" = (/obj/structure/table/wood,/obj/item/device/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Command)"; pixel_x = 0},/turf/simulated/floor/carpet,/area/bridge/meeting_room) "bbO" = (/obj/structure/stool/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/carpet,/area/bridge/meeting_room) "bbP" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/carpet,/area/bridge/meeting_room) -"bbQ" = (/obj/item/weapon/book/manual/wiki/security_space_law,/obj/structure/table/wood,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/carpet,/area/bridge/meeting_room) +"bbQ" = (/obj/item/weapon/book/manual/wiki/security_space_law,/obj/structure/table/wood,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/carpet,/area/bridge/meeting_room) "bbR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bbS" = (/obj/machinery/vending/cola,/turf/simulated/floor/wood,/area/bridge/meeting_room) "bbT" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/porta_turret{ai = 1; dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) @@ -2806,11 +2806,11 @@ "bbX" = (/obj/machinery/computer/arcade,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bbY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bbZ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bca" = (/obj/structure/table/wood,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bca" = (/obj/structure/table/wood,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bcb" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bcc" = (/obj/machinery/camera{c_tag = "Central Hallway East"; dir = 4; network = list("SS13")},/obj/structure/disposalpipe/segment,/obj/machinery/status_display{density = 0; layer = 3; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central) -"bcd" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) -"bce" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) +"bcd" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) +"bce" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bcf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bcg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bch" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) @@ -2831,14 +2831,14 @@ "bcw" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/port) "bcx" = (/obj/machinery/door/airlock{name = "Unit 3"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "bcy" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) -"bcz" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 28},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) +"bcz" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 28},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "bcA" = (/obj/item/latexballon,/turf/simulated/floor/plating,/area/maintenance/port) "bcB" = (/obj/effect/landmark{name = "blobstart"},/obj/item/clothing/suit/ianshirt,/obj/structure/closet,/turf/simulated/floor/plating,/area/maintenance/port) "bcC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/maintenance/port) "bcD" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/port) -"bcE" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) +"bcE" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) "bcF" = (/obj/item/stack/sheet/cardboard,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) -"bcG" = (/obj/machinery/camera{c_tag = "Cargo Bay Storage"; dir = 8; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) +"bcG" = (/obj/machinery/camera{c_tag = "Cargo Bay Storage"; dir = 8; network = list("SS13")},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) "bcH" = (/obj/machinery/camera{c_tag = "Cargo Delivery Office"; dir = 4; network = list("SS13")},/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/office) "bcI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "loadingarea"},/area/quartermaster/office) "bcJ" = (/obj/machinery/conveyor{dir = 4; id = "packageExternal"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/office) @@ -2847,13 +2847,13 @@ "bcM" = (/obj/item/weapon/storage/fancy/donut_box,/obj/structure/table,/turf/simulated/floor/wood,/area/bridge/meeting_room) "bcN" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/wood,/turf/simulated/floor/carpet,/area/bridge/meeting_room) "bcO" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/carpet,/area/bridge/meeting_room) -"bcP" = (/obj/item/weapon/folder/blue,/obj/structure/table/wood,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/bridge/meeting_room) +"bcP" = (/obj/item/weapon/folder/blue,/obj/structure/table/wood,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/bridge/meeting_room) "bcQ" = (/obj/structure/table,/obj/item/weapon/aiModule/core/full/asimov,/obj/item/weapon/aiModule/core/freeformcore,/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Core Modules"; req_access_txt = "20"},/obj/structure/window/reinforced,/obj/item/weapon/aiModule/core/full/corp,/obj/item/weapon/aiModule/core/full/paladin,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/aiModule/core/full/robocop,/obj/item/weapon/aiModule/core/full/custom,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) -"bcR" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) +"bcR" = (/obj/machinery/light,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "bcS" = (/obj/machinery/computer/upload/ai,/obj/machinery/flasher{id = "AI"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) "bcT" = (/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Upload APC"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) "bcU" = (/obj/machinery/computer/upload/borg,/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; listening = 0; name = "Station Intercom (AI Private)"; pixel_y = -29},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) -"bcV" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) +"bcV" = (/obj/machinery/light,/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai_upload) "bcW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) "bcX" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bcY" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/captain) @@ -2877,7 +2877,7 @@ "bdq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bdr" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bds" = (/obj/machinery/light,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) -"bdt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Starboard Primary Hallway 4"; dir = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) +"bdt" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Starboard Primary Hallway 4"; dir = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "bdu" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 2; icon_state = "redcorner"},/area/hallway/secondary/exit) "bdv" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/plasteel{dir = 2; icon_state = "escape"},/area/hallway/secondary/exit) "bdw" = (/obj/machinery/newscaster{pixel_y = -32},/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 2; icon_state = "escape"},/area/hallway/secondary/exit) @@ -2940,7 +2940,7 @@ "beB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/medical/morgue) "beC" = (/obj/machinery/door/airlock/medical{name = "Morgue"; req_access_txt = "6"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "beD" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) -"beE" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) +"beE" = (/obj/machinery/light,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "beF" = (/obj/machinery/power/apc{dir = 2; name = "Starboard Primary Hallway APC"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "beG" = (/turf/simulated/wall,/area/storage/emergency) "beH" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -2980,7 +2980,7 @@ "bfp" = (/obj/machinery/door_control{id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -1; pixel_y = -24; req_access_txt = "31"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) "bfq" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/wall,/area/quartermaster/storage) "bfr" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/wall,/area/quartermaster/office) -"bfs" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/office) +"bfs" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/office) "bft" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Cargo Technician"},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 4},/area/quartermaster/office) "bfu" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/window/westleft{name = "Delivery Desk"; req_access_txt = "50"},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/quartermaster/office) "bfv" = (/obj/machinery/camera{c_tag = "Central Hallway West"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/central) @@ -2992,7 +2992,7 @@ "bfB" = (/obj/machinery/vending/coffee,/obj/machinery/light{dir = 4},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bfC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/engine/gravity_generator) "bfD" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) -"bfE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) +"bfE" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "bfF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "bfG" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/wall/r_wall,/area/engine/gravity_generator) "bfH" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Captain's Desk"; departmentType = 5; name = "Captain RC"; pixel_x = -30; pixel_y = 0},/obj/structure/filingcabinet,/turf/simulated/floor/wood,/area/crew_quarters/captain) @@ -3007,7 +3007,7 @@ "bfQ" = (/obj/machinery/camera{c_tag = "Chemistry"; dir = 2; network = list("SS13")},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/chem_heater,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bfR" = (/obj/machinery/chem_dispenser,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteyellow"},/area/medical/chemistry) "bfS" = (/obj/machinery/chem_master,/turf/simulated/floor/plasteel{dir = 5; icon_state = "whiteyellow"},/area/medical/chemistry) -"bfT" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/atmospherics/pipe/simple/general/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/prison) +"bfT" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/atmospherics/pipe/simple/general/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/prison) "bfU" = (/obj/structure/closet/l3closet/scientist,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/toxins/explab) "bfV" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bfW" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -3071,13 +3071,13 @@ "bhc" = (/obj/structure/table/wood,/obj/machinery/recharger,/obj/item/weapon/melee/chainofcommand,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bhd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/ai_monitored/security/armory) "bhe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) -"bhf" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) +"bhf" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bhg" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bhh" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellow"},/area/medical/chemistry) "bhi" = (/obj/structure/table/reinforced,/obj/machinery/door/window/eastright{dir = 8; name = "Chemistry Desk"; req_access_txt = "33"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/medical/chemistry) -"bhj" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"bhj" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bhk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"bhl" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"bhl" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bhm" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start/depsec/medical,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/medical) "bhn" = (/turf/simulated/floor/plasteel,/area/security/checkpoint/medical) "bho" = (/obj/machinery/computer/secure_data,/obj/item/device/radio/intercom{pixel_x = 25},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/medical) @@ -3144,7 +3144,7 @@ "bix" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/wood,/area/crew_quarters/captain) "biy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/captain) "biz" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"biA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"biA" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "biB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/medical/chemistry) "biC" = (/obj/structure/table/glass,/obj/machinery/reagentgrinder,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "biD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) @@ -3159,8 +3159,8 @@ "biM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/medbay) "biN" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/medical) "biO" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/medical) -"biP" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) -"biQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) +"biP" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) +"biQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "biR" = (/obj/machinery/camera{c_tag = "Medbay Morgue"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "biS" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/storage/emergency) "biT" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/storage/emergency) @@ -3179,7 +3179,7 @@ "bjg" = (/obj/structure/closet/firecloset,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "bjh" = (/obj/machinery/shower{dir = 8},/obj/structure/sign/securearea{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "bji" = (/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = -30; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) -"bjj" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) +"bjj" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) "bjk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) "bjl" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) "bjm" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) @@ -3194,7 +3194,7 @@ "bjv" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/maintenance/port) "bjw" = (/obj/machinery/door/airlock/maintenance{name = "Cargo Bay Maintenance"; req_access_txt = "31"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/quartermaster/storage) "bjx" = (/turf/simulated/floor/plasteel,/area/quartermaster/storage) -"bjy" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/storage) +"bjy" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "bjz" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/quartermaster/storage) "bjA" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/quartermaster/office) "bjB" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/quartermaster/office) @@ -3206,7 +3206,7 @@ "bjH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/quartermaster/office) "bjI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/hallway/primary/central) "bjJ" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"bjK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bjK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bjL" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bjM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bjN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/power/apc{dir = 2; name = "Head of Personnel APC"; pixel_y = -24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/crew_quarters/heads) @@ -3228,8 +3228,8 @@ "bkd" = (/obj/structure/closet/secure_closet/injection,/obj/structure/cable,/obj/machinery/power/apc{dir = 2; name = "Prisoner Transfer Centre"; pixel_x = 0; pixel_y = -27},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/transfer) "bke" = (/obj/structure/table/reinforced,/obj/machinery/camera{c_tag = "Medbay Foyer"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/cell_charger,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bkf" = (/obj/machinery/power/apc{dir = 8; name = "Medbay Security APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/medical) -"bkg" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/checkpoint/medical) -"bkh" = (/obj/structure/reagent_dispensers/peppertank{pixel_x = 30; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/medical) +"bkg" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/checkpoint/medical) +"bkh" = (/obj/structure/reagent_dispensers/peppertank{pixel_x = 30; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/medical) "bki" = (/obj/structure/bodycontainer/morgue,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark{name = "revenantspawn"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bkj" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "bkk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) @@ -3237,16 +3237,16 @@ "bkm" = (/turf/simulated/floor/mech_bay_recharge_floor,/area/assembly/chargebay) "bkn" = (/obj/machinery/computer/mech_bay_power_console,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/bluegrid,/area/assembly/chargebay) "bko" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/assembly/chargebay) -"bkp" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/assembly/chargebay) +"bkp" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "bkq" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/assembly/robotics) "bkr" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 20; pixel_x = -3; pixel_y = 6},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/device/multitool{pixel_x = 3},/obj/item/device/multitool{pixel_x = 3},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/assembly/robotics) "bks" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/assembly/robotics) "bkt" = (/obj/machinery/mecha_part_fabricator,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/assembly/robotics) -"bku" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/assembly/robotics) +"bku" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/assembly/robotics) "bkv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics) "bkw" = (/obj/machinery/ai_status_display{pixel_x = 32; pixel_y = 0},/obj/structure/table,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics) -"bkx" = (/obj/structure/closet/firecloset,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) -"bky" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) +"bkx" = (/obj/structure/closet/firecloset,/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) +"bky" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "bkz" = (/obj/machinery/r_n_d/destructive_analyzer,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/lab) "bkA" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/lab) "bkB" = (/obj/machinery/r_n_d/protolathe,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/lab) @@ -3285,12 +3285,12 @@ "bli" = (/turf/simulated/wall/r_wall,/area/crew_quarters/heads) "blj" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/wall/r_wall,/area/engine/gravity_generator) "blk" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) -"bll" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) +"bll" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "blm" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravity_generator) "bln" = (/turf/simulated/wall,/area/crew_quarters/captain) "blo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/captain) "blp" = (/obj/machinery/light/small{dir = 1},/obj/structure/dresser,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/captain) -"blq" = (/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"blq" = (/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain) "blr" = (/obj/machinery/door/airlock{name = "Private Restroom"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/captain) "bls" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 28},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/captain) "blt" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/crew_quarters/captain) @@ -3368,7 +3368,7 @@ "bmN" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bmO" = (/obj/structure/toilet{dir = 4},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/crew_quarters/captain) "bmP" = (/obj/structure/table/glass,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/screwdriver{pixel_x = -2; pixel_y = 6},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) -"bmQ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) +"bmQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bmR" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/device/radio/headset/headset_med,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bmS" = (/turf/simulated/wall,/area/medical/medbay) "bmT" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteblue"},/area/medical/medbay) @@ -3394,7 +3394,7 @@ "bnn" = (/obj/machinery/door/firedoor/heavy,/obj/machinery/door/poddoor/preopen{id = "Biohazard"; name = "biohazard containment door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/medical/research{name = "Research Division"}) "bno" = (/turf/simulated/wall,/area/toxins/lab) "bnp" = (/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/lab) -"bnq" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/lab) +"bnq" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/lab) "bnr" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/lab) "bns" = (/obj/item/weapon/stock_parts/console_screen,/obj/structure/table/glass,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/lab) "bnt" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -3411,7 +3411,7 @@ "bnE" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/window/westleft{name = "Cargo Desk"; req_access_txt = "50"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/office) "bnF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/quartermaster/office) "bnG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/office) -"bnH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"bnH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/office) "bnI" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "browncorner"},/area/hallway/primary/central) "bnJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bnK" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/hallway/primary/central) @@ -3427,7 +3427,7 @@ "bnU" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/engine/gravity_generator) "bnV" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/engine/gravity_generator) "bnW" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 4},/obj/machinery/camera{c_tag = "Captain's Quarters"; dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/captain) -"bnX" = (/obj/structure/closet/secure_closet/captains,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bnX" = (/obj/structure/closet/secure_closet/captains,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bnY" = (/obj/structure/table/wood,/obj/item/weapon/storage/box/matches,/obj/item/weapon/reagent_containers/food/drinks/flask{pixel_x = 8},/obj/item/weapon/razor{pixel_x = -4; pixel_y = 2},/obj/item/clothing/mask/cigarette/cigar,/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bnZ" = (/obj/structure/bodycontainer/morgue,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/effect/landmark{name = "revenantspawn"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/morgue) "boa" = (/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel,/area/hallway/primary/central) @@ -3459,10 +3459,10 @@ "boA" = (/turf/simulated/floor/bluegrid,/area/assembly/chargebay) "boB" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/bluegrid,/area/assembly/chargebay) "boC" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/assembly/chargebay) -"boD" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/assembly/chargebay) +"boD" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "boE" = (/obj/structure/table,/obj/item/weapon/retractor,/obj/item/weapon/hemostat,/turf/simulated/floor/plasteel,/area/assembly/robotics) "boF" = (/obj/structure/table,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/device/mmi,/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/turf/simulated/floor/plasteel,/area/assembly/robotics) -"boG" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/assembly/robotics) +"boG" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/assembly/robotics) "boH" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics) "boI" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters/preopen{id = "robotics2"; name = "robotics lab shutters"},/obj/structure/window/fulltile,/obj/machinery/door/poddoor/shutters/preopen{id = "robotics2"; name = "robotics lab shutters"},/turf/simulated/floor/plating,/area/assembly/robotics) "boJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitecorner"},/area/medical/research{name = "Research Division"}) @@ -3510,7 +3510,7 @@ "bpz" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Chemistry Lab"; req_access_txt = "5; 33"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bpA" = (/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/chemistry) "bpB" = (/obj/structure/table/reinforced,/obj/machinery/door/window/southleft{dir = 1; name = "Chemistry Desk"; req_access_txt = "33"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/medical/chemistry) -"bpC" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/doorButtons/access_button{idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; req_access_txt = "39"},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/medical/virology) +"bpC" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/doorButtons/access_button{idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; req_access_txt = "39"},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/medical/virology) "bpD" = (/obj/structure/stool/bed/roller,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bpE" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bpF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -3555,8 +3555,8 @@ "bqs" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/sign/securearea{pixel_x = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bqt" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bqu" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"bqv" = (/obj/machinery/atmospherics/binary/valve{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"bqw" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"bqv" = (/obj/machinery/atmospherics/components/binary/valve{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"bqw" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bqx" = (/obj/machinery/door/airlock/external{name = "Supply Dock Airlock"; req_access_txt = "31"},/turf/simulated/floor/plating,/area/quartermaster/storage) "bqy" = (/turf/simulated/floor/plating,/area/quartermaster/storage) "bqz" = (/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/quartermaster/storage) @@ -3576,9 +3576,9 @@ "bqN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/heads) "bqO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/wall/r_wall,/area/engine/gravity_generator) "bqP" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/turf/simulated/wall/r_wall,/area/engine/gravity_generator) -"bqQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) +"bqQ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) "bqR" = (/turf/simulated/floor/plasteel,/area/engine/gravity_generator) -"bqS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) +"bqS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/gravity_generator) "bqT" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/turf/simulated/wall/r_wall,/area/engine/gravity_generator) "bqU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/wall/r_wall,/area/engine/gravity_generator) "bqV" = (/turf/simulated/wall,/area/teleporter) @@ -3587,7 +3587,7 @@ "bqY" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/structure/closet/crate,/obj/item/weapon/crowbar,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/teleporter) "bqZ" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/teleporter) "bra" = (/obj/machinery/camera{c_tag = "Teleporter"},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/teleporter) -"brb" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/teleporter) +"brb" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/teleporter) "brc" = (/obj/machinery/light_switch{pixel_x = 27},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/teleporter) "brd" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/hallway/primary/central) "bre" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/clothing/tie/stethoscope,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/structure/sign/nosmoking_2{pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteyellowcorner"},/area/medical/medbay) @@ -3611,7 +3611,7 @@ "brw" = (/obj/structure/stool/bed/roller,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 6; icon_state = "whiteblue"},/area/medical/medbay) "brx" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/disks{pixel_x = 2; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bry" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) -"brz" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) +"brz" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "brA" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "brB" = (/obj/machinery/door/window/westleft{name = "Monkey Pen"; req_access_txt = "9"},/turf/simulated/floor/plasteel,/area/medical/genetics) "brC" = (/obj/structure/table,/obj/item/weapon/crowbar/large,/turf/simulated/floor/plasteel,/area/assembly/chargebay) @@ -3646,7 +3646,7 @@ "bsf" = (/obj/machinery/camera{c_tag = "Cargo Recieving Dock"; dir = 4},/obj/machinery/door_control{id = "QMLoaddoor"; layer = 4; name = "Loading Doors"; pixel_x = -24; pixel_y = -8},/obj/machinery/door_control{dir = 2; id = "QMLoaddoor2"; layer = 4; name = "Loading Doors"; pixel_x = -24; pixel_y = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/quartermaster/storage) "bsg" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #2"},/obj/machinery/bot/mulebot{home_destination = "QM #2"; suffix = "#2"},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/quartermaster/storage) "bsh" = (/obj/structure/table,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/weapon/folder/yellow,/turf/simulated/floor/plasteel,/area/quartermaster/office) -"bsi" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"bsi" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) "bsj" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/office) "bsk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/office) "bsl" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_mining{name = "Cargo Office"; req_access_txt = "50"},/turf/simulated/floor/plasteel,/area/quartermaster/office) @@ -3655,7 +3655,7 @@ "bso" = (/obj/structure/table,/obj/machinery/recharger,/turf/simulated/floor/plasteel{dir = 9; icon_state = "blue"},/area/crew_quarters/heads) "bsp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/heads) "bsq" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/plasteel,/area/crew_quarters/heads) -"bsr" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/heads) +"bsr" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/crew_quarters/heads) "bss" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/heads) "bst" = (/turf/simulated/wall/r_wall,/area/engine/gravity_generator) "bsu" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/engineering{name = "Gravity Generator"; req_access_txt = "11"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/gravity_generator) @@ -3677,7 +3677,7 @@ "bsK" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bsL" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bsM" = (/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"bsN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"bsN" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bsO" = (/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; frequency = 1485; listening = 1; name = "Station Intercom (Medbay)"; pixel_x = 30; pixel_y = 0},/obj/machinery/camera{c_tag = "Medbay East"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bsP" = (/turf/simulated/wall,/area/medical/genetics) "bsQ" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{id_tag = "GeneticsDoor"; name = "Genetics"; req_access_txt = "5; 9"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) @@ -3689,7 +3689,7 @@ "bsW" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/poddoor/shutters/preopen{id = "robotics2"; name = "robotics lab shutters"},/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/assembly/robotics) "bsX" = (/obj/machinery/door/airlock/research{name = "Robotics Lab"; req_access_txt = "29"; req_one_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics) "bsY" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters/preopen{id = "robotics2"; name = "robotics lab shutters"},/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/assembly/robotics) -"bsZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/status_display{density = 0; layer = 3; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) +"bsZ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/status_display{density = 0; layer = 3; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "bta" = (/obj/structure/disposalpipe/segment,/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "btb" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "btc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -3706,13 +3706,13 @@ "btn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bto" = (/obj/docking_port/stationary{dir = 8; dwidth = 5; height = 7; id = "supply_home"; name = "supply bay"; width = 12},/turf/space,/area/space) "btp" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id = "QMLoad"},/turf/simulated/floor/plasteel,/area/quartermaster/storage) -"btq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) +"btq" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "btr" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #3"},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/quartermaster/storage) "bts" = (/obj/structure/table,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel,/area/quartermaster/office) -"btt" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"btt" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/office) "btu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/office) "btv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/office) -"btw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) +"btw" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/office) "btx" = (/obj/structure/stool/bed/chair{dir = 8},/obj/machinery/light,/turf/simulated/floor/plasteel,/area/quartermaster/office) "bty" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/hallway/primary/central) "btz" = (/obj/machinery/keycard_auth{pixel_x = -24; pixel_y = 0},/obj/machinery/computer/supplycomp,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/crew_quarters/heads) @@ -3720,10 +3720,10 @@ "btB" = (/obj/structure/table,/obj/item/weapon/folder/blue,/obj/item/weapon/stamp/hop,/turf/simulated/floor/plasteel,/area/crew_quarters/heads) "btC" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel,/area/crew_quarters/heads) "btD" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/wall,/area/engine/gravity_generator) -"btE" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/engine/gravity_generator) -"btF" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/camera{c_tag = "Gravity Generator Foyer"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/engine/gravity_generator) +"btE" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/engine/gravity_generator) +"btF" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/camera{c_tag = "Gravity Generator Foyer"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/engine/gravity_generator) "btG" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/wall,/area/engine/gravity_generator) -"btH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/teleporter) +"btH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/teleporter) "btI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/teleporter) "btJ" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/teleporter) "btK" = (/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/teleporter) @@ -3731,7 +3731,7 @@ "btM" = (/obj/machinery/shieldwallgen,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/teleporter) "btN" = (/obj/structure/closet/crate,/turf/simulated/floor/plasteel,/area/teleporter) "btO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/sign/securearea{pixel_x = -32; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/hallway/primary/central) -"btP" = (/obj/machinery/requests_console{announcementConsole = 0; department = "Medbay"; departmentType = 1; name = "Medbay RC"; pixel_x = -30; pixel_y = 0; pixel_z = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"btP" = (/obj/machinery/requests_console{announcementConsole = 0; department = "Medbay"; departmentType = 1; name = "Medbay RC"; pixel_x = -30; pixel_y = 0; pixel_z = 0},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "btQ" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "btR" = (/obj/machinery/vending/medical{pixel_x = -2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "btS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/medical/sleeper) @@ -3748,7 +3748,7 @@ "bud" = (/obj/structure/closet/secure_closet/personal/patient,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bue" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/genetics) "buf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) -"bug" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) +"bug" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "buh" = (/obj/machinery/dna_scannernew,/turf/simulated/floor/plasteel{dir = 6; icon_state = "whiteblue"},/area/medical/genetics) "bui" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/medical/genetics) "buj" = (/obj/structure/window/reinforced,/mob/living/carbon/monkey,/turf/simulated/floor/plasteel,/area/medical/genetics) @@ -3791,7 +3791,7 @@ "buU" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/secure_closet/hop,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 10},/area/crew_quarters/heads) "buV" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Head of Personnel's Desk"; departmentType = 5; name = "Head of Personnel RC"; pixel_y = -30},/obj/machinery/camera{c_tag = "Head of Personnel's Office"; dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/crew_quarters/heads) "buW" = (/obj/structure/table,/obj/item/weapon/book/manual/wiki/security_space_law,/turf/simulated/floor/plasteel,/area/crew_quarters/heads) -"buX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/heads) +"buX" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/heads) "buY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/crew_quarters/heads) "buZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/engine/gravity_generator) "bva" = (/obj/structure/closet/radiation,/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/gravity_generator) @@ -3814,7 +3814,7 @@ "bvr" = (/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 8},/turf/simulated/floor/plasteel,/area/medical/sleeper) "bvs" = (/obj/structure/sign/nosmoking_2,/turf/simulated/wall,/area/medical/sleeper) "bvt" = (/obj/structure/table/glass,/obj/item/weapon/folder/white,/obj/item/device/radio/headset/headset_medsci,/obj/machinery/requests_console{department = "Genetics"; departmentType = 0; name = "Genetics Requests Console"; pixel_x = 0; pixel_y = 30},/obj/item/weapon/storage/pill_bottle/mutadone,/obj/item/weapon/storage/pill_bottle/mannitol,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) -"bvu" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor/plasteel,/area/medical/sleeper) +"bvu" = (/obj/machinery/atmospherics/components/unary/cryo_cell,/turf/simulated/floor/plasteel,/area/medical/sleeper) "bvv" = (/obj/structure/table,/obj/machinery/cell_charger,/turf/simulated/floor/plasteel,/area/medical/sleeper) "bvw" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bvx" = (/obj/machinery/camera{c_tag = "Genetics Cloning"; dir = 4; network = list("SS13")},/obj/structure/table,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/weapon/storage/box/rxglasses{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) @@ -3847,13 +3847,13 @@ "bvY" = (/obj/machinery/ai_status_display{pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/crew_quarters/hor) "bvZ" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bwa" = (/obj/machinery/power/apc{dir = 4; name = "Experimentation Lab APC"; pixel_x = 26; pixel_y = 0},/obj/structure/cable,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) -"bwb" = (/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 0; pixel_y = -30},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"bwb" = (/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 0; pixel_y = -30},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "bwc" = (/obj/machinery/light_switch{pixel_x = -20; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "bwd" = (/obj/structure/stool/bed/chair/office/light,/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "bwe" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) -"bwf" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"bwf" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "bwg" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"bwh" = (/obj/machinery/atmospherics/unary/cold_sink/freezer,/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"bwh" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bwi" = (/turf/simulated/wall,/area/quartermaster/qm) "bwj" = (/obj/machinery/door/airlock/glass_mining{name = "Quartermaster"; req_access_txt = "41"},/turf/simulated/floor/plasteel,/area/quartermaster/qm) "bwk" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/quartermaster/qm) @@ -3874,7 +3874,7 @@ "bwz" = (/obj/machinery/door/airlock/glass_medical{id_tag = ""; name = "Surgery Observation"; req_access_txt = "0"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) "bwA" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bwB" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) -"bwC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) +"bwC" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bwD" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/medical/sleeper) "bwE" = (/turf/simulated/floor/plasteel,/area/medical/sleeper) "bwF" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/turf/simulated/floor/plasteel,/area/medical/sleeper) @@ -3882,9 +3882,9 @@ "bwH" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/turf/simulated/floor/plasteel,/area/medical/sleeper) "bwI" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10; pixel_x = 0; initialize_directions = 10},/turf/simulated/floor/plasteel,/area/medical/sleeper) "bwJ" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) -"bwK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) +"bwK" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bwL" = (/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Geneticist"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) -"bwM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) +"bwM" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bwN" = (/obj/machinery/door/airlock/glass_research{name = "Genetics Research"; req_access_txt = "5; 9"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bwO" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bwP" = (/obj/machinery/camera{c_tag = "Genetics Research"; dir = 1; network = list("SS13","RD"); pixel_x = 0},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurple"},/area/medical/genetics) @@ -3897,7 +3897,7 @@ "bwW" = (/obj/machinery/door/airlock/glass_security{name = "Security Office"; req_access_txt = "63"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/checkpoint/science) "bwX" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/checkpoint/science) "bwY" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/checkpoint/science) -"bwZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) +"bwZ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "bxa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bxb" = (/obj/structure/table,/obj/machinery/door_control{id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 5; req_access_txt = "47"},/obj/machinery/door_control{id = "rnd2"; name = "Research Lab Shutter Control"; pixel_x = 5; pixel_y = 5; req_access_txt = "47"},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) "bxc" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/effect/landmark/start{name = "Research Director"},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) @@ -3919,12 +3919,12 @@ "bxs" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "bxt" = (/obj/machinery/light{dir = 1},/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "bxu" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/checkpoint/supply) -"bxv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/supply) +"bxv" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/supply) "bxw" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/effect/landmark/start/depsec/supply,/turf/simulated/floor/plasteel,/area/security/checkpoint/supply) "bxx" = (/turf/simulated/floor/plasteel,/area/security/checkpoint/supply) "bxy" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/computer/security/mining,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/supply) "bxz" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"bxA" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bxA" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bxB" = (/obj/structure/sign/securearea{pixel_y = 32},/turf/simulated/floor/plasteel{dir = 1; icon_state = "blue"},/area/hallway/primary/central) "bxC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "blue"},/area/hallway/primary/central) "bxD" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "blue"},/area/hallway/primary/central) @@ -3934,15 +3934,15 @@ "bxH" = (/obj/structure/sign/securearea{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/primary/central) "bxI" = (/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/hallway/primary/central) "bxJ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"bxK" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) +"bxK" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) "bxL" = (/obj/structure/stool/bed/chair,/obj/machinery/camera{c_tag = "Surgery Observation"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) "bxM" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) "bxN" = (/obj/structure/stool/bed/chair,/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) -"bxO" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) +"bxO" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) "bxP" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/camera{c_tag = "Medbay Treatment Center"; dir = 4; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/iv_drip,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bxQ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bxR" = (/obj/effect/landmark/start{name = "Medical Doctor"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) -"bxS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) +"bxS" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bxT" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/turf/simulated/floor/plasteel,/area/medical/sleeper) "bxU" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 1},/turf/simulated/floor/plasteel,/area/medical/sleeper) "bxV" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/medical/sleeper) @@ -3956,14 +3956,14 @@ "byd" = (/obj/structure/closet/wardrobe/genetics_white,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "bye" = (/turf/simulated/wall,/area/maintenance/asmaint) "byf" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) -"byg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) +"byg" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) "byh" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/toxins/server) "byi" = (/obj/machinery/atmospherics/pipe/simple{dir = 10},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server) "byj" = (/obj/machinery/camera{c_tag = "Server Room"; dir = 2; network = list("SS13","RD"); pixel_x = 22},/obj/machinery/power/apc{dir = 1; name = "Server Room APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server) -"byk" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{current_temperature = 80; dir = 2; on = 1},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server) +"byk" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{current_temperature = 80; dir = 2; on = 1},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server) "byl" = (/obj/structure/reagent_dispensers/peppertank{pixel_x = -30; pixel_y = 0},/obj/machinery/alarm{pixel_y = 25},/obj/structure/closet,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/checkpoint/science) "bym" = (/obj/machinery/light_switch{pixel_x = 8; pixel_y = 28},/obj/machinery/door_control{id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 28; req_access_txt = "47"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint/science) -"byn" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint/science) +"byn" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint/science) "byo" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{desc = "Used for watching the RD's goons from the safety of your own office."; name = "Research Monitor"; network = list("RD"); pixel_x = 0; pixel_y = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/checkpoint/science) "byp" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/checkpoint/science) "byq" = (/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) @@ -3971,7 +3971,7 @@ "bys" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "byt" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/hor) "byu" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) -"byv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) +"byv" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) "byw" = (/obj/machinery/computer/mecha,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) "byx" = (/obj/structure/rack,/obj/item/device/taperecorder{pixel_x = -3},/obj/item/device/paicard{pixel_x = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/crew_quarters/hor) "byy" = (/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/crew_quarters/hor) @@ -3990,15 +3990,15 @@ "byL" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "byM" = (/obj/machinery/door/airlock/glass_security{name = "Security Office"; req_access_txt = "63"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/security/checkpoint/supply) "byN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/supply) -"byO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/checkpoint/supply) +"byO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/security/checkpoint/supply) "byP" = (/obj/item/weapon/screwdriver{pixel_y = 10},/obj/machinery/light{dir = 4},/obj/item/device/radio/off,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/supply) "byQ" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=AIW"; location = "QM"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "byR" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=AftH"; location = "AIW"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/central) "byS" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/hallway/primary/central) "byT" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=CHE"; location = "AIE"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"byU" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"byU" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "byV" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=HOP"; location = "CHE"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"byW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"byW" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "byX" = (/obj/structure/stool/bed/chair,/obj/structure/sign/nosmoking_2{pixel_x = -28},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) "byY" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) "byZ" = (/obj/machinery/hologram/holopad,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/sleeper) @@ -4007,9 +4007,9 @@ "bzc" = (/obj/machinery/light,/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 8},/turf/simulated/floor/plasteel,/area/medical/sleeper) "bzd" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel,/area/medical/sleeper) "bze" = (/obj/structure/table/reinforced,/obj/item/weapon/wrench{pixel_x = 5; pixel_y = -5},/turf/simulated/floor/plasteel,/area/medical/sleeper) -"bzf" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1; name = "Connector Port (Air Supply)"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/light,/turf/simulated/floor/plasteel,/area/medical/sleeper) -"bzg" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1; name = "Connector Port (Air Supply)"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel,/area/medical/sleeper) -"bzh" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 1},/turf/simulated/floor/plasteel,/area/medical/sleeper) +"bzf" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1; name = "Connector Port (Air Supply)"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/light,/turf/simulated/floor/plasteel,/area/medical/sleeper) +"bzg" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1; name = "Connector Port (Air Supply)"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel,/area/medical/sleeper) +"bzh" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{dir = 1},/turf/simulated/floor/plasteel,/area/medical/sleeper) "bzi" = (/turf/simulated/floor/plating,/area/maintenance/asmaint) "bzj" = (/obj/structure/reagent_dispensers/watertank,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bzk" = (/obj/machinery/alarm/server{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) @@ -4021,7 +4021,7 @@ "bzq" = (/obj/machinery/camera{c_tag = "Security Post - Science"; dir = 4; network = list("SS13","RD")},/obj/machinery/newscaster{pixel_x = -30},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/science) "bzr" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/security/checkpoint/science) "bzs" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/security/checkpoint/science) -"bzt" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/landmark/start/depsec/science,/turf/simulated/floor/plasteel,/area/security/checkpoint/science) +"bzt" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/landmark/start/depsec/science,/turf/simulated/floor/plasteel,/area/security/checkpoint/science) "bzu" = (/obj/structure/table,/obj/item/weapon/book/manual/wiki/security_space_law,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/science) "bzv" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bzw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) @@ -4029,7 +4029,7 @@ "bzy" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) "bzz" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) "bzA" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) -"bzB" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) +"bzB" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/hor) "bzC" = (/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/book/manual/experimentor,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitecorner"},/area/toxins/explab) "bzD" = (/obj/structure/closet/radiation,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitecorner"},/area/toxins/explab) "bzE" = (/obj/machinery/computer/security/mining,/obj/machinery/camera{c_tag = "Quartermaster's Office"; dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -35},/obj/machinery/status_display{density = 0; pixel_x = -32; pixel_y = 0; supply_display = 1},/turf/simulated/floor/plasteel{dir = 10; icon_state = "brown"},/area/quartermaster/qm) @@ -4050,7 +4050,7 @@ "bzT" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bzU" = (/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/camera{c_tag = "Central Primary Hallway South-West"; dir = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bzV" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/hallway/primary/central) -"bzW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/plasteel,/area/hallway/primary/central) +"bzW" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bzX" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bzY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bzZ" = (/obj/structure/sign/directions/security{dir = 1; icon_state = "direction_sec"; pixel_x = 32; pixel_y = 40; tag = "icon-direction_sec (NORTH)"},/obj/structure/sign/directions/medical{dir = 4; icon_state = "direction_med"; pixel_x = 32; pixel_y = 32; tag = "icon-direction_med (EAST)"},/obj/structure/sign/directions/evac{dir = 4; icon_state = "direction_evac"; pixel_x = 32; pixel_y = 24; tag = "icon-direction_evac (EAST)"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "bluecorner"},/area/hallway/primary/central) @@ -4073,7 +4073,7 @@ "bAq" = (/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Recovery Room"; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bAr" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/medical/sleeper) "bAs" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"bAt" = (/obj/structure/table,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/weapon/pen,/obj/machinery/requests_console{announcementConsole = 0; department = "Medbay"; departmentType = 1; name = "Medbay RC"; pixel_x = 0; pixel_y = 30; pixel_z = 0},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"bAt" = (/obj/structure/table,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/weapon/pen,/obj/machinery/requests_console{announcementConsole = 0; department = "Medbay"; departmentType = 1; name = "Medbay RC"; pixel_x = 0; pixel_y = 30; pixel_z = 0},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bAu" = (/obj/machinery/vending/medical{pixel_x = -2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bAv" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bAw" = (/turf/simulated/wall,/area/medical/cmo) @@ -4083,7 +4083,7 @@ "bAA" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) "bAB" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bAC" = (/obj/machinery/r_n_d/server/core,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) -"bAD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 120; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) +"bAD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 120; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) "bAE" = (/obj/structure/grille,/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/toxins/server) "bAF" = (/obj/machinery/atmospherics/pipe/simple{dir = 9},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server) "bAG" = (/obj/machinery/computer/rdservercontrol,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/toxins/server) @@ -4104,7 +4104,7 @@ "bAV" = (/obj/machinery/door_control{id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/toxins/explab) "bAW" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bAX" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) -"bAY" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) +"bAY" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "bAZ" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "bBa" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "bBb" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/aft) @@ -4140,7 +4140,7 @@ "bBF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bBG" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bBH" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/cmo) -"bBI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) +"bBI" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) "bBJ" = (/obj/structure/stool/bed/chair/office/light,/obj/effect/landmark/start{name = "Chief Medical Officer"},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) "bBK" = (/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) "bBL" = (/obj/machinery/keycard_auth{pixel_x = 24; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) @@ -4169,14 +4169,14 @@ "bCi" = (/obj/structure/table,/obj/item/weapon/screwdriver{pixel_y = 16},/obj/item/weapon/wirecutters,/turf/simulated/floor/plating,/area/storage/tech) "bCj" = (/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plating,/area/storage/tech) "bCk" = (/obj/machinery/camera{c_tag = "Tech Storage"; dir = 2},/obj/machinery/power/apc{dir = 1; name = "Tech Storage APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/storage/tech) -"bCl" = (/obj/structure/table,/obj/item/device/analyzer,/obj/item/device/healthanalyzer,/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/storage/tech) +"bCl" = (/obj/structure/table,/obj/item/device/analyzer,/obj/item/device/healthanalyzer,/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/storage/tech) "bCm" = (/obj/structure/table,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) "bCn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) "bCo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/storage/tech) "bCp" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/aft) "bCq" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "bCr" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 2; icon_state = "yellowcorner"},/area/hallway/primary/aft) -"bCs" = (/obj/structure/closet/jcloset,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/janitor) +"bCs" = (/obj/structure/closet/jcloset,/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/janitor) "bCt" = (/obj/structure/closet/l3closet/janitor,/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plasteel,/area/janitor) "bCu" = (/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plasteel,/area/janitor) "bCv" = (/turf/simulated/floor/plasteel,/area/janitor) @@ -4220,9 +4220,9 @@ "bDh" = (/obj/machinery/portable_atmospherics/canister,/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/toxins/mixing) "bDi" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/turf/simulated/floor/plasteel,/area/medical/sleeper) "bDj" = (/obj/machinery/portable_atmospherics/pump,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/toxins/mixing) -"bDk" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"},/area/toxins/mixing) -"bDl" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/mixing) -"bDm" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 5},/area/toxins/mixing) +"bDk" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"},/area/toxins/mixing) +"bDl" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 1},/area/toxins/mixing) +"bDm" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 5},/area/toxins/mixing) "bDn" = (/turf/simulated/wall/r_wall,/area/toxins/mixing) "bDo" = (/obj/structure/closet/crate,/obj/effect/spawner/lootdrop/maintenance{lootcount = 4; name = "4maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bDp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/toxins/mixing) @@ -4270,19 +4270,19 @@ "bEf" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bEg" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"},/area/medical/sleeper) "bEh" = (/obj/structure/table,/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/clothing/tie/stethoscope,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) -"bEi" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) -"bEj" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) +"bEi" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) +"bEj" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bEk" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bEl" = (/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; frequency = 1485; listening = 1; name = "Station Intercom (Medbay)"; pixel_x = -30; pixel_y = 0},/obj/machinery/camera{c_tag = "Medbay South"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bEm" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bEn" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/cmo) -"bEo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) +"bEo" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) "bEp" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) "bEq" = (/obj/structure/disposalpipe/segment,/obj/machinery/light_switch{pixel_x = 28; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/medical/cmo) "bEr" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/storage) -"bEs" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/storage) +"bEs" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/storage) "bEt" = (/obj/effect/decal/cleanable/oil,/obj/item/weapon/cigbutt,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/storage) -"bEu" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/storage) +"bEu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/storage) "bEv" = (/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/storage) "bEw" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "bEx" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -4307,7 +4307,7 @@ "bEQ" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/wall/shuttle{icon_state = "swall_f9"; dir = 2},/area/shuttle/pod_2) "bER" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/quartermaster/miningdock) "bES" = (/obj/machinery/computer/shuttle/mining,/turf/simulated/floor/plasteel{dir = 9; icon_state = "brown"},/area/quartermaster/miningdock) -"bET" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) +"bET" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "bEU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "bEV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "bEW" = (/obj/structure/closet/secure_closet/miner,/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) @@ -4323,13 +4323,13 @@ "bFg" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/mining,/obj/item/weapon/circuitboard/autolathe{pixel_x = 3; pixel_y = -3},/obj/item/weapon/circuitboard/arcade/battle,/turf/simulated/floor/plating,/area/storage/tech) "bFh" = (/obj/structure/rack,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/receiver,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/broadcaster,/obj/item/weapon/circuitboard/message_monitor{pixel_y = -5},/turf/simulated/floor/plating,/area/storage/tech) "bFi" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) -"bFj" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "yellowcorner"},/area/hallway/primary/aft) -"bFk" = (/obj/machinery/atmospherics/binary/pump{dir = 2; on = 1},/obj/machinery/doorButtons/access_button{idDoor = "incinerator_airlock_exterior"; idSelf = "incinerator_access_control"; layer = 3.1; name = "Incinerator airlock control"; pixel_x = 8; pixel_y = -24},/obj/machinery/light/small{dir = 8},/obj/structure/sign/fire{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/engine,/area/maintenance/incinerator) +"bFj" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "yellowcorner"},/area/hallway/primary/aft) +"bFk" = (/obj/machinery/atmospherics/components/binary/pump{dir = 2; on = 1},/obj/machinery/doorButtons/access_button{idDoor = "incinerator_airlock_exterior"; idSelf = "incinerator_access_control"; layer = 3.1; name = "Incinerator airlock control"; pixel_x = 8; pixel_y = -24},/obj/machinery/light/small{dir = 8},/obj/structure/sign/fire{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/engine,/area/maintenance/incinerator) "bFl" = (/obj/structure/table,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; pixel_y = -29},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor/plasteel,/area/janitor) "bFm" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light,/turf/simulated/floor/plasteel,/area/janitor) "bFn" = (/obj/structure/janitorialcart,/turf/simulated/floor/plasteel,/area/janitor) "bFo" = (/obj/item/weapon/restraints/legcuffs/beartrap,/obj/item/weapon/restraints/legcuffs/beartrap,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/turf/simulated/floor/plasteel,/area/janitor) -"bFp" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/janitor) +"bFp" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/janitor) "bFq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bFr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bFs" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -4344,7 +4344,7 @@ "bFB" = (/obj/structure/grille,/obj/machinery/door/poddoor/preopen{id = "telelab"; name = "test chamber blast door"},/obj/structure/window/reinforced/fulltile,/obj/machinery/door/firedoor/heavy,/turf/simulated/floor/engine,/area/toxins/explab) "bFC" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/obj/item/weapon/gun/syringe,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bFD" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/brute{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/brute,/obj/item/weapon/storage/firstaid/regular{pixel_x = -3; pixel_y = -3},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) -"bFE" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"bFE" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bFF" = (/obj/structure/closet/secure_closet/personal/patient,/obj/machinery/door_control{id = "medpriv4"; name = "Privacy Shutters"; pixel_y = 25},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bFG" = (/obj/structure/grille,/obj/machinery/door/poddoor/preopen{id = "medpriv4"; name = "privacy door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/medical/medbay) "bFH" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -4362,14 +4362,14 @@ "bFT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/research{name = "Toxins Storage"; req_access_txt = "8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/storage) "bFU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "bFV" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"bFW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) +"bFW" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "bFX" = (/obj/machinery/door/firedoor/heavy,/obj/machinery/door/airlock/research{name = "Toxins Lab"; req_access_txt = "8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) -"bFY" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) +"bFY" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bFZ" = (/obj/structure/sign/securearea{pixel_x = -32},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 1},/area/toxins/mixing) "bGa" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/toxins/mixing) "bGb" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 2},/area/toxins/mixing) "bGc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/toxins/mixing) -"bGd" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel,/area/toxins/mixing) +"bGd" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel,/area/toxins/mixing) "bGe" = (/obj/machinery/driver_button{dir = 2; id = "toxinsdriver"; pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 8},/area/toxins/mixing) "bGf" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/computer/security/telescreen{desc = "Used for watching the test chamber."; dir = 8; layer = 4; name = "Test Chamber Telescreen"; network = list("Toxins"); pixel_x = 30; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/mixing) "bGg" = (/obj/item/target,/obj/structure/window/reinforced,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/toxins/test_area) @@ -4401,22 +4401,22 @@ "bGG" = (/obj/structure/disposalpipe/segment,/obj/structure/grille,/obj/structure/window/fulltile{health = 35},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bGH" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bGI" = (/obj/structure/disposalpipe/segment,/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bGJ" = (/obj/structure/closet/secure_closet/medical2,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/medical/sleeper) +"bGJ" = (/obj/structure/closet/secure_closet/medical2,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/medical/sleeper) "bGK" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/sleeper) "bGL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/toxins/mixing) "bGM" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/sleeper) "bGN" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/morphine,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) -"bGO" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) +"bGO" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bGP" = (/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) -"bGQ" = (/obj/structure/closet/crate/freezer,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty{pixel_x = -3; pixel_y = -3},/obj/item/weapon/reagent_containers/blood/AMinus,/obj/item/weapon/reagent_containers/blood/BMinus{pixel_x = -4; pixel_y = 4},/obj/item/weapon/reagent_containers/blood/BPlus{pixel_x = 1; pixel_y = 2},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OPlus{pixel_x = -2; pixel_y = -1},/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/turf/simulated/floor/plasteel,/area/medical/sleeper) +"bGQ" = (/obj/structure/closet/crate/freezer,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty{pixel_x = -3; pixel_y = -3},/obj/item/weapon/reagent_containers/blood/AMinus,/obj/item/weapon/reagent_containers/blood/BMinus{pixel_x = -4; pixel_y = 4},/obj/item/weapon/reagent_containers/blood/BPlus{pixel_x = 1; pixel_y = 2},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OPlus{pixel_x = -2; pixel_y = -1},/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/turf/simulated/floor/plasteel,/area/medical/sleeper) "bGR" = (/obj/structure/table,/obj/machinery/light,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) -"bGS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) +"bGS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bGT" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bGU" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/asmaint2) "bGV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bGW" = (/obj/machinery/light,/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bGX" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"bGY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"bGY" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bGZ" = (/obj/machinery/door/airlock/medical{name = "Patient Room"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bHa" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bHb" = (/obj/structure/disposalpipe/junction{icon_state = "pipe-j2"; dir = 2},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -4438,7 +4438,7 @@ "bHr" = (/obj/item/device/assembly/prox_sensor{pixel_x = -4; pixel_y = 1},/obj/item/device/assembly/prox_sensor{pixel_x = 8; pixel_y = 9},/obj/item/device/assembly/prox_sensor{pixel_x = 9; pixel_y = -2},/obj/item/device/assembly/prox_sensor{pixel_x = 0; pixel_y = 2},/obj/structure/table/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bHs" = (/obj/structure/stool,/obj/effect/landmark/start{name = "Scientist"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bHt" = (/obj/structure/table/reinforced,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver{pixel_y = 10},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) -"bHu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) +"bHu" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bHv" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bHw" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) "bHx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/door/firedoor/heavy,/obj/machinery/door/airlock/research{name = "Toxins Launch Room Access"; req_access_txt = "8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) @@ -4447,7 +4447,7 @@ "bHA" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/mixing) "bHB" = (/obj/machinery/door/airlock/research{name = "Toxins Launch Room"; req_access_txt = "8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/toxins/mixing) "bHC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/toxins/mixing) -"bHD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 2},/area/toxins/mixing) +"bHD" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 2},/area/toxins/mixing) "bHE" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/toxins/mixing) "bHF" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'BOMB RANGE"; name = "BOMB RANGE"},/turf/simulated/wall,/area/toxins/test_area) "bHG" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plating/airless{dir = 9; icon_state = "warnplate"},/area/toxins/test_area) @@ -4480,7 +4480,7 @@ "bIh" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bIi" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bIj" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bIk" = (/obj/machinery/atmospherics/binary/valve/open{tag = "icon-mvalve_map (EAST)"; icon_state = "mvalve_map"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/asmaint) +"bIk" = (/obj/machinery/atmospherics/components/binary/valve/open{tag = "icon-mvalve_map (EAST)"; icon_state = "mvalve_map"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/asmaint) "bIl" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bIm" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bIn" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/shieldwallgen{req_access = list(55)},/turf/simulated/floor/plating,/area/toxins/xenobiology) @@ -4556,7 +4556,7 @@ "bJF" = (/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/obj/structure/table,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/xenobiology) "bJG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/toxins/xenobiology) "bJH" = (/obj/structure/sign/biohazard,/turf/simulated/wall,/area/toxins/xenobiology) -"bJI" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/door/firedoor/heavy,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) +"bJI" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/door/firedoor/heavy,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "bJJ" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/heavy,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bJK" = (/obj/machinery/camera{c_tag = "Research Division South"; dir = 8; network = list("SS13")},/obj/machinery/door/firedoor/heavy,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitehall"},/area/medical/research{name = "Research Division"}) "bJL" = (/obj/structure/sign/fire,/turf/simulated/wall,/area/medical/research{name = "Research Division"}) @@ -4578,7 +4578,7 @@ "bKb" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/machinery/light/small,/turf/simulated/floor/plating,/area/storage/tech) "bKc" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/turf/simulated/floor/plating,/area/storage/tech) "bKd" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/clothing/gloves/color/yellow,/obj/item/device/t_scanner,/obj/item/device/multitool,/turf/simulated/floor/plating,/area/storage/tech) -"bKe" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/device/multitool,/obj/item/clothing/glasses/meson,/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/storage/tech) +"bKe" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/device/multitool,/obj/item/clothing/glasses/meson,/obj/machinery/light/small,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/storage/tech) "bKf" = (/obj/machinery/requests_console{department = "Tech storage"; pixel_x = 0; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) "bKg" = (/obj/machinery/vending/assist,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) "bKh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/storage/tech) @@ -4598,7 +4598,7 @@ "bKv" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bKw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bKx" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/clothing/tie/stethoscope,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"bKy" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"bKy" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bKz" = (/obj/structure/closet/secure_closet/personal/patient,/obj/machinery/door_control{id = "medpriv1"; name = "Privacy Shutters"; pixel_y = -25},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bKA" = (/obj/structure/grille,/obj/machinery/door/poddoor/preopen{id = "medpriv1"; name = "privacy door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/medical/medbay) "bKB" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -4612,7 +4612,7 @@ "bKJ" = (/obj/machinery/power/apc{dir = 8; name = "Xenobiology APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bKK" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bKL" = (/obj/structure/stool,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) -"bKM" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) +"bKM" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bKN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bKO" = (/obj/machinery/monkey_recycler,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bKP" = (/obj/machinery/processor{desc = "A machine used to process slimes and retrieve their extract."; name = "Slime Processor"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) @@ -4624,12 +4624,12 @@ "bKV" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) "bKW" = (/obj/machinery/door/poddoor{id = "mixvent"; name = "Mixer Room Vent"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) "bKX" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) -"bKY" = (/obj/machinery/sparker{dir = 2; id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) +"bKY" = (/obj/machinery/sparker{dir = 2; id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) "bKZ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/mixing) -"bLa" = (/obj/machinery/airlock_sensor{id_tag = "tox_airlock_sensor"; master_tag = "tox_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/binary/pump{dir = 4; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing) +"bLa" = (/obj/machinery/airlock_sensor{id_tag = "tox_airlock_sensor"; master_tag = "tox_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/components/binary/pump{dir = 4; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing) "bLb" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/meter,/obj/machinery/embedded_controller/radio/airlock_controller{airpump_tag = "tox_airlock_pump"; exterior_door_tag = "tox_airlock_exterior"; id_tag = "tox_airlock_control"; interior_door_tag = "tox_airlock_interior"; pixel_x = -24; pixel_y = 0; sanitize_external = 1; sensor_tag = "tox_airlock_sensor"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warnwhitecorner"},/area/toxins/mixing) -"bLc" = (/obj/machinery/atmospherics/binary/valve{dir = 4; name = "mix to port"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/mixing) -"bLd" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/mixing) +"bLc" = (/obj/machinery/atmospherics/components/binary/valve{dir = 4; name = "mix to port"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/mixing) +"bLd" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/mixing) "bLe" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bLf" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/spawner/lootdrop/maintenance,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bLg" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plating/airless{dir = 10; icon_state = "warnplate"},/area/toxins/test_area) @@ -4638,20 +4638,20 @@ "bLj" = (/obj/structure/disposalpipe/segment,/obj/machinery/status_display{density = 0; layer = 3; pixel_x = -32; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/aft) "bLk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "bLl" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) -"bLm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/hallway/primary/aft) +"bLm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/hallway/primary/aft) "bLn" = (/turf/simulated/wall,/area/atmos) -"bLo" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel,/area/atmos) -"bLp" = (/obj/machinery/atmospherics/trinary/filter{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) -"bLq" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel,/area/atmos) +"bLo" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel,/area/atmos) +"bLp" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) +"bLq" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel,/area/atmos) "bLr" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/atmos) "bLs" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/atmos) "bLt" = (/obj/machinery/pipedispenser,/turf/simulated/floor/plasteel,/area/atmos) "bLu" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "bLv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 8},/obj/machinery/light{dir = 1},/obj/machinery/meter{frequency = 1443; id = "wloop_atm_meter"; name = "Waste Loop"},/turf/simulated/floor/plasteel,/area/atmos) -"bLw" = (/obj/machinery/camera{c_tag = "Atmospherics North East"},/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Distro to Waste"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bLw" = (/obj/machinery/camera{c_tag = "Atmospherics North East"},/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Distro to Waste"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bLx" = (/obj/machinery/atmospherics/pipe/manifold/supply/visible{dir = 2},/obj/machinery/meter{frequency = 1443; id = "dloop_atm_meter"; name = "Distribution Loop"},/turf/simulated/floor/plasteel,/area/atmos) "bLy" = (/obj/machinery/atmospherics/pipe/manifold/supply/visible{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) -"bLz" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Air to Distro"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bLz" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Air to Distro"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bLA" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 10; initialize_directions = 10},/turf/simulated/floor/plasteel,/area/atmos) "bLB" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 6},/turf/simulated/floor/plasteel,/area/atmos) "bLC" = (/obj/machinery/door/airlock/external{name = "Atmospherics External Airlock"; req_access_txt = "24"},/turf/simulated/floor/plating,/area/atmos) @@ -4675,7 +4675,7 @@ "bLV" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bLW" = (/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) "bLX" = (/obj/machinery/requests_console{department = "Arrival shuttle"; pixel_y = 30},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/arrival) -"bLY" = (/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{dir = 2; frequency = 1449; id = "tox_airlock_pump"},/turf/simulated/floor/engine,/area/toxins/mixing) +"bLY" = (/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{dir = 2; frequency = 1449; id = "tox_airlock_pump"},/turf/simulated/floor/engine,/area/toxins/mixing) "bLZ" = (/obj/structure/closet/wardrobe/grey,/turf/simulated/floor/plasteel/shuttle,/area/shuttle/arrival) "bMa" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/mixing) "bMb" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/mixing) @@ -4697,21 +4697,21 @@ "bMr" = (/turf/simulated/floor/plasteel{dir = 6; icon_state = "caution"},/area/hallway/primary/aft) "bMs" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor/plasteel,/area/atmos) "bMt" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) -"bMu" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bMu" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) "bMv" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/alarm{pixel_y = 23},/obj/machinery/camera{c_tag = "Atmospherics Monitoring"; dir = 2; network = list("SS13")},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 5},/area/atmos) "bMw" = (/obj/machinery/camera{c_tag = "Atmospherics North West"; dir = 4; network = list("SS13")},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"bMx" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) -"bMy" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bMx" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bMy" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) "bMz" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bMA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/atmos) "bMB" = (/obj/machinery/pipedispenser/disposal,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel,/area/atmos) "bMC" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "bMD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) -"bME" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bME" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bMF" = (/turf/simulated/floor/plasteel,/area/atmos) -"bMG" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Mix to Distro"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bMG" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Mix to Distro"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bMH" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible{dir = 8; initialize_directions = 11},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) -"bMI" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Mix to Incinerator"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bMI" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Mix to Incinerator"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bMJ" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 10; initialize_directions = 10},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "bMK" = (/obj/structure/grille,/turf/simulated/wall/r_wall,/area/atmos) "bML" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/space,/area/space) @@ -4720,7 +4720,7 @@ "bMO" = (/obj/item/weapon/storage/secure/safe{pixel_x = 5; pixel_y = 29},/obj/machinery/camera{c_tag = "Virology Break Room"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bMP" = (/obj/machinery/light{dir = 1},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bMQ" = (/obj/item/weapon/bedsheet,/obj/structure/stool/bed,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) -"bMR" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"},/area/medical/virology) +"bMR" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warnwhite"},/area/medical/virology) "bMS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bMT" = (/obj/structure/closet/emcloset,/obj/machinery/camera{c_tag = "Virology Airlock"; dir = 2; network = list("SS13")},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plasteel{icon_state = "warnwhite"; dir = 5},/area/medical/virology) "bMU" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) @@ -4736,11 +4736,11 @@ "bNe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/research{name = "Research Division"}) "bNf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/research{name = "Research Division"}) "bNg" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/medical/research{name = "Research Division"}) -"bNh" = (/obj/machinery/sparker{dir = 2; id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 4; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) -"bNi" = (/obj/structure/sign/fire{pixel_y = -32},/obj/machinery/atmospherics/binary/pump{dir = 8; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing) +"bNh" = (/obj/machinery/sparker{dir = 2; id = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 4; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) +"bNi" = (/obj/structure/sign/fire{pixel_y = -32},/obj/machinery/atmospherics/components/binary/pump{dir = 8; on = 1},/turf/simulated/floor/engine,/area/toxins/mixing) "bNj" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/meter,/obj/machinery/door_control{id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; req_access_txt = "7"},/obj/machinery/ignition_switch{id = "mixingsparker"; pixel_x = -25; pixel_y = -5},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhitecorner"},/area/toxins/mixing) -"bNk" = (/obj/machinery/light,/obj/machinery/atmospherics/binary/valve{dir = 4; name = "port to mix"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/mixing) -"bNl" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/toxins/mixing) +"bNk" = (/obj/machinery/light,/obj/machinery/atmospherics/components/binary/valve{dir = 4; name = "port to mix"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/toxins/mixing) +"bNl" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/toxins/mixing) "bNm" = (/obj/item/target,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/toxins/test_area) "bNn" = (/obj/machinery/light_construct{dir = 8},/turf/simulated/floor/plating,/area/construction) "bNp" = (/obj/machinery/light_construct{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/construction) @@ -4756,17 +4756,17 @@ "bNz" = (/obj/machinery/computer/general_air_control{frequency = 1441; name = "Tank Monitor"; sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank")},/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 4; name = "Atmos RC"; pixel_x = 30; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/atmos) "bNA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/atmos) "bNB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/atmos) -"bNC" = (/obj/machinery/pipedispenser/disposal/transit_tube,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) +"bNC" = (/obj/machinery/pipedispenser/disposal/transit_tube,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bND" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) -"bNE" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Waste In"; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) -"bNF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bNE" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Waste In"; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) +"bNF" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/atmos) "bNG" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible,/turf/simulated/floor/plasteel,/area/atmos) -"bNH" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Mix Outlet Pump"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) -"bNI" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Air to Mix"; on = 0},/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) +"bNH" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Mix Outlet Pump"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bNI" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Air to Mix"; on = 0},/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bNJ" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/manifold/yellow/visible,/turf/simulated/floor/plasteel{dir = 5; icon_state = "green"},/area/atmos) "bNK" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "bNL" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/grille,/obj/machinery/meter,/turf/simulated/wall/r_wall,/area/atmos) -"bNM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) +"bNM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "bNN" = (/obj/machinery/camera{c_tag = "Atmospherics Waste Tank"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "bNO" = (/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "bNP" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -4774,8 +4774,8 @@ "bNR" = (/obj/machinery/shower{dir = 4},/obj/structure/sign/securearea{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/virology) "bNS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bNT" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/closet/l3closet,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/medical/virology) -"bNU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) -"bNV" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"bNU" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"bNV" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bNW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/mob/living/carbon/monkey,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bNX" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/wall/r_wall,/area/medical/virology) "bNY" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -4786,7 +4786,7 @@ "bOd" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bOe" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bOf" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) -"bOg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) +"bOg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bOh" = (/obj/structure/table,/obj/item/weapon/extinguisher{pixel_x = 4; pixel_y = 3},/obj/item/weapon/extinguisher,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bOi" = (/obj/structure/table,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bOj" = (/obj/structure/table,/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/machinery/light,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) @@ -4801,7 +4801,7 @@ "bOs" = (/obj/structure/closet/emcloset,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/aft) "bOt" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft) "bOu" = (/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft) -"bOv" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/construction) +"bOv" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/construction) "bOw" = (/obj/structure/closet/crate,/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/construction) "bOx" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/construction) "bOy" = (/obj/structure/table,/obj/item/device/electropack,/obj/item/weapon/screwdriver,/obj/item/weapon/wrench,/obj/item/clothing/head/helmet,/obj/item/device/assembly/signaler,/obj/machinery/light/small,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/transfer) @@ -4815,12 +4815,12 @@ "bOG" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel,/area/atmos) "bOH" = (/obj/machinery/computer/general_air_control{frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop")},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/atmos) "bOI" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/atmos) -"bOJ" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) +"bOJ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bOK" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bOL" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) "bOM" = (/obj/structure/closet/crate,/turf/simulated/floor/plasteel,/area/atmos) "bON" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"bOO" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Mix to Filter"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bOO" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Mix to Filter"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bOP" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bOQ" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 6},/turf/simulated/floor/plasteel,/area/atmos) "bOR" = (/obj/machinery/atmospherics/pipe/manifold/green/visible{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) @@ -4846,10 +4846,10 @@ "bPl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bPm" = (/obj/machinery/requests_console{department = "Science"; departmentType = 2; dir = 2; name = "Science Requests Console"; pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bPn" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/storage/toolbox/mechanical,/obj/item/clothing/ears/earmuffs,/obj/machinery/camera{c_tag = "Testing Lab North"; dir = 2; network = list("SS13","RD")},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) -"bPo" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/engine,/area/toxins/misc_lab) +"bPo" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/engine,/area/toxins/misc_lab) "bPp" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 1},/turf/simulated/floor/engine,/area/toxins/misc_lab) -"bPq" = (/obj/machinery/atmospherics/trinary/filter{dir = 4; req_access = null},/turf/simulated/floor/engine,/area/toxins/misc_lab) -"bPr" = (/obj/machinery/atmospherics/unary/heat_reservoir/heater{dir = 8},/turf/simulated/floor/engine,/area/toxins/misc_lab) +"bPq" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4; req_access = null},/turf/simulated/floor/engine,/area/toxins/misc_lab) +"bPr" = (/obj/machinery/atmospherics/components/unary/heat_reservoir/heater{dir = 8},/turf/simulated/floor/engine,/area/toxins/misc_lab) "bPs" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/misc_lab) "bPt" = (/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bPu" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/misc_lab) @@ -4869,24 +4869,24 @@ "bPI" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/clothing/tie/stethoscope,/obj/machinery/vending/wallmed{pixel_y = 28},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bPJ" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/landmark/start{name = "Atmospheric Technician"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/atmos) "bPK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/atmos) -"bPL" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Atmospheric Technician"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bPL" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Atmospheric Technician"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/atmos) "bPM" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/atmos) "bPN" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/atmos) -"bPO" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel,/area/atmos) -"bPP" = (/obj/machinery/atmospherics/trinary/mixer{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"bPQ" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) +"bPO" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel,/area/atmos) +"bPP" = (/obj/machinery/atmospherics/components/trinary/mixer{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) +"bPQ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) "bPR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 6},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/atmos) "bPS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bPT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_atmos{name = "Distribution Loop"; req_access_txt = "24"},/turf/simulated/floor/plasteel,/area/atmos) "bPU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) "bPV" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) -"bPW" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Pure to Mix"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bPW" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Pure to Mix"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bPX" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 5; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) -"bPY" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Unfiltered to Mix"; on = 1},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) +"bPY" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Unfiltered to Mix"; on = 1},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) "bPZ" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 6},/area/atmos) "bQa" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "bQb" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/space,/area/space) -"bQc" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "waste_in"; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) +"bQc" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "waste_in"; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/atmos) "bQd" = (/obj/structure/table,/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/obj/machinery/reagentgrinder,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bQe" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bQf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/virology{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "virology_airlock_interior"; locked = 1; name = "Virology Interior Airlock"; req_access_txt = "39"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) @@ -4909,10 +4909,10 @@ "bQw" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/turf/simulated/floor/engine,/area/toxins/misc_lab) "bQx" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/turf/simulated/floor/engine,/area/toxins/misc_lab) "bQy" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/turf/simulated/floor/engine,/area/toxins/misc_lab) -"bQz" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 8},/turf/simulated/floor/engine,/area/toxins/misc_lab) +"bQz" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{dir = 8},/turf/simulated/floor/engine,/area/toxins/misc_lab) "bQA" = (/obj/machinery/magnetic_module,/obj/effect/landmark{name = "blobstart"},/obj/structure/target_stake,/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/toxins/misc_lab) -"bQB" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 5},/area/maintenance/asmaint) -"bQC" = (/obj/machinery/atmospherics/binary/valve{dir = 4},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/asmaint) +"bQB" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 8},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 5},/area/maintenance/asmaint) +"bQC" = (/obj/machinery/atmospherics/components/binary/valve{dir = 4},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/asmaint) "bQD" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/aft) "bQE" = (/obj/structure/rack,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft) "bQF" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/aft) @@ -4935,7 +4935,7 @@ "bQW" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "bQX" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "bQY" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/manifold/cyan/visible{dir = 4; initialize_directions = 11},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) -"bQZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"bQZ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bRa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bRb" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/virology{name = "Break Room"; req_access_txt = "39"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bRc" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) @@ -4953,14 +4953,14 @@ "bRp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bRq" = (/obj/structure/table,/obj/machinery/cell_charger{pixel_y = 5},/obj/item/stack/cable_coil,/obj/item/device/multitool,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bRr" = (/turf/simulated/floor/engine,/area/toxins/misc_lab) -"bRs" = (/obj/machinery/atmospherics/binary/valve,/turf/simulated/floor/engine,/area/toxins/misc_lab) +"bRs" = (/obj/machinery/atmospherics/components/binary/valve,/turf/simulated/floor/engine,/area/toxins/misc_lab) "bRt" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/engine,/area/toxins/misc_lab) "bRu" = (/obj/structure/table,/obj/item/device/assembly/igniter{pixel_x = -5; pixel_y = 3},/obj/item/device/assembly/igniter{pixel_x = 5; pixel_y = -4},/obj/item/device/assembly/igniter{pixel_x = 2; pixel_y = 6},/obj/item/device/assembly/igniter{pixel_x = 2; pixel_y = -1},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/turf/simulated/floor/engine,/area/toxins/misc_lab) "bRv" = (/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/toxins/misc_lab) "bRw" = (/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/toxins/misc_lab) "bRx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/maintenance/asmaint2) "bRy" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 10},/area/maintenance/asmaint) -"bRz" = (/obj/machinery/atmospherics/unary/outlet_injector,/turf/simulated/floor/plating/airless,/area/space) +"bRz" = (/obj/machinery/atmospherics/components/unary/outlet_injector,/turf/simulated/floor/plating/airless,/area/space) "bRA" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/aft) "bRB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall,/area/maintenance/aft) "bRC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/aft) @@ -4983,8 +4983,8 @@ "bRT" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 6},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) "bRU" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) "bRV" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) -"bRW" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "N2O Outlet Pump"; on = 0},/turf/simulated/floor/plasteel{icon_state = "escape"; dir = 5},/area/atmos) -"bRX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/n20,/area/atmos) +"bRW" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "N2O Outlet Pump"; on = 0},/turf/simulated/floor/plasteel{icon_state = "escape"; dir = 5},/area/atmos) +"bRX" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/n20,/area/atmos) "bRY" = (/turf/simulated/floor/engine/n20,/area/atmos) "bRZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/wall/r_wall,/area/medical/virology) "bSa" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/medical/virology) @@ -4997,9 +4997,9 @@ "bSh" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "warning"},/area/toxins/xenobiology) "bSi" = (/obj/structure/grille,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable,/obj/machinery/door/poddoor/preopen{id = "xenobio8"; name = "containment blast door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/engine,/area/toxins/xenobiology) "bSj" = (/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/disposaloutlet{dir = 1},/turf/simulated/floor/engine,/area/toxins/xenobiology) -"bSk" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) +"bSk" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bSl" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10; pixel_x = 0; initialize_directions = 10},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) -"bSm" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) +"bSm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bSn" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/obj/item/weapon/hand_labeler,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bSo" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor/engine,/area/toxins/misc_lab) "bSp" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/turf/simulated/floor/engine,/area/toxins/misc_lab) @@ -5010,14 +5010,14 @@ "bSu" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating/airless,/area/space) "bSv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating/airless,/area/space) "bSw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating/airless,/area/space) -"bSx" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Mix to Space"; on = 1},/turf/simulated/floor/plating/airless,/area/space) +"bSx" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Mix to Space"; on = 1},/turf/simulated/floor/plating/airless,/area/space) "bSy" = (/obj/structure/grille,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/aft) "bSz" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/closet/emcloset,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft) "bSA" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/reagent_dispensers/fueltank,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/turf/simulated/floor/plating,/area/maintenance/aft) "bSB" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/sign/deathsposal{pixel_y = 32},/turf/simulated/floor/plating,/area/maintenance/aft) -"bSC" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft) -"bSD" = (/obj/machinery/atmospherics/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/aft) -"bSE" = (/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/maintenance/aft) +"bSC" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft) +"bSD" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/turf/simulated/floor/plating,/area/maintenance/aft) +"bSE" = (/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/maintenance/aft) "bSF" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/maintenance/aft) "bSG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/aft) "bSH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/aft) @@ -5029,19 +5029,19 @@ "bSN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/power/apc{dir = 1; name = "Construction Area APC"; pixel_y = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/construction) "bSO" = (/obj/machinery/power/apc{dir = 2; name = "Telecoms Monitoring APC"; pixel_y = -24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/computer) "bSP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/aft) -"bSQ" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 8},/area/atmos) +"bSQ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 8},/area/atmos) "bSR" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible{dir = 1},/obj/machinery/meter,/turf/simulated/wall/r_wall,/area/atmos) "bSS" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) "bST" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/atmos) "bSU" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/atmos) "bSV" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/machinery/door/firedoor/heavy,/obj/machinery/door/airlock/atmos{name = "Atmospherics"; req_access_txt = "24"},/turf/simulated/floor/plasteel,/area/atmos) -"bSW" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Air to External"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bSW" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Air to External"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bSX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bSY" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) "bSZ" = (/obj/item/device/radio/beacon,/turf/simulated/floor/plasteel,/area/atmos) -"bTa" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Air to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) -"bTb" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Mix to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) -"bTc" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Pure to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bTa" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Air to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bTb" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Mix to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bTc" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Pure to Port"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bTd" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/plasteel,/area/atmos) "bTe" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/simulated/floor/plasteel,/area/atmos) "bTf" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "n2o_in"; name = "Nitrous Oxide Supply Control"; output_tag = "n2o_out"; sensors = list("n2o_sensor" = "Tank")},/turf/simulated/floor/plasteel{icon_state = "escape"; dir = 4},/area/atmos) @@ -5062,7 +5062,7 @@ "bTu" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall,/area/toxins/xenobiology) "bTv" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bTw" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) -"bTx" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) +"bTx" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bTy" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/obj/machinery/meter,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bTz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bTA" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) @@ -5071,7 +5071,7 @@ "bTD" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/toxins/misc_lab) "bTE" = (/obj/machinery/camera{c_tag = "Testing Firing Range"; dir = 8; network = list("SS13","RD"); pixel_y = -22},/turf/simulated/floor/plating,/area/toxins/misc_lab) "bTF" = (/obj/structure/target_stake,/turf/simulated/floor/plating,/area/toxins/misc_lab) -"bTG" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/maintenance/asmaint) +"bTG" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/maintenance/asmaint) "bTH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor/plating,/area/maintenance/aft) "bTI" = (/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/aft) "bTJ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/turf/simulated/floor/plating,/area/maintenance/aft) @@ -5084,12 +5084,12 @@ "bTQ" = (/obj/structure/rack{dir = 1},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft) "bTR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/aft) "bTS" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 9},/turf/simulated/wall/r_wall,/area/atmos) -"bTT" = (/obj/machinery/camera{c_tag = "Atmospherics Access"; dir = 4; network = list("SS13")},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) -"bTU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bTT" = (/obj/machinery/camera{c_tag = "Atmospherics Access"; dir = 4; network = list("SS13")},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "caution"},/area/atmos) +"bTU" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel,/area/atmos) "bTV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 6},/turf/simulated/floor/plasteel,/area/atmos) "bTW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 4},/area/atmos) "bTX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/sign/securearea,/turf/simulated/wall,/area/atmos) -"bTY" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "External to Filter"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bTY" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "External to Filter"; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bTZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bUa" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel,/area/atmos) "bUb" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plasteel,/area/atmos) @@ -5097,21 +5097,21 @@ "bUd" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) "bUe" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) "bUf" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel,/area/atmos) -"bUg" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 4; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bUg" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 1; filter_type = 4; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bUh" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "escape"; dir = 6},/area/atmos) -"bUi" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "n2o_in"; pixel_y = 1},/turf/simulated/floor/engine/n20,/area/atmos) +"bUi" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "n2o_in"; pixel_y = 1},/turf/simulated/floor/engine/n20,/area/atmos) "bUj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bUk" = (/obj/structure/table/glass,/obj/item/clothing/gloves/color/latex,/obj/machinery/requests_console{department = "Virology"; name = "Virology Requests Console"; pixel_x = -32},/obj/item/device/healthanalyzer,/obj/item/clothing/glasses/hud/health,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) "bUl" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/obj/item/device/radio/headset/headset_med,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) "bUm" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/medical/virology) -"bUn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"bUn" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bUo" = (/obj/effect/landmark{name = "revenantspawn"},/turf/simulated/floor/engine,/area/toxins/xenobiology) "bUp" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/medical/virology) "bUq" = (/obj/structure/grille,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/poddoor/preopen{id = "xenobio2"; name = "containment blast door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/engine,/area/toxins/xenobiology) "bUr" = (/obj/structure/window/reinforced,/obj/structure/table/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door_control{id = "xenobio7"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access_txt = "55"},/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/toxins/xenobiology) "bUs" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/door/poddoor/preopen{id = "xenobio7"; name = "containment blast door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/engine,/area/toxins/xenobiology) "bUt" = (/obj/item/device/radio/intercom{pixel_x = -25},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) -"bUu" = (/obj/machinery/atmospherics/binary/pump{dir = 2},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) +"bUu" = (/obj/machinery/atmospherics/components/binary/pump{dir = 2},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bUv" = (/obj/structure/stool/bed/chair/office/light,/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bUw" = (/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bUx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) @@ -5134,13 +5134,13 @@ "bUO" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "bridge blast"; layer = 2.9; name = "bridge blast door"},/turf/simulated/floor/plating,/area/bridge) "bUP" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor/preopen{id = "bridge blast"; layer = 2.9; name = "bridge blast door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/bridge) "bUQ" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/status_display{density = 0; layer = 4},/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "bridge blast"; layer = 2.9; name = "bridge blast door"},/turf/simulated/floor/plating,/area/bridge) -"bUR" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/atmos) +"bUR" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/atmos) "bUS" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 1},/obj/machinery/meter,/turf/simulated/wall/r_wall,/area/atmos) "bUT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/machinery/door/poddoor/preopen{id = "atmos"; name = "atmos blast door"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/atmos) "bUU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/obj/machinery/door/poddoor/preopen{id = "atmos"; name = "atmos blast door"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/atmos) "bUV" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor/plasteel,/area/atmos) "bUW" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/camera{c_tag = "Atmospherics West"; dir = 8; network = list("SS13")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel,/area/atmos) -"bUX" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Air to Port"; on = 0},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) +"bUX" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Air to Port"; on = 0},/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) "bUY" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bUZ" = (/obj/structure/closet/crate,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bVa" = (/obj/structure/table/glass,/obj/item/device/radio/intercom{pixel_x = -25},/obj/machinery/light{dir = 8},/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) @@ -5160,7 +5160,7 @@ "bVo" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 0; pixel_y = 6},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bVp" = (/obj/structure/rack,/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/machinery/computer/security/telescreen{name = "Test Chamber Moniter"; network = list("Test"); pixel_x = 0; pixel_y = -30},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bVq" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/closet,/obj/item/pipe{dir = 4; icon_state = "mixer"; name = "gas mixer fitting"; pipe_type = 14},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) -"bVr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) +"bVr" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bVs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bVt" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/toxins/misc_lab) "bVu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/misc_lab) @@ -5171,7 +5171,7 @@ "bVz" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/aft) "bVA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/turf/simulated/floor/plating,/area/maintenance/aft) "bVB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/aft) -"bVC" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Mix to Space"; on = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/aft) +"bVC" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Mix to Space"; on = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/aft) "bVD" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/aft) "bVE" = (/obj/machinery/door/airlock/maintenance{name = "Incinerator Access"; req_access_txt = "12"},/obj/structure/barricade/wooden{name = "wooden barricade (CLOSED)"},/turf/simulated/floor/plating,/area/maintenance/aft) "bVF" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) @@ -5184,7 +5184,7 @@ "bVM" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "bridge blast"; layer = 2.9; name = "bridge blast door"},/turf/simulated/floor/plating,/area/bridge) "bVN" = (/turf/simulated/floor/plasteel,/area/tcommsat/computer) "bVO" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"bVP" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light/small,/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/atmos) +"bVP" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light/small,/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/atmos) "bVQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/turf/simulated/wall/r_wall,/area/atmos) "bVR" = (/obj/machinery/door/firedoor/heavy,/obj/machinery/door/airlock/atmos{name = "Atmospherics"; req_access_txt = "24"},/turf/simulated/floor/plasteel,/area/atmos) "bVS" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/atmos) @@ -5193,15 +5193,15 @@ "bVV" = (/obj/structure/filingcabinet,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/checkpoint/engineering) "bVW" = (/obj/structure/fireaxecabinet{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel,/area/atmos) "bVX" = (/obj/structure/closet/secure_closet/atmospherics,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/atmos) -"bVY" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/atmos) -"bVZ" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/atmos) +"bVY" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/atmos) +"bVZ" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 8},/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/atmos) "bWa" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"bWb" = (/obj/machinery/camera{c_tag = "Atmospherics East"; dir = 8; network = list("SS13")},/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Plasma Outlet Pump"; on = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/atmos) -"bWc" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) +"bWb" = (/obj/machinery/camera{c_tag = "Atmospherics East"; dir = 8; network = list("SS13")},/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Plasma Outlet Pump"; on = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/atmos) +"bWc" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "bWd" = (/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "bWe" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) -"bWf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; frequency = 1439; id_tag = null; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table/glass,/obj/structure/reagent_dispensers/virusfood{density = 0; pixel_x = -30},/obj/item/weapon/book/manual/wiki/infections{pixel_y = 7},/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) -"bWg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"bWf" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; frequency = 1439; id_tag = null; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table/glass,/obj/structure/reagent_dispensers/virusfood{density = 0; pixel_x = -30},/obj/item/weapon/book/manual/wiki/infections{pixel_y = 7},/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitegreen"},/area/medical/virology) +"bWg" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bWh" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bWi" = (/obj/machinery/disposal,/obj/structure/sign/deathsposal{pixel_x = 0; pixel_y = -32},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitegreen"},/area/medical/virology) "bWj" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) @@ -5216,12 +5216,12 @@ "bWs" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/misc_lab) "bWt" = (/obj/machinery/door/airlock/glass_research{name = "Firing Range"; req_access_txt = "47"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bWu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-warningcorner (WEST)"; icon_state = "warningcorner"; dir = 8},/area/toxins/misc_lab) -"bWv" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warningcorner (EAST)"; icon_state = "warningcorner"; dir = 4},/area/toxins/misc_lab) +"bWv" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{tag = "icon-warningcorner (EAST)"; icon_state = "warningcorner"; dir = 4},/area/toxins/misc_lab) "bWw" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bWx" = (/obj/structure/closet/crate,/obj/item/clothing/under/color/lightpurple,/obj/item/stack/spacecash/c200,/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"bWy" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plating,/area/maintenance/aft) +"bWy" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plating,/area/maintenance/aft) "bWz" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft) -"bWA" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Mix to Port"; on = 0},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/aft) +"bWA" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Mix to Port"; on = 0},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/aft) "bWB" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft) "bWC" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) "bWD" = (/obj/machinery/blackbox_recorder,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) @@ -5238,7 +5238,7 @@ "bWO" = (/turf/simulated/wall,/area/security/checkpoint/engineering) "bWP" = (/obj/item/weapon/screwdriver{pixel_y = 10},/obj/machinery/door_control{desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -6; req_access_txt = "10"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/item/device/radio/off,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/engineering) "bWQ" = (/turf/simulated/floor/plasteel,/area/security/checkpoint/engineering) -"bWR" = (/obj/machinery/camera{c_tag = "Security Post - Engineering"; dir = 8; network = list("SS13")},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/engineering) +"bWR" = (/obj/machinery/camera{c_tag = "Security Post - Engineering"; dir = 8; network = list("SS13")},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/engineering) "bWS" = (/obj/machinery/suit_storage_unit/atmos,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/atmos) "bWT" = (/obj/structure/sign/nosmoking_2,/turf/simulated/wall,/area/atmos) "bWU" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) @@ -5251,11 +5251,11 @@ "bXb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/medical/virology) "bXc" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/camera{c_tag = "Xenobiology South"; dir = 4; network = list("SS13","RD")},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bXd" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) -"bXe" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; unacidable = 1},/turf/simulated/floor/engine,/area/toxins/misc_lab) +"bXe" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; unacidable = 1},/turf/simulated/floor/engine,/area/toxins/misc_lab) "bXf" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bXg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/toxins/misc_lab) "bXh" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/toxins/misc_lab) -"bXi" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) +"bXi" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bXj" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser/practice,/obj/item/clothing/ears/earmuffs,/turf/simulated/floor/plasteel,/area/toxins/misc_lab) "bXk" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bXl" = (/obj/item/stack/tile/plasteel,/turf/space,/area/space) @@ -5274,16 +5274,16 @@ "bXy" = (/turf/simulated/floor/plasteel,/area/engine/break_room) "bXz" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/engine/break_room) "bXA" = (/obj/machinery/door/airlock/glass_security{name = "Security Office"; req_access_txt = "63"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/security/checkpoint/engineering) -"bXB" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/engineering) +"bXB" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/checkpoint/engineering) "bXC" = (/obj/structure/stool/bed/chair/office/dark,/obj/effect/landmark/start/depsec/engineering,/turf/simulated/floor/plasteel,/area/security/checkpoint/engineering) "bXD" = (/obj/machinery/computer/secure_data,/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/engineering) "bXE" = (/obj/machinery/power/apc{dir = 8; name = "Atmospherics APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel,/area/atmos) "bXF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/atmos) "bXG" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/obj/item/weapon/wrench,/turf/simulated/floor/plasteel,/area/atmos) "bXH" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) -"bXI" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"bXI" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "bXJ" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/atmos) -"bXK" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "tox_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) +"bXK" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "tox_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "bXL" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bXM" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/spawner/lootdrop/maintenance,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bXN" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/medical/virology) @@ -5312,7 +5312,7 @@ "bYk" = (/obj/machinery/door/airlock/glass_engineering{name = "Server Room"; req_access_txt = "61"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/tcommsat/computer) "bYl" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/tcommsat/computer) "bYm" = (/obj/machinery/door/airlock/glass_engineering{name = "Server Room"; req_access_txt = "61"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/tcommsat/computer) -"bYn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/construction) +"bYn" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/construction) "bYo" = (/obj/structure/closet/emcloset,/obj/machinery/camera{c_tag = "Telecoms Monitoring"; dir = 8; network = list("SS13")},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "bYp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/aft) "bYq" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft) @@ -5327,9 +5327,9 @@ "bYz" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/structure/reagent_dispensers/peppertank{pixel_x = 30; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/checkpoint/engineering) "bYA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/atmos) "bYB" = (/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 4; name = "Atmos RC"; pixel_x = 30; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel,/area/atmos) -"bYC" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/camera{c_tag = "Atmospherics Central"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Port to Filter"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bYC" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/camera{c_tag = "Atmospherics Central"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Port to Filter"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bYD" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/obj/structure/stool,/turf/simulated/floor/plasteel,/area/atmos) -"bYE" = (/obj/machinery/atmospherics/unary/heat_reservoir/heater{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) +"bYE" = (/obj/machinery/atmospherics/components/unary/heat_reservoir/heater{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) "bYF" = (/obj/structure/rack,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bYG" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bYH" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -5368,7 +5368,7 @@ "bZo" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "bZp" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/camera{c_tag = "Aft Primary Hallway 1"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = -22},/turf/simulated/floor/plasteel{dir = 2; icon_state = "yellowcorner"},/area/hallway/primary/aft) "bZq" = (/obj/machinery/power/apc{dir = 8; name = "Engineering Foyer APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plasteel,/area/engine/break_room) -"bZr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/break_room) +"bZr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/break_room) "bZs" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/checkpoint/engineering) "bZt" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/checkpoint/engineering) "bZu" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/checkpoint/engineering) @@ -5376,11 +5376,11 @@ "bZw" = (/obj/structure/closet/wardrobe/atmospherics_yellow,/turf/simulated/floor/plasteel,/area/atmos) "bZx" = (/obj/machinery/space_heater,/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/atmos) "bZy" = (/obj/machinery/space_heater,/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/atmos) -"bZz" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "Port to Filter"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"bZz" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "Port to Filter"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bZA" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/obj/item/weapon/cigbutt,/turf/simulated/floor/plasteel,/area/atmos) -"bZB" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) -"bZC" = (/obj/machinery/atmospherics/binary/pump{dir = 8; name = "CO2 Outlet Pump"; on = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/atmos) -"bZD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) +"bZB" = (/obj/machinery/atmospherics/components/unary/cold_sink/freezer{dir = 8},/turf/simulated/floor/plasteel,/area/atmos) +"bZC" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8; name = "CO2 Outlet Pump"; on = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/atmos) +"bZD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) "bZE" = (/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) "bZF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bZG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/maintenance/asmaint) @@ -5391,7 +5391,7 @@ "bZL" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bZM" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bZN" = (/obj/structure/grille,/obj/structure/cable,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor/preopen{id = "xenobio1"; name = "containment blast door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/engine,/area/toxins/xenobiology) -"bZO" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "xenobio1"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access_txt = "55"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/xenobiology) +"bZO" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "xenobio1"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access_txt = "55"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 5; icon_state = "warning"},/area/toxins/xenobiology) "bZP" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "bZQ" = (/obj/structure/grille,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable,/obj/machinery/door/poddoor/preopen{id = "xenobio6"; name = "containment blast door"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/engine,/area/toxins/xenobiology) "bZR" = (/obj/machinery/camera{c_tag = "Testing Chamber"; dir = 1; network = list("Test","RD"); pixel_x = 0},/obj/machinery/light,/turf/simulated/floor/engine,/area/toxins/misc_lab) @@ -5419,7 +5419,7 @@ "can" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellowcorner"},/area/hallway/primary/aft) "cao" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "cap" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/hallway/primary/aft) -"caq" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/hallway/primary/aft) +"caq" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 5; icon_state = "yellow"},/area/hallway/primary/aft) "car" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/engine/break_room) "cas" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/break_room) "cat" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/break_room) @@ -5428,7 +5428,7 @@ "caw" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel,/area/atmos) "cax" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/turf/simulated/floor/plasteel,/area/atmos) "cay" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 1},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) -"caz" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "N2 to Pure"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"caz" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "N2 to Pure"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "caA" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "co2_in"; name = "Carbon Dioxide Supply Control"; output_tag = "co2_out"; sensors = list("co2_sensor" = "Tank")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/atmos) "caB" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"; output = 35},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) "caC" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) @@ -5467,17 +5467,17 @@ "cbj" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/engine/break_room) "cbk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/engine/break_room) "cbl" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel,/area/engine/break_room) -"cbm" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/engine/break_room) +"cbm" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/engine/break_room) "cbn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/engine/break_room) "cbo" = (/obj/machinery/vending/cigarette{pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/engine/break_room) "cbp" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel,/area/atmos) "cbq" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/machinery/meter,/turf/simulated/floor/plasteel,/area/atmos) "cbr" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible,/turf/simulated/floor/plasteel,/area/atmos) -"cbs" = (/obj/machinery/atmospherics/trinary/mixer{dir = 4; node1_concentration = 0.8; node2_concentration = 0.2; on = 1; pixel_x = 0; pixel_y = 0; target_pressure = 4500},/turf/simulated/floor/plasteel,/area/atmos) -"cbt" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/machinery/atmospherics/binary/pump{dir = 1; name = "O2 to Pure"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) -"cbu" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 3; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"cbs" = (/obj/machinery/atmospherics/components/trinary/mixer{dir = 4; node1_concentration = 0.8; node2_concentration = 0.2; on = 1; pixel_x = 0; pixel_y = 0; target_pressure = 4500},/turf/simulated/floor/plasteel,/area/atmos) +"cbt" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "O2 to Pure"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) +"cbu" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 1; filter_type = 3; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "cbv" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel{dir = 6; icon_state = "yellow"},/area/atmos) -"cbw" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "co2_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) +"cbw" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "co2_in"; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos) "cbx" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cby" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cbz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -5494,7 +5494,7 @@ "cbK" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "cbL" = (/obj/structure/disposalpipe/segment,/obj/structure/lattice,/turf/space,/area/space) "cbM" = (/obj/structure/closet/emcloset,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"cbN" = (/obj/machinery/atmospherics/unary/tank/air,/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"cbN" = (/obj/machinery/atmospherics/components/unary/tank/air,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "cbO" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plasteel{dir = 2; icon_state = "bot"},/area/toxins/misc_lab) "cbP" = (/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Research Division Delivery"; req_access_txt = "47"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/toxins/misc_lab) "cbQ" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "Research Division"},/obj/structure/plasticflaps{opacity = 1},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/toxins/misc_lab) @@ -5506,10 +5506,10 @@ "cbW" = (/obj/machinery/telecomms/server/presets/science,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server) "cbX" = (/obj/structure/window/reinforced/fulltile,/obj/structure/grille,/obj/structure/cable,/turf/simulated/floor/plating,/area/tcommsat/computer) "cbY" = (/obj/structure/table,/obj/item/device/radio/off,/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 10},/area/tcommsat/computer) -"cbZ" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -35},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/tcommsat/computer) +"cbZ" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -35},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "cca" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/light,/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/plasteel,/area/tcommsat/computer) "ccb" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"ccc" = (/obj/structure/sign/securearea{pixel_x = -32; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 10},/area/hallway/primary/aft) +"ccc" = (/obj/structure/sign/securearea{pixel_x = -32; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 10},/area/hallway/primary/aft) "ccd" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/heavy,/obj/machinery/door/window/northleft{dir = 4; icon_state = "left"; name = "Atmospherics Desk"; req_access_txt = "24"},/obj/machinery/door/poddoor/preopen{id = "atmos"; layer = 2.9; name = "atmos blast door"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/atmos) "cce" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/hallway/primary/aft) "ccf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/hallway/primary/aft) @@ -5524,8 +5524,8 @@ "cco" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel,/area/engine/break_room) "ccp" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/engine/break_room) "ccq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/atmos) -"ccr" = (/obj/machinery/camera{c_tag = "Atmospherics South West"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/atmos) -"ccs" = (/obj/machinery/atmospherics/trinary/filter{dir = 2; filter_type = 2; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"ccr" = (/obj/machinery/camera{c_tag = "Atmospherics South West"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"ccs" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 2; filter_type = 2; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "cct" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/plasteel,/area/atmos) "ccu" = (/obj/machinery/power/apc{dir = 2; name = "Incinerator APC"; pixel_x = 0; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/plating,/area/maintenance/incinerator) "ccv" = (/obj/structure/sign/fire{pixel_x = 0; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -5546,7 +5546,7 @@ "ccK" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "ccL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "ccM" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"ccN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/engine_smes) +"ccN" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/engine_smes) "ccO" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating/airless,/area/engine/engineering) "ccP" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/wall,/area/aisat) "ccQ" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/wall,/area/aisat) @@ -5564,7 +5564,7 @@ "cdc" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel,/area/atmos) "cdd" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/plasteel,/area/atmos) "cde" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) -"cdf" = (/obj/machinery/atmospherics/trinary/filter{dir = 4; filter_type = 1; on = 1},/turf/simulated/floor/plasteel,/area/atmos) +"cdf" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 4; filter_type = 1; on = 1},/turf/simulated/floor/plasteel,/area/atmos) "cdg" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4; initialize_directions = 12},/turf/simulated/floor/plasteel,/area/atmos) "cdh" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) "cdi" = (/turf/simulated/floor/plating,/area/atmos) @@ -5590,7 +5590,7 @@ "cdC" = (/obj/machinery/suit_storage_unit/ce,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/engine/chiefs_office) "cdD" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "cdE" = (/obj/machinery/light{dir = 1},/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = 24},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) -"cdF" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) +"cdF" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "cdG" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "cdH" = (/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "CE Office APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "cdI" = (/obj/structure/sign/securearea,/turf/simulated/wall,/area/engine/engineering) @@ -5598,25 +5598,25 @@ "cdK" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/engine/engineering) "cdL" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/atmos) "cdM" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "n2_in"; name = "Nitrogen Supply Control"; output_tag = "n2_out"; sensors = list("n2_sensor" = "Tank")},/turf/simulated/floor/plasteel{icon_state = "red"},/area/atmos) -"cdN" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "N2 Outlet Pump"; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/atmos) +"cdN" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "N2 Outlet Pump"; on = 1},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/atmos) "cdO" = (/obj/machinery/light,/turf/simulated/floor/plasteel,/area/atmos) "cdP" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 10},/area/atmos) "cdQ" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "o2_in"; name = "Oxygen Supply Control"; output_tag = "o2_out"; sensors = list("o2_sensor" = "Tank")},/turf/simulated/floor/plasteel{dir = 0; icon_state = "blue"},/area/atmos) -"cdR" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "O2 Outlet Pump"; on = 1},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 6},/area/atmos) +"cdR" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "O2 Outlet Pump"; on = 1},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 6},/area/atmos) "cdS" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 10},/area/atmos) "cdT" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1443; input_tag = "air_in"; name = "Mixed Air Supply Control"; output_tag = "air_out"; pressure_setting = 2000; sensors = list("air_sensor" = "Tank")},/turf/simulated/floor/plasteel{icon_state = "arrival"},/area/atmos) -"cdU" = (/obj/machinery/camera{c_tag = "Atmospherics South East"; dir = 1},/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Air Outlet Pump"; on = 1},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 6},/area/atmos) +"cdU" = (/obj/machinery/camera{c_tag = "Atmospherics South East"; dir = 1},/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Air Outlet Pump"; on = 1},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 6},/area/atmos) "cdV" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/wall,/area/maintenance/incinerator) "cdW" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/wall,/area/maintenance/incinerator) -"cdX" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "atmospherics mix pump"},/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cdX" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "atmospherics mix pump"},/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cdY" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/yellow/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cdZ" = (/obj/machinery/light_switch{pixel_x = 0; pixel_y = 26},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cea" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/incinerator) +"cea" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/incinerator) "ceb" = (/obj/machinery/disposal,/obj/structure/sign/deathsposal{pixel_x = 0; pixel_y = 32},/obj/structure/disposalpipe/trunk,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cec" = (/obj/machinery/power/smes{capacity = 9e+006; charge = 10000},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/decal/cleanable/cobweb{tag = "icon-cobweb2"; icon_state = "cobweb2"},/turf/simulated/floor/plating,/area/maintenance/incinerator) -"ced" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) +"ced" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cee" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/manifold/general/hidden{tag = "icon-manifold (NORTH)"; icon_state = "manifold"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint) -"cef" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) +"cef" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/binary/pump{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "ceg" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/asmaint) "ceh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cei" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -5660,10 +5660,10 @@ "ceU" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "ceV" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) "ceW" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/atmos) -"ceX" = (/obj/machinery/atmospherics/unary/tank/toxins{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"ceY" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "plasma tank pump"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"ceX" = (/obj/machinery/atmospherics/components/unary/tank/toxins{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"ceY" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "plasma tank pump"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "ceZ" = (/obj/machinery/atmospherics/pipe/manifold4w/general{level = 2},/obj/machinery/meter,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cfa" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "Mix to Incinerator"; on = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cfa" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "Mix to Incinerator"; on = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cfb" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cfc" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cfd" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/machinery/alarm{desc = "This particular atmos control unit appears to have no access restrictions."; dir = 8; icon_state = "alarm0"; locked = 0; name = "all-access air alarm"; pixel_x = 24; req_access = "0"; req_one_access = "0"},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) @@ -5692,7 +5692,7 @@ "cfA" = (/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "AI Chamber APC"; pixel_y = 24},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) "cfB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) "cfC" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"cfD" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; on = 1},/turf/simulated/floor/plating/airless,/area/space) +"cfD" = (/obj/machinery/atmospherics/components/unary/outlet_injector{dir = 1; on = 1},/turf/simulated/floor/plating/airless,/area/space) "cfE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) "cfF" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) "cfG" = (/obj/structure/lattice/catwalk,/turf/space,/area/solar/port) @@ -5726,18 +5726,18 @@ "cgi" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "cgj" = (/obj/structure/closet/secure_closet/engineering_chief{req_access_txt = "0"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "cgk" = (/obj/structure/grille,/obj/structure/cable,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/engine/chiefs_office) -"cgl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"cgl" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "cgm" = (/obj/effect/landmark{name = "lightsout"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "cgn" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/closet/radiation,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/engine/engineering) "cgo" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/space,/area/space) "cgp" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/space,/area/space) -"cgq" = (/obj/structure/sign/nosmoking_2{pixel_x = -28},/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4; name = "input gas connector port"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cgr" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "input port pump"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cgq" = (/obj/structure/sign/nosmoking_2{pixel_x = -28},/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4; name = "input gas connector port"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cgr" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "input port pump"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cgs" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cgt" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/mob/living/simple_animal/mouse,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cgu" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 2},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cgv" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cgw" = (/obj/machinery/atmospherics/unary/portables_connector/visible{name = "output gas connector port"},/obj/machinery/portable_atmospherics/canister,/obj/structure/sign/nosmoking_2{pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cgw" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{name = "output gas connector port"},/obj/machinery/portable_atmospherics/canister,/obj/structure/sign/nosmoking_2{pixel_x = 28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cgx" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/asmaint) "cgy" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cgz" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -5770,10 +5770,10 @@ "cha" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/machinery/camera{c_tag = "Engineering Power Storage"},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "chb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor/plasteel,/area/engine/engineering) "chc" = (/obj/machinery/camera{c_tag = "Chief Engineer's Office"; dir = 4; network = list("SS13")},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/computer/card/minor/ce,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) -"chd" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) +"chd" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "che" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/weapon/storage/fancy/cigarettes,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "chf" = (/turf/simulated/floor/engine,/area/toxins/explab) -"chg" = (/obj/machinery/door/poddoor/preopen{id = "Engineering"; name = "engineering security door"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) +"chg" = (/obj/machinery/door/poddoor/preopen{id = "Engineering"; name = "engineering security door"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) "chh" = (/obj/machinery/door/poddoor/preopen{id = "Engineering"; name = "engineering security door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) "chi" = (/obj/machinery/door/poddoor/preopen{id = "Engineering"; name = "engineering security door"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) "chj" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/grille,/obj/machinery/meter,/turf/simulated/wall/r_wall,/area/atmos) @@ -5781,14 +5781,14 @@ "chl" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/grille,/obj/machinery/meter{frequency = 1443; id = "mair_out_meter"; name = "Mixed Air Tank Out"},/turf/simulated/wall/r_wall,/area/atmos) "chm" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/plating,/area/maintenance/incinerator) "chn" = (/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cho" = (/obj/machinery/atmospherics/binary/valve{name = "Mix to Space"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"chp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cho" = (/obj/machinery/atmospherics/components/binary/valve{name = "Mix to Space"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"chp" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "chq" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "chr" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"chs" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Incinerator to Output"; on = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"chs" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Incinerator to Output"; on = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cht" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/maintenance/incinerator) "chu" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/maintenance/asmaint) -"chv" = (/obj/machinery/atmospherics/binary/pump{dir = 2; name = "Waste Out"; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) +"chv" = (/obj/machinery/atmospherics/components/binary/pump{dir = 2; name = "Waste Out"; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "chw" = (/obj/structure/disposalpipe/junction{dir = 4; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "chx" = (/obj/structure/closet/emcloset,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "chy" = (/obj/structure/closet,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -5803,13 +5803,13 @@ "chH" = (/obj/effect/spawner/lootdrop/maintenance,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/aft) "chI" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/aft) "chJ" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "Engineering Secure Storage"; dir = 4; network = list("SS13")},/turf/simulated/floor/plating,/area/engine/engineering) -"chK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/engine/engineering) +"chK" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/engine/engineering) "chL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "chM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/engine/engineering) "chN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/engine/engineering) "chO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "chP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) -"chQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"chQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "chR" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "chS" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "chT" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) @@ -5817,21 +5817,21 @@ "chV" = (/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/structure/table/reinforced,/obj/machinery/light_switch{pixel_x = 27},/obj/item/weapon/cartridge/atmos,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "chW" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/engine/engineering) "chX" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/engine/engineering) -"chY" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "n2_in"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) +"chY" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "n2_in"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) "chZ" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) -"cia" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) -"cib" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "o2_in"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) +"cia" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) +"cib" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "o2_in"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) "cic" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) -"cid" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) -"cie" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) +"cid" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) +"cie" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) "cif" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) -"cig" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) +"cig" = (/obj/machinery/atmospherics/components/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos) "cih" = (/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/incinerator) "cii" = (/obj/structure/stool,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cij" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/obj/machinery/meter,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cik" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cil" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 2},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cim" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/binary/valve{dir = 4; name = "Incinerator to Space"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cim" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/binary/valve{dir = 4; name = "Incinerator to Space"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cin" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4; initialize_directions = 11},/obj/machinery/meter,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cio" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/asmaint) "cip" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/maintenance/asmaint2) @@ -5943,14 +5943,14 @@ "ckr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/engine/engineering) "cks" = (/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC"; pixel_y = 30},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/engine/engineering) "ckt" = (/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/engine/engineering) -"cku" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellowcorner"},/area/engine/engineering) +"cku" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellowcorner"},/area/engine/engineering) "ckv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/engine/engineering) "ckw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/engine/engineering) "ckx" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) "cky" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) "ckz" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/engine/engineering) "ckA" = (/obj/structure/closet/secure_closet/engineering_personal,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/engine/engineering) -"ckB" = (/obj/structure/lattice,/obj/machinery/atmospherics/binary/pump{dir = 2; name = "Incinerator Output Pump"; on = 1},/turf/space,/area/space) +"ckB" = (/obj/structure/lattice,/obj/machinery/atmospherics/components/binary/pump{dir = 2; name = "Incinerator Output Pump"; on = 1},/turf/space,/area/space) "ckD" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/engine,/area/maintenance/incinerator) "ckE" = (/obj/structure/closet/wardrobe/black,/turf/simulated/floor/plasteel/shuttle,/area/shuttle/arrival) "ckF" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -5961,11 +5961,11 @@ "ckK" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes/engineering,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/engine/engine_smes) "ckL" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/engine/engine_smes) "ckM" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/smes/engineering,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/engine/engine_smes) -"ckN" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera{c_tag = "SMES Room"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/engine_smes) +"ckN" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera{c_tag = "SMES Room"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/engine_smes) "ckO" = (/obj/machinery/door/window/southleft{base_state = "left"; dir = 2; icon_state = "left"; name = "Engineering Delivery"; req_access_txt = "10"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/engine/engineering) "ckP" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/maintenance{name = "Engineering Maintenance"; req_access_txt = "10"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/engine/engineering) "ckQ" = (/obj/machinery/camera{c_tag = "Engineering West"; dir = 4; network = list("SS13")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellowcorner"},/area/engine/engineering) -"ckR" = (/obj/machinery/atmospherics/unary/vent_scrubber,/turf/simulated/floor/plasteel,/area/engine/engineering) +"ckR" = (/obj/machinery/atmospherics/components/unary/vent_scrubber,/turf/simulated/floor/plasteel,/area/engine/engineering) "ckS" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/engine/engineering) "ckT" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching the singularity chamber."; dir = 1; layer = 4; name = "Singularity Engine Telescreen"; network = list("Singularity"); pixel_x = 0; pixel_y = -30},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) "ckU" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel,/area/engine/engineering) @@ -6006,9 +6006,9 @@ "clD" = (/obj/structure/table,/obj/item/device/flashlight{pixel_y = 5},/obj/item/clothing/ears/earmuffs{pixel_x = -5; pixel_y = 6},/obj/item/weapon/airlock_painter,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "clE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "clF" = (/obj/structure/closet/l3closet/scientist{pixel_x = -2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/mixing) -"clG" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) +"clG" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "clH" = (/obj/machinery/igniter{icon_state = "igniter0"; id = "Incinerator"; luminosity = 2; on = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) -"clI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 0; pressure_checks = 2; pump_direction = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) +"clI" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 0; pressure_checks = 2; pump_direction = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "clJ" = (/obj/machinery/door/poddoor{id = "auxincineratorvent"; name = "Auxiliary Incinerator Vent"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "clK" = (/obj/structure/rack{dir = 1},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "clL" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -6050,13 +6050,13 @@ "cmv" = (/obj/machinery/power/compressor{comp_id = "incineratorturbine"; dir = 1; luminosity = 2},/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "cmw" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating/airless,/area/space) "cmx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/lattice/catwalk,/turf/space,/area/solar/starboard) -"cmy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/engine_smes) +"cmy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/engine_smes) "cmz" = (/turf/simulated/floor/plasteel,/area/engine/engine_smes) "cmA" = (/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 2},/area/engine/engine_smes) "cmB" = (/obj/machinery/light,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/engine/engine_smes) -"cmC" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/engine/engine_smes) -"cmD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/engine_smes) -"cmE" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/engine/engine_smes) +"cmC" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/engine/engine_smes) +"cmD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/engine/engine_smes) +"cmE" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/engine/engine_smes) "cmF" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) "cmG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/engine/engineering) "cmH" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/turf/simulated/floor/plasteel,/area/engine/engineering) @@ -6074,7 +6074,7 @@ "cmT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/engine/engineering) "cmU" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "cmV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) -"cmW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/engine/engineering) +"cmW" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/engine/engineering) "cmX" = (/obj/machinery/door/airlock/external{name = "Escape Pod Four"; req_access = null; req_access_txt = "0"},/turf/simulated/floor/plating,/area/engine/engineering) "cmY" = (/obj/machinery/computer/arcade,/turf/simulated/floor/plasteel/shuttle,/area/shuttle/arrival) "cmZ" = (/obj/machinery/power/turbine{luminosity = 2},/obj/structure/cable/yellow,/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) @@ -6084,8 +6084,8 @@ "cnd" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/engine/engine_smes) "cne" = (/obj/structure/table,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -35},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warning"},/area/engine/engine_smes) "cnf" = (/obj/structure/table,/obj/machinery/camera{c_tag = "Engineering Storage"; dir = 4; network = list("SS13")},/turf/simulated/floor/plasteel,/area/engine/engineering) -"cng" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) -"cnh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"cng" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) +"cnh" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "cni" = (/obj/structure/table,/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plasteel,/area/engine/engineering) "cnj" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/engine/engineering) "cnk" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = -32},/obj/machinery/light,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warning"},/area/engine/engineering) @@ -6144,8 +6144,8 @@ "col" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/engine/engineering) "com" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = -32},/turf/simulated/floor/plating,/area/engine/engineering) "con" = (/obj/machinery/light/small{dir = 4},/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/engine/engineering) -"coo" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) -"cop" = (/obj/machinery/camera{c_tag = "Engineering MiniSat Access"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"coo" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) +"cop" = (/obj/machinery/camera{c_tag = "Engineering MiniSat Access"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/engine/engineering) "coq" = (/obj/structure/transit_tube{tag = "icon-Block"; icon_state = "Block"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) "cor" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar{id = "starboardsolar"; name = "Starboard Solar Array"},/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/solar/starboard) "cos" = (/obj/structure/lattice/catwalk,/turf/space,/area/solar/starboard) @@ -6179,7 +6179,7 @@ "coU" = (/obj/structure/grille,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area/engine/engineering) "coV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/wall/r_wall,/area/engine/engineering) "coW" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) -"coX" = (/obj/structure/closet/emcloset,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) +"coX" = (/obj/structure/closet/emcloset,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) "coY" = (/obj/machinery/light,/turf/simulated/floor/plasteel,/area/engine/engineering) "coZ" = (/obj/structure/transit_tube{icon_state = "N-S"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) "cpa" = (/obj/structure/cable,/obj/machinery/power/solar{id = "starboardsolar"; name = "Starboard Solar Array"},/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/solar/starboard) @@ -6245,7 +6245,7 @@ "cqi" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating/airless,/area/engine/engineering) "cqj" = (/obj/item/weapon/screwdriver,/obj/structure/lattice,/turf/space,/area/space) "cqk" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating/airless,/area/engine/engineering) -"cql" = (/obj/machinery/vending/wallmed{pixel_y = 28},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"cql" = (/obj/machinery/vending/wallmed{pixel_y = 28},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "cqm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/construction) "cqn" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/aft) "cqo" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "atmos"; layer = 2.9; name = "atmos blast door"},/turf/simulated/floor/plating,/area/atmos) @@ -6258,14 +6258,14 @@ "cqv" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) "cqw" = (/obj/machinery/door/airlock/hatch{name = "Teleporter Room"; req_access_txt = "17;65"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) "cqx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/tcommsat/computer) -"cqy" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"cqz" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty{pixel_x = -3; pixel_y = -3},/obj/item/weapon/reagent_containers/blood/AMinus,/obj/item/weapon/reagent_containers/blood/BMinus{pixel_x = -4; pixel_y = 4},/obj/item/weapon/reagent_containers/blood/BPlus{pixel_x = 1; pixel_y = 2},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OPlus{pixel_x = -2; pixel_y = -1},/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) +"cqy" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/tcommsat/computer) +"cqz" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty{pixel_x = -3; pixel_y = -3},/obj/item/weapon/reagent_containers/blood/AMinus,/obj/item/weapon/reagent_containers/blood/BMinus{pixel_x = -4; pixel_y = 4},/obj/item/weapon/reagent_containers/blood/BPlus{pixel_x = 1; pixel_y = 2},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OPlus{pixel_x = -2; pixel_y = -1},/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "cqA" = (/obj/machinery/camera/emp_proof{c_tag = "Singularity West"; dir = 1; network = list("Singularity")},/turf/simulated/floor/plating/airless,/area/engine/engineering) "cqB" = (/obj/machinery/camera/emp_proof{c_tag = "Singularity East"; dir = 1; network = list("Singularity")},/turf/simulated/floor/plating/airless,/area/engine/engineering) "cqC" = (/obj/item/device/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Telecoms)"; pixel_x = 0; pixel_y = 26},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "cqD" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/aft) "cqE" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/tcommsat/computer) -"cqF" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) +"cqF" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "cqG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/tcommsat/computer) "cqH" = (/obj/machinery/door/airlock/glass_command{name = "Control Room"; req_access_txt = "19; 61"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/tcommsat/computer) "cqI" = (/obj/structure/window/reinforced/fulltile,/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/tcommsat/computer) @@ -6275,7 +6275,7 @@ "cqM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/tcommsat/computer) "cqN" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "cqO" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) -"cqP" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Telecoms Admin"; departmentType = 5; name = "Telecoms RC"; pixel_x = 30; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) +"cqP" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Telecoms Admin"; departmentType = 5; name = "Telecoms RC"; pixel_x = 30; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "cqQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "cqR" = (/obj/structure/window/reinforced{dir = 4},/turf/space,/area/space) "cqS" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/aisat) @@ -6297,9 +6297,9 @@ "cri" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/hatch{name = "MiniSat Antechamber"; req_one_access_txt = "65"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/aisat_interior) "crj" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTH)"; icon_state = "warndark"; dir = 1},/area/aisat) "crk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/turret_protected/aisat_interior) -"crl" = (/obj/machinery/camera{c_tag = "MiniSat Teleporter"; dir = 1; network = list("MiniSat"); pixel_x = 0; pixel_y = 0},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = -28; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) +"crl" = (/obj/machinery/camera{c_tag = "MiniSat Teleporter"; dir = 1; network = list("MiniSat"); pixel_x = 0; pixel_y = 0},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = -28; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) "crm" = (/obj/machinery/door/window{dir = 1; name = "MiniSat Walkway Access"; req_access_txt = "13;65"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/aisat) -"crn" = (/obj/machinery/door_control{id = "teledoor"; name = "AI Satellite Teleport Shutters Control"; pixel_x = 25; pixel_y = 0; req_access_txt = "17;65"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) +"crn" = (/obj/machinery/door_control{id = "teledoor"; name = "AI Satellite Teleport Shutters Control"; pixel_x = 25; pixel_y = 0; req_access_txt = "17;65"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) "cro" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/aisat) "crp" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "65"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/aisat_interior) "crq" = (/obj/machinery/iv_drip,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) @@ -6324,7 +6324,7 @@ "crJ" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/aisat) "crK" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/aisat) "crL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/aisat) -"crM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/aisat) +"crM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/aisat) "crN" = (/obj/machinery/bot/secbot/pingsky,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/aisat_interior) "crO" = (/obj/structure/transit_tube/station{dir = 4; icon_state = "closed"; reverse_launch = 1; tag = "icon-closed (EAST)"},/turf/simulated/floor/plating,/area/aisat) "crP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners (WEST)"; icon_state = "darkbluecorners"; dir = 8},/area/aisat) @@ -6334,7 +6334,7 @@ "crT" = (/turf/simulated/floor/plating,/area/aisat) "crU" = (/turf/simulated/floor/plasteel{tag = "icon-darkblue"; icon_state = "darkblue"; temperature = 273.15},/area/turret_protected/aisat_interior) "crV" = (/obj/machinery/camera/motion{c_tag = "MiniSat Antechamber"; dir = 1; network = list("MiniSat")},/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; listening = 0; name = "Station Intercom (AI Private)"; pixel_y = -29},/turf/simulated/floor/plasteel{tag = "icon-darkblue"; icon_state = "darkblue"; temperature = 273.15},/area/turret_protected/aisat_interior) -"crW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/aisat) +"crW" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/aisat) "crX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/bot/cleanbot{on = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior) "crY" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera{c_tag = "MiniSat Exterior North East"; dir = 4; network = list("MiniSat"); pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/aisat) "crZ" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai) @@ -6351,7 +6351,7 @@ "csk" = (/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/ai) "csl" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/aisat) "csm" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/aisat) -"csn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/closet/emcloset,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32},/turf/simulated/floor/plating,/area/aisat) +"csn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/closet/emcloset,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32},/turf/simulated/floor/plating,/area/aisat) "cso" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) "csp" = (/turf/simulated/floor/bluegrid,/area/turret_protected/ai) "csq" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) @@ -6384,7 +6384,7 @@ "csR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/aisat) "csS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/ai_monitored/storage/secure) "csT" = (/turf/space,/area/aisat) -"csU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) +"csU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/aisat) "csV" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/space,/area/space) "csW" = (/obj/structure/window/reinforced,/obj/structure/lattice,/turf/space,/area/space) "csX" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/aisat) @@ -6409,7 +6409,7 @@ "ctq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/aisat_interior) "ctr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/turret_protected/aisat_interior) "cts" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/ai_monitored/storage/secure) -"ctt" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/unary/outlet_injector{dir = 8},/turf/simulated/floor/plating/airless,/area/space) +"ctt" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/components/unary/outlet_injector{dir = 8},/turf/simulated/floor/plating/airless,/area/space) "ctu" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/lattice,/turf/space,/area/space) "ctv" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_s"; name = "south of station"; turf_type = /turf/space; width = 18},/turf/space,/area/space) "ctw" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior) @@ -6422,10 +6422,10 @@ "ctD" = (/obj/effect/landmark{name = "blobstart"},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine,/area/toxins/explab) "ctE" = (/obj/machinery/r_n_d/experimentor,/turf/simulated/floor/engine,/area/toxins/explab) "ctF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior) -"ctG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners (WEST)"; icon_state = "darkbluecorners"; dir = 8},/area/turret_protected/aisat_interior) +"ctG" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners (WEST)"; icon_state = "darkbluecorners"; dir = 8},/area/turret_protected/aisat_interior) "ctH" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "ctI" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/filingcabinet/chestdrawer,/mob/living/simple_animal/parrot/Poly,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) -"ctJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/turret_protected/aisat_interior) +"ctJ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners"; icon_state = "darkbluecorners"; temperature = 273.15},/area/turret_protected/aisat_interior) "ctK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (WEST)"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior) "ctL" = (/obj/machinery/door/airlock/shuttle{name = "Mining Shuttle Airlock"; req_access_txt = "48"},/obj/docking_port/mobile{dir = 8; dwidth = 3; height = 5; id = "mining"; name = "mining shuttle"; travelDir = 90; width = 7},/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "mining_home"; name = "mining shuttle bay"; width = 7},/turf/simulated/floor/plating,/area/shuttle/labor) "ctM" = (/obj/machinery/computer/shuttle/mining,/turf/simulated/floor/plasteel/shuttle,/area/shuttle/labor) @@ -6439,15 +6439,15 @@ "ctU" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) "ctV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) "ctW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table/reinforced,/obj/item/weapon/folder/white,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) -"ctX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) -"ctY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) +"ctX" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) +"ctY" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/ai) "ctZ" = (/obj/structure/rack,/obj/item/weapon/storage/toolbox/electrical{pixel_x = -3; pixel_y = 3},/obj/item/weapon/storage/toolbox/mechanical,/obj/item/device/multitool,/turf/simulated/floor/plating,/area/ai_monitored/storage/secure) -"cua" = (/obj/machinery/atmospherics/unary/tank/air,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/secure) +"cua" = (/obj/machinery/atmospherics/components/unary/tank/air,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/secure) "cub" = (/obj/structure/rack,/obj/item/weapon/crowbar/red,/obj/item/weapon/wrench,/obj/item/clothing/head/welding,/turf/simulated/floor/plating,/area/ai_monitored/storage/secure) "cuc" = (/obj/machinery/recharge_station,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/secure) "cud" = (/obj/machinery/power/apc{dir = 8; name = "MiniSat Maint APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTH)"; icon_state = "warndark"; dir = 1},/area/ai_monitored/storage/secure) "cue" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/ai_monitored/storage/secure) -"cuf" = (/obj/machinery/atmospherics/binary/pump{dir = 0; name = "Air Out"; on = 1},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHEAST)"; icon_state = "warndark"; dir = 5},/area/ai_monitored/storage/secure) +"cuf" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Air Out"; on = 1},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHEAST)"; icon_state = "warndark"; dir = 5},/area/ai_monitored/storage/secure) "cug" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 28; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTH)"; icon_state = "warndark"; dir = 1},/area/ai_monitored/storage/secure) "cuh" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel{tag = "icon-warndark (NORTHWEST)"; icon_state = "warndark"; dir = 9},/area/ai_monitored/storage/secure) "cui" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 1},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) @@ -6459,10 +6459,10 @@ "cuo" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "65"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) "cup" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/camera/motion{c_tag = "MiniSat Maintenance"; dir = 4; network = list("MiniSat")},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) "cuq" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) -"cur" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) +"cur" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) "cus" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) -"cut" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) -"cuu" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1; name = "Auxiliary MiniSat Distribution Port"},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) +"cut" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) +"cuu" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1; name = "Auxiliary MiniSat Distribution Port"},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) "cuv" = (/obj/machinery/computer/station_alert,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) "cuw" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) "cux" = (/obj/machinery/power/port_gen/pacman,/obj/structure/cable,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/storage/secure) @@ -6485,22 +6485,22 @@ "cuO" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/simulated/wall/shuttle{icon_state = "swall_f6"; dir = 2},/area/shuttle/pod_4) "cuP" = (/obj/machinery/door/airlock/engineering{name = "Telecommunications"; req_access_txt = "61"},/turf/simulated/floor/plasteel,/area/tcommsat/computer) "cuQ" = (/obj/structure/rack{dir = 1},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/weapon/pickaxe{pixel_x = 5},/obj/item/weapon/shovel{pixel_x = -5},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) -"cuS" = (/obj/machinery/atmospherics/binary/pump{dir = 1; on = 1},/obj/structure/sign/fire{pixel_x = 32; pixel_y = 0},/obj/machinery/doorButtons/access_button{idSelf = "incinerator_access_control"; idDoor = "incinerator_airlock_interior"; name = "Incinerator airlock control"; pixel_x = -8; pixel_y = 24},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine,/area/maintenance/incinerator) +"cuS" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; on = 1},/obj/structure/sign/fire{pixel_x = 32; pixel_y = 0},/obj/machinery/doorButtons/access_button{idSelf = "incinerator_access_control"; idDoor = "incinerator_airlock_interior"; name = "Incinerator airlock control"; pixel_x = -8; pixel_y = 24},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine,/area/maintenance/incinerator) "cuT" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "cuU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/storage) "cuV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/quartermaster/storage) "cuW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/quartermaster/storage) "cuX" = (/obj/machinery/light,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -35},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "loadingarea"},/area/quartermaster/storage) "cuY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/quartermaster/qm) -"cuZ" = (/obj/structure/table,/obj/item/weapon/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/weapon/cartridge/quartermaster,/obj/item/weapon/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = -30; pixel_y = 0},/obj/item/weapon/coin/silver,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "brown"},/area/quartermaster/qm) +"cuZ" = (/obj/structure/table,/obj/item/weapon/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/weapon/cartridge/quartermaster,/obj/item/weapon/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = -30; pixel_y = 0},/obj/item/weapon/coin/silver,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 9; icon_state = "brown"},/area/quartermaster/qm) "cva" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/qm) -"cvb" = (/obj/structure/filingcabinet,/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 6; icon_state = "brown"},/area/quartermaster/qm) +"cvb" = (/obj/structure/filingcabinet,/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{dir = 6; icon_state = "brown"},/area/quartermaster/qm) "cvc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/miningdock) "cvd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/atmos{name = "Turbine Access"; req_access_txt = "32"},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cve" = (/obj/machinery/door_control{id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = 6; pixel_y = -24; req_access_txt = "32"},/obj/machinery/door_control{id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = -6; pixel_y = -24; req_access_txt = "32"},/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/incinerator) "cvf" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_interior"; locked = 1; name = "Turbine Interior Airlock"; req_access_txt = "32"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/engine,/area/maintenance/incinerator) "cvg" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_exterior"; locked = 1; name = "Turbine Exterior Airlock"; req_access_txt = "32"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/engine,/area/maintenance/incinerator) -"cvh" = (/obj/machinery/atmospherics/unary/heat_reservoir/heater{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"cvh" = (/obj/machinery/atmospherics/components/unary/heat_reservoir/heater{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "cvi" = (/obj/machinery/camera{c_tag = "Engineering East"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/obj/structure/closet/wardrobe/engineering_yellow,/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/engine/engineering) (1,1,1) = {" diff --git a/_maps/map_files/generic/z4.dmm b/_maps/map_files/generic/z4.dmm index e80c93de8a4..3fc7967e42f 100644 --- a/_maps/map_files/generic/z4.dmm +++ b/_maps/map_files/generic/z4.dmm @@ -691,13 +691,13 @@ "nQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/derelict/gravity_generator) "nR" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/derelict/gravity_generator) "nS" = (/obj/structure/window/reinforced,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/derelict/bridge/access) -"nU" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/derelict/bridge) -"nV" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/derelict/bridge) +"nU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/derelict/bridge) +"nV" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/derelict/bridge) "nW" = (/turf/space,/area/derelict/bridge/access) "nX" = (/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access) -"nY" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) -"oa" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) -"ob" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) +"nY" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) +"oa" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) +"ob" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "oc" = (/obj/structure/computerframe,/turf/simulated/floor/plasteel/airless{icon_state = "damaged3"},/area/derelict/medical) "od" = (/obj/structure/closet,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel/airless{icon_state = "damaged2"},/area/derelict/medical) "oe" = (/obj/machinery/light{dir = 1},/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating/airless,/area/derelict/medical) @@ -706,12 +706,12 @@ "oh" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/medical) "oi" = (/obj/structure/table,/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/derelict/medical/chapel) "oj" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) -"ok" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) +"ok" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) "om" = (/obj/structure/table,/turf/simulated/floor/plating/airless,/area/derelict/medical) "on" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel/airless{icon_state = "damaged3"},/area/derelict/medical) "oo" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/turf/space,/area/space) -"op" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel) -"oq" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel) +"op" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel) +"oq" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel) "or" = (/obj/machinery/sleeper{tag = "icon-sleeper-open (EAST)"; icon_state = "sleeper-open"; dir = 4},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) "os" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) "ot" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) @@ -720,8 +720,8 @@ "ow" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/space,/area/space) "ox" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/derelict/medical/chapel) "oy" = (/obj/structure/table,/turf/simulated/floor/plating/airless,/area/space) -"oz" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) -"oA" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless{icon_state = "damaged2"},/area/derelict/hallway/primary) +"oz" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel) +"oA" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless{icon_state = "damaged2"},/area/derelict/hallway/primary) "oB" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/stool/bed,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) "oC" = (/obj/structure/stool/bed,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) "oE" = (/obj/machinery/door/airlock/medical{name = "Medical"},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical) @@ -729,8 +729,8 @@ "oI" = (/obj/structure/closet,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) "oJ" = (/obj/structure/computerframe,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) "oM" = (/obj/machinery/door/airlock/command{name = "Teleporter Room"},/turf/simulated/floor/plasteel/airless,/area/derelict/medical/chapel) -"oN" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) -"oO" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) +"oN" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) +"oO" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary) "oP" = (/obj/structure/girder,/turf/simulated/floor/plasteel/airless,/area/space) "oQ" = (/obj/machinery/door/window,/turf/simulated/floor/plasteel/airless,/area/space) "oR" = (/obj/structure/closet,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) @@ -742,11 +742,11 @@ "oX" = (/turf/simulated/floor/plating/airless,/area/derelict/atmospherics) "oY" = (/turf/simulated/wall/r_wall,/area/derelict/atmospherics) "oZ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plating,/area/derelict/atmospherics) -"pa" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/atmospherics) -"pb" = (/obj/machinery/atmospherics/unary/portables_connector/visible{tag = "icon-connector_map (WEST)"; icon_state = "connector_map"; dir = 8},/turf/simulated/floor/plating,/area/derelict/atmospherics) +"pa" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/atmospherics) +"pb" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{tag = "icon-connector_map (WEST)"; icon_state = "connector_map"; dir = 8},/turf/simulated/floor/plating,/area/derelict/atmospherics) "pc" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Access"; req_access_txt = "24"},/turf/simulated/floor/plating/airless,/area/derelict/atmospherics) "pd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plating,/area/derelict/atmospherics) -"pe" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/atmospherics) +"pe" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/atmospherics) "pf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/plating,/area/derelict/atmospherics) "pg" = (/turf/simulated/floor/plasteel/airless,/area/derelict/atmospherics) "ph" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/derelict/atmospherics) @@ -763,10 +763,10 @@ "ps" = (/obj/structure/computerframe,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/atmospherics) "pt" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel/airless{icon_state = "damaged5"},/area/derelict/atmospherics) "pu" = (/obj/structure/lattice,/turf/space,/area/derelict/atmospherics) -"pv" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) +"pv" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) "pw" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plating,/area/derelict/atmospherics) "px" = (/turf/simulated/floor/plasteel/airless{icon_state = "damaged3"},/area/derelict/atmospherics) -"py" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) +"py" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) "pz" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plasteel,/area/derelict/atmospherics) "pA" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/derelict/atmospherics) "pB" = (/turf/simulated/floor/plasteel{tag = "icon-damaged1"; icon_state = "damaged1"},/area/derelict/atmospherics) @@ -776,7 +776,7 @@ "pF" = (/obj/structure/window/fulltile{dir = 5},/turf/simulated/floor/plating/airless,/area/derelict/atmospherics) "pG" = (/turf/space,/area/derelict/atmospherics) "pH" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel,/area/derelict/atmospherics) -"pI" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) +"pI" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) "pJ" = (/obj/machinery/power/apc{dir = 1; name = "Worn-out APC"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/atmospherics) "pK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel/airless{icon_state = "derelict9"},/area/derelict/hallway/secondary) "pL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel/airless{icon_state = "derelict11"},/area/derelict/hallway/secondary) @@ -787,7 +787,7 @@ "pQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel/airless{icon_state = "derelict14"},/area/derelict/hallway/secondary) "pR" = (/obj/machinery/light/small{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel/airless{icon_state = "derelict16"},/area/derelict/hallway/secondary) "pS" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) -"pT" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) +"pT" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary) "pU" = (/turf/simulated/wall/r_wall,/area/derelict/se_solar) "pV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/engineering{name = "Aft Solar Access"; req_access_txt = "10"},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "pW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) @@ -800,7 +800,7 @@ "qd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "qe" = (/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "qf" = (/turf/simulated/floor/plating/airless,/area/derelict/se_solar) -"qh" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) +"qh" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "qi" = (/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "qj" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/machinery/power/solar_control{id = "derelictsolar"; name = "Primary Solar Control"; track = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "qk" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 8; environ = 0; equipment = 0; lighting = 0; locked = 0; name = "Worn-out APC"; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/plating/airless,/area/derelict/se_solar) @@ -811,7 +811,7 @@ "qp" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "qq" = (/obj/item/clothing/suit/space/syndicate/black/red,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "qr" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) -"qs" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) +"qs" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "qt" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/external,/turf/simulated/floor/plasteel/airless,/area/derelict/se_solar) "qu" = (/obj/structure/lattice/catwalk,/turf/space,/area/solar/derelict_aft) "qv" = (/obj/structure/lattice/catwalk,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/space,/area/solar/derelict_aft) diff --git a/_maps/map_files/generic/z5.dmm b/_maps/map_files/generic/z5.dmm index f47e1ae14cb..40cf2386d44 100644 --- a/_maps/map_files/generic/z5.dmm +++ b/_maps/map_files/generic/z5.dmm @@ -71,7 +71,7 @@ "bs" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/port_gen/pacman{anchored = 1},/turf/simulated/floor/plating,/area/mine/north_outpost) "bt" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/mine/north_outpost) "bu" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes{charge = 5e+006},/turf/simulated/floor/plating,/area/mine/north_outpost) -"bv" = (/obj/machinery/atmospherics/unary/tank/air,/turf/simulated/floor/plating,/area/mine/north_outpost) +"bv" = (/obj/machinery/atmospherics/components/unary/tank/air,/turf/simulated/floor/plating,/area/mine/north_outpost) "bw" = (/obj/effect/decal/remains/human,/turf/simulated/floor/plasteel/airless{icon_state = "damaged5"},/area/mine/abandoned) "bx" = (/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/obj/structure/alien/weeds,/turf/simulated/floor/plasteel/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "by" = (/obj/structure/alien/weeds/node,/turf/simulated/floor/plasteel/airless{icon_state = "floorscorched2"},/area/mine/abandoned) @@ -122,7 +122,7 @@ "cr" = (/turf/simulated/floor/plasteel{icon_state = "damaged3"},/area/mine/abandoned) "cs" = (/obj/structure/ore_box,/turf/simulated/floor/plating/asteroid/airless,/area/mine/explored) "ct" = (/obj/structure/table,/obj/item/weapon/storage/backpack/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light/small{dir = 8},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/plasteel,/area/mine/north_outpost) -"cu" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/north_outpost) +"cu" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cv" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cw" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/machinery/door/airlock/glass_mining{name = "Break Room"; req_access_txt = "54"},/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cx" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4},/turf/simulated/floor/plasteel,/area/mine/north_outpost) @@ -140,7 +140,7 @@ "cJ" = (/obj/effect/decal/remains/xeno,/turf/simulated/floor/plasteel/airless,/area/mine/abandoned) "cK" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cL" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel,/area/mine/north_outpost) -"cM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/north_outpost) +"cM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/north_outpost) "cN" = (/obj/structure/rack,/turf/simulated/floor/plasteel{icon_state = "bot"},/area/mine/north_outpost) "cO" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/mine/north_outpost) "cP" = (/obj/structure/alien/weeds/node,/turf/simulated/floor/plasteel/airless{icon_state = "floorgrime"},/area/mine/abandoned) @@ -194,7 +194,7 @@ "dL" = (/obj/structure/sign/bluecross_2{pixel_y = 32},/obj/structure/stool/bed/chair,/turf/simulated/floor/plasteel{icon_state = "white"; temperature = 273.15},/area/mine/laborcamp) "dM" = (/obj/machinery/camera{c_tag = "Labor Camp Medical"; dir = 8; network = list("Labor")},/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor/plasteel{icon_state = "white"; temperature = 273.15},/area/mine/laborcamp) "dN" = (/turf/simulated/wall,/area/mine/laborcamp) -"dO" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) +"dO" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "dP" = (/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "dQ" = (/turf/simulated/wall,/area/mine/explored) "dR" = (/turf/simulated/floor/plating/asteroid{temperature = 273.15},/area/mine/explored) @@ -207,7 +207,7 @@ "dY" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 1},/area/mine/explored) "dZ" = (/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 5},/area/mine/explored) "ea" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) -"eb" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) +"eb" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) "ec" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=1-Storage"; location = "Sleeper"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) "ed" = (/obj/machinery/light/small{dir = 4},/obj/structure/stool/bed/roller,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) "ee" = (/obj/machinery/alarm{pixel_y = 28},/obj/structure/closet/crate,/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/mine/production) @@ -251,7 +251,7 @@ "eQ" = (/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/unexplored) "eR" = (/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 6},/area/mine/unexplored) "eS" = (/obj/machinery/vending/sustenance,/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) -"eT" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) +"eT" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "eU" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/wall,/area/mine/laborcamp) "eV" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "eW" = (/obj/machinery/flasher{id = "Labor"; pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold{dir = 4},/turf/simulated/wall,/area/mine/laborcamp) @@ -327,16 +327,16 @@ "go" = (/obj/structure/plasticflaps/mining,/turf/simulated/wall,/area/mine/laborcamp/security) "gp" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=4-Maint"; location = "3-SMine"},/turf/simulated/floor/plasteel{icon_state = "asteroidfloor"; temperature = 273.15},/area/mine/laborcamp) "gq" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/closet/crate,/turf/simulated/floor/plasteel{icon_state = "asteroidfloor"; temperature = 273.15},/area/mine/explored) -"gr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/closet/crate,/turf/simulated/floor/plating/asteroid{temperature = 273.15},/area/mine/explored) +"gr" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/closet/crate,/turf/simulated/floor/plating/asteroid{temperature = 273.15},/area/mine/explored) "gs" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/explored) "gt" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/mine/laborcamp/security) "gu" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) "gv" = (/obj/structure/stool/bed/chair/office/dark,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) -"gw" = (/obj/machinery/door_control{id = "Labor"; name = "Labor Camp Lockdown"; pixel_x = 28; pixel_y = 7; req_access_txt = "2"},/obj/machinery/flasher_button{id = "Labor"; pixel_x = 26; pixel_y = -3},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) +"gw" = (/obj/machinery/door_control{id = "Labor"; name = "Labor Camp Lockdown"; pixel_x = 28; pixel_y = 7; req_access_txt = "2"},/obj/machinery/flasher_button{id = "Labor"; pixel_x = 26; pixel_y = -3},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) "gx" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/mine/laborcamp/security) "gy" = (/turf/simulated/floor/plating,/area/mine/laborcamp/security) "gz" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8},/obj/machinery/meter,/turf/simulated/floor/plating,/area/mine/laborcamp/security) -"gA" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/mine/laborcamp/security) +"gA" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/mine/laborcamp/security) "gB" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/mine/laborcamp/security) "gC" = (/obj/structure/table,/obj/machinery/recharger,/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) "gD" = (/obj/machinery/computer/secure_data,/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/mine/laborcamp/security) @@ -372,7 +372,7 @@ "hh" = (/turf/simulated/floor/bluegrid,/area/mine/maintenance) "hi" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 1; name = "Mining Communications APC"; pixel_x = 1; pixel_y = 25},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/mine/maintenance) "hj" = (/obj/machinery/telecomms/relay/preset/mining,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/mine/maintenance) -"hk" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/mine/maintenance) +"hk" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/mine/maintenance) "hl" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/space,/area/mine/explored) "hm" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/space,/area/mine/explored) "hn" = (/obj/structure/lattice,/turf/space,/area/mine/explored) @@ -452,7 +452,7 @@ "iJ" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/mine/living_quarters) "iK" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/mine/living_quarters) "iL" = (/turf/simulated/floor/plasteel,/area/mine/living_quarters) -"iM" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/mine/living_quarters) +"iM" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/mine/living_quarters) "iN" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/table,/obj/item/weapon/pickaxe,/turf/simulated/floor/plasteel,/area/mine/eva) "iO" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/suit_storage_unit/mining,/turf/simulated/floor/plasteel,/area/mine/eva) "iP" = (/obj/machinery/suit_storage_unit/mining,/turf/simulated/floor/plasteel,/area/mine/eva) @@ -478,13 +478,13 @@ "jj" = (/obj/machinery/atmospherics/pipe/simple{dir = 6},/obj/machinery/camera{c_tag = "EVA"; dir = 4; network = list("MINE")},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table,/obj/item/device/gps/mining,/obj/item/device/gps/mining,/obj/item/device/gps/mining,/obj/item/device/gps/mining,/turf/simulated/floor/plasteel,/area/mine/eva) "jk" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/mine/eva) "jl" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/eva) -"jm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor/plasteel,/area/mine/eva) +"jm" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor/plasteel,/area/mine/eva) "jn" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plasteel,/area/mine/west_outpost) -"jo" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) +"jo" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) "jp" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/mine/west_outpost) "jq" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) "jr" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/west_outpost) -"js" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) +"js" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/mine/west_outpost) "jt" = (/obj/machinery/conveyor_switch{id = "mining_west"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/mine/west_outpost) "ju" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/mine/living_quarters) "jv" = (/obj/machinery/door/airlock/glass{name = "Crew Area"; req_access_txt = "48"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/mine/living_quarters) @@ -548,7 +548,7 @@ "kB" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/mine/production) "kC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/airlock/glass_mining{name = "Mining Station Bridge"; req_access_txt = "48"},/turf/simulated/floor/plasteel,/area/mine/production) "kD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/mine/production) -"kE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) +"kE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) "kF" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/production) "kG" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/mine/production) "kH" = (/obj/machinery/power/apc{dir = 2; name = "Mining EVA APC"; pixel_x = 1; pixel_y = -23},/obj/structure/cable,/obj/structure/table,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/weapon/hand_labeler,/turf/simulated/floor/plasteel,/area/mine/eva) @@ -583,7 +583,7 @@ "lk" = (/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/production) "ll" = (/obj/machinery/conveyor_switch{id = "mining_external"},/turf/simulated/floor/plasteel/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/production) "lm" = (/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/production) -"ln" = (/obj/machinery/atmospherics/unary/tank/air{dir = 1; initialize_directions = 0; level = 1},/turf/simulated/floor/plating,/area/mine/west_outpost) +"ln" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 1; initialize_directions = 0; level = 1},/turf/simulated/floor/plating,/area/mine/west_outpost) "lo" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/west_outpost) "lp" = (/obj/machinery/power/terminal{dir = 4},/obj/machinery/light/small,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/mine/west_outpost) "lq" = (/obj/structure/cable,/obj/machinery/power/smes{charge = 5e+006},/turf/simulated/floor/plating,/area/mine/west_outpost) @@ -623,11 +623,11 @@ "lY" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/production) "lZ" = (/obj/structure/rack,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/regular{pixel_x = -3; pixel_y = -3},/turf/simulated/floor/plating,/area/mine/living_quarters) "ma" = (/obj/machinery/iv_drip,/turf/simulated/floor/plasteel{icon_state = "white"},/area/mine/living_quarters) -"mb" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Sleeper Room"; dir = 1; network = list("MINE")},/turf/simulated/floor/plasteel{icon_state = "white"; temperature = 273.15},/area/mine/living_quarters) +"mb" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Sleeper Room"; dir = 1; network = list("MINE")},/turf/simulated/floor/plasteel{icon_state = "white"; temperature = 273.15},/area/mine/living_quarters) "mc" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty{pixel_x = -3; pixel_y = -3},/obj/item/weapon/reagent_containers/blood/AMinus,/obj/item/weapon/reagent_containers/blood/BMinus{pixel_x = -4; pixel_y = 4},/obj/item/weapon/reagent_containers/blood/BPlus{pixel_x = 1; pixel_y = 2},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OPlus{pixel_x = -2; pixel_y = -1},/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/turf/simulated/floor/plasteel{icon_state = "white"},/area/mine/living_quarters) "md" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/mine/living_quarters) "me" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8},/obj/machinery/meter,/turf/simulated/floor/plating,/area/mine/living_quarters) -"mf" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/mine/living_quarters) +"mf" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/mine/living_quarters) "mg" = (/obj/structure/ore_box,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/mine/living_quarters) "mh" = (/turf/simulated/floor/plasteel{icon_state = "warning"},/area/mine/living_quarters) "mi" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/mine/living_quarters) @@ -658,7 +658,7 @@ "mH" = (/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/mine/production) "mI" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/machinery/computer/shuttle/mining{req_access = "0"},/obj/machinery/light{dir = 4},/obj/machinery/camera{c_tag = "Shuttle Docking Foyer"; dir = 8; network = list("MINE")},/obj/machinery/newscaster{pixel_x = 30; pixel_y = 1},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/mine/production) "mJ" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/mine/production) -"mK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) +"mK" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) "mL" = (/obj/machinery/camera{c_tag = "Processing Area Room"; dir = 8; network = list("MINE")},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/mine/production) "mM" = (/obj/machinery/mineral/unloading_machine{dir = 1; icon_state = "unloader-corner"; input_dir = 1; output_dir = 2},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 9},/area/mine/production) "mN" = (/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "mining_away"; name = "asteroid mine"; width = 7},/turf/space,/area/space) @@ -681,7 +681,7 @@ "ne" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/mine/production) "nf" = (/obj/machinery/mineral/processing_unit_console,/turf/simulated/wall/r_wall,/area/mine/production) "ng" = (/obj/machinery/mineral/processing_unit{dir = 1; output_dir = 2},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 9},/area/mine/production) -"nh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) +"nh" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/mine/production) "ni" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/mine/production) "nj" = (/obj/machinery/door/airlock/glass_mining{name = "Processing Area"; req_access_txt = "48"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/mine/production) "nk" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 10; icon_state = "warning"},/area/mine/production) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 74e24aafcd8..49687a66869 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -20,14 +20,11 @@ Pipelines + Other Objects -> Pipe network var/initialize_directions = 0 var/pipe_color var/obj/item/pipe/stored - var/welded = 0 //Used on pumps and scrubbers var/global/list/iconsetids = list() var/global/list/pipeimages = list() - var/datum/pipeline/parent = null var/image/pipe_vision_img = null - /obj/machinery/atmospherics/New() ..() SSair.atmos_machinery += src @@ -61,14 +58,8 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/SetInitDirections() return -/obj/machinery/atmospherics/proc/safe_input(var/title, var/text, var/default_set) - var/new_value = input(usr,text,title,default_set) as num - if(usr.canUseTopic(src)) - return new_value - return default_set - /obj/machinery/atmospherics/proc/returnPipenet() - return parent + return /obj/machinery/atmospherics/proc/returnPipenetAir() return @@ -86,20 +77,8 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference) return -/obj/machinery/atmospherics/proc/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) - var/image/img = getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color) - underlays += img - - return connected | img.dir - -/obj/machinery/atmospherics/proc/icon_addbroken(var/connected) - var/unconnected = (~connected) & initialize_directions - for(var/direction in cardinal) - if(unconnected & direction) - underlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_exposed", direction) - /obj/machinery/atmospherics/update_icon() - return null + return /obj/machinery/atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if(can_unwrench && istype(W, /obj/item/weapon/wrench)) @@ -256,4 +235,4 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/can_crawl_through() - return 1 + return 1 \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index 466898bc53a..569434e3bc2 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -1,5 +1,5 @@ /obj/machinery/atmospherics/components/binary - icon = 'icons/obj/atmospherics/binary_devices.dmi' + icon = 'icons/obj/atmospherics/components/binary_devices.dmi' dir = SOUTH initialize_directions = SOUTH|NORTH use_power = 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 7f489bc6820..403a49ab00b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -2,7 +2,7 @@ //node1, air1, network1 correspond to output -/obj/machinery/atmospherics/binary/circulator +/obj/machinery/atmospherics/components/binary/circulator name = "circulator/heat exchanger" desc = "A gas circulator pump and heat exchanger." icon_state = "circ1-off" @@ -16,7 +16,7 @@ density = 1 -/obj/machinery/atmospherics/binary/circulator/proc/return_transfer_air() +/obj/machinery/atmospherics/components/binary/circulator/proc/return_transfer_air() var/datum/gas_mixture/air1 = airs["a1"] var/datum/gas_mixture/air2 = airs["a2"] @@ -49,11 +49,11 @@ else last_pressure_delta = 0 -/obj/machinery/atmospherics/binary/circulator/process_atmos() +/obj/machinery/atmospherics/components/binary/circulator/process_atmos() ..() update_icon() -/obj/machinery/atmospherics/binary/circulator/update_icon() +/obj/machinery/atmospherics/components/binary/circulator/update_icon() if(stat & (BROKEN|NOPOWER)) icon_state = "circ[side]-p" else if(last_pressure_delta > 0) diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index fc00c522f48..e9adc87ad1a 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -5,8 +5,8 @@ Acts like a normal vent, but has an input AND output. #define INPUT_MIN 2 #define OUTPUT_MAX 4 -/obj/machinery/atmospherics/binary/dp_vent_pump - icon = 'icons/obj/atmospherics/unary_devices.dmi' //We reuse the normal vent icons! +/obj/machinery/atmospherics/components/binary/dp_vent_pump + icon = 'icons/obj/atmospherics/components/unary_devices.dmi' //We reuse the normal vent icons! icon_state = "dpvent_map" //node2 is output port @@ -32,23 +32,23 @@ Acts like a normal vent, but has an input AND output. //INPUT_MIN: Do not pass input_pressure_min //OUTPUT_MAX: Do not pass output_pressure_max -/obj/machinery/atmospherics/binary/dp_vent_pump/Destroy() +/obj/machinery/atmospherics/components/binary/dp_vent_pump/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) ..() -/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume name = "large dual-port air vent" -/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/New() +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/New() ..() var/datum/gas_mixture/air1 = airs["a1"] ; air1.volume = 1000 var/datum/gas_mixture/air2 = airs["a2"] ; air2.volume = 1000 -/obj/machinery/atmospherics/binary/dp_vent_pump/update_icon_nopipes() +/obj/machinery/atmospherics/components/binary/dp_vent_pump/update_icon_nopipes() overlays.Cut() if(showpipe) - overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "dpvent_cap") + overlays += getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "dpvent_cap") if(!on || stat & (NOPOWER|BROKEN)) icon_state = "vent_off" @@ -59,7 +59,7 @@ Acts like a normal vent, but has an input AND output. else icon_state = "vent_in" -/obj/machinery/atmospherics/binary/dp_vent_pump/process_atmos() +/obj/machinery/atmospherics/components/binary/dp_vent_pump/process_atmos() ..() if(!on) @@ -112,13 +112,13 @@ Acts like a normal vent, but has an input AND output. //Radio remote control -/obj/machinery/atmospherics/binary/dp_vent_pump/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/components/binary/dp_vent_pump/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency if(frequency) radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA) -/obj/machinery/atmospherics/binary/dp_vent_pump/proc/broadcast_status() +/obj/machinery/atmospherics/components/binary/dp_vent_pump/proc/broadcast_status() if(!radio_connection) return 0 @@ -141,16 +141,16 @@ Acts like a normal vent, but has an input AND output. return 1 -/obj/machinery/atmospherics/binary/dp_vent_pump/atmosinit() +/obj/machinery/atmospherics/components/binary/dp_vent_pump/atmosinit() ..() if(frequency) set_frequency(frequency) -/obj/machinery/atmospherics/binary/dp_vent_pump/initialize() +/obj/machinery/atmospherics/components/binary/dp_vent_pump/initialize() ..() broadcast_status() -/obj/machinery/atmospherics/binary/dp_vent_pump/receive_signal(datum/signal/signal) +/obj/machinery/atmospherics/components/binary/dp_vent_pump/receive_signal(datum/signal/signal) if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) return 0 diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 5f64ec72075..d7626277dba 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -7,7 +7,7 @@ Passive gate is similar to the regular pump except: */ -/obj/machinery/atmospherics/binary/passive_gate +/obj/machinery/atmospherics/components/binary/passive_gate icon_state = "passgate_map" name = "passive gate" @@ -22,20 +22,20 @@ Passive gate is similar to the regular pump except: var/id = null var/datum/radio_frequency/radio_connection -/obj/machinery/atmospherics/binary/passive_gate/Destroy() +/obj/machinery/atmospherics/components/binary/passive_gate/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() -/obj/machinery/atmospherics/binary/passive_gate/update_icon_nopipes() +/obj/machinery/atmospherics/components/binary/passive_gate/update_icon_nopipes() if(!on) icon_state = "passgate_off" overlays.Cut() return - overlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "passgate_on") + overlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "passgate_on") -/obj/machinery/atmospherics/binary/passive_gate/process_atmos() +/obj/machinery/atmospherics/components/binary/passive_gate/process_atmos() ..() if(!on) return 0 @@ -67,13 +67,13 @@ Passive gate is similar to the regular pump except: //Radio remote control -/obj/machinery/atmospherics/binary/passive_gate/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/components/binary/passive_gate/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency if(frequency) radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA) -/obj/machinery/atmospherics/binary/passive_gate/proc/broadcast_status() +/obj/machinery/atmospherics/components/binary/passive_gate/proc/broadcast_status() if(!radio_connection) return 0 @@ -93,25 +93,25 @@ Passive gate is similar to the regular pump except: return 1 -/obj/machinery/atmospherics/binary/passive_gate/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/components/binary/passive_gate/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_gas_pump.tmpl", name, 400, 120, 0) -/obj/machinery/atmospherics/binary/passive_gate/get_ui_data() +/obj/machinery/atmospherics/components/binary/passive_gate/get_ui_data() var/data = list() data["on"] = on data["pressure_set"] = round(target_pressure*100) //Nano UI can't handle rounded non-integers, apparently. data["max_pressure"] = MAX_OUTPUT_PRESSURE return data -/obj/machinery/atmospherics/binary/passive_gate/atmosinit() +/obj/machinery/atmospherics/components/binary/passive_gate/atmosinit() ..() if(frequency) set_frequency(frequency) -/obj/machinery/atmospherics/binary/passive_gate/receive_signal(datum/signal/signal) +/obj/machinery/atmospherics/components/binary/passive_gate/receive_signal(datum/signal/signal) if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) return 0 @@ -145,7 +145,7 @@ Passive gate is similar to the regular pump except: -/obj/machinery/atmospherics/binary/passive_gate/attack_hand(user as mob) +/obj/machinery/atmospherics/components/binary/passive_gate/attack_hand(user as mob) if(..()) return src.add_fingerprint(usr) @@ -156,7 +156,7 @@ Passive gate is similar to the regular pump except: ui_interact(user) return -/obj/machinery/atmospherics/binary/passive_gate/Topic(href,href_list) +/obj/machinery/atmospherics/components/binary/passive_gate/Topic(href,href_list) if(..()) return if(href_list["power"]) on = !on @@ -173,13 +173,13 @@ Passive gate is similar to the regular pump except: src.updateUsrDialog() return -/obj/machinery/atmospherics/binary/passive_gate/power_change() +/obj/machinery/atmospherics/components/binary/passive_gate/power_change() ..() update_icon() -/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/components/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if (!istype(W, /obj/item/weapon/wrench)) return ..() if (on) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index f34cf5dc602..457b8784672 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -12,7 +12,7 @@ Thus, the two variables affect pump operation are set in New(): but overall network volume is also increased as this increases... */ -/obj/machinery/atmospherics/binary/pump +/obj/machinery/atmospherics/components/binary/pump icon_state = "pump_map" name = "gas pump" desc = "A pump" @@ -26,22 +26,22 @@ Thus, the two variables affect pump operation are set in New(): var/id = null var/datum/radio_frequency/radio_connection -/obj/machinery/atmospherics/binary/pump/Destroy() +/obj/machinery/atmospherics/components/binary/pump/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() -/obj/machinery/atmospherics/binary/pump/on +/obj/machinery/atmospherics/components/binary/pump/on on = 1 -/obj/machinery/atmospherics/binary/pump/update_icon_nopipes() +/obj/machinery/atmospherics/components/binary/pump/update_icon_nopipes() if(stat & NOPOWER) icon_state = "pump_off" return icon_state = "pump_[on?"on":"off"]" -/obj/machinery/atmospherics/binary/pump/process_atmos() +/obj/machinery/atmospherics/components/binary/pump/process_atmos() // ..() if(stat & (NOPOWER|BROKEN)) return 0 @@ -71,13 +71,13 @@ Thus, the two variables affect pump operation are set in New(): return 1 //Radio remote control -/obj/machinery/atmospherics/binary/pump/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/components/binary/pump/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency if(frequency) radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA) -/obj/machinery/atmospherics/binary/pump/proc/broadcast_status() +/obj/machinery/atmospherics/components/binary/pump/proc/broadcast_status() if(!radio_connection) return 0 @@ -97,25 +97,25 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/binary/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_gas_pump.tmpl", name, 400, 120, 0) -/obj/machinery/atmospherics/binary/pump/get_ui_data() +/obj/machinery/atmospherics/components/binary/pump/get_ui_data() var/data = list() data["on"] = on data["pressure_set"] = round(target_pressure*100) //Nano UI can't handle rounded non-integers, apparently. data["max_pressure"] = MAX_OUTPUT_PRESSURE return data -/obj/machinery/atmospherics/binary/pump/atmosinit() +/obj/machinery/atmospherics/components/binary/pump/atmosinit() ..() if(frequency) set_frequency(frequency) -/obj/machinery/atmospherics/binary/pump/receive_signal(datum/signal/signal) +/obj/machinery/atmospherics/components/binary/pump/receive_signal(datum/signal/signal) if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) return 0 @@ -148,7 +148,7 @@ Thus, the two variables affect pump operation are set in New(): return -/obj/machinery/atmospherics/binary/pump/attack_hand(user as mob) +/obj/machinery/atmospherics/components/binary/pump/attack_hand(user as mob) if(..()) return src.add_fingerprint(usr) @@ -159,7 +159,7 @@ Thus, the two variables affect pump operation are set in New(): ui_interact(user) return -/obj/machinery/atmospherics/binary/pump/Topic(href,href_list) +/obj/machinery/atmospherics/components/binary/pump/Topic(href,href_list) if(..()) return if(href_list["power"]) on = !on @@ -176,11 +176,11 @@ Thus, the two variables affect pump operation are set in New(): src.updateUsrDialog() return -/obj/machinery/atmospherics/binary/pump/power_change() +/obj/machinery/atmospherics/components/binary/pump/power_change() ..() update_icon() -/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/components/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index cb978048917..81783404ac8 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -2,7 +2,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. */ -/obj/machinery/atmospherics/binary/valve +/obj/machinery/atmospherics/components/binary/valve icon_state = "mvalve_map" name = "manual valve" desc = "A pipe valve" @@ -13,39 +13,39 @@ It's like a regular ol' straight pipe, but you can turn it on and off. var/id = null var/open = 0 - var/type = "m" //lets us have a nice, clean, OOP update_icon_nopipes() + var/valve_type = "m" //lets us have a nice, clean, OOP update_icon_nopipes() -/obj/machinery/atmospherics/binary/valve/open +/obj/machinery/atmospherics/components/binary/valve/open open = 1 -/obj/machinery/atmospherics/binary/valve/update_icon_nopipes(animation = 0) +/obj/machinery/atmospherics/components/binary/valve/update_icon_nopipes(animation = 0) normalize_dir() if(animation) - flick("[type]valve_[open][!open]",src) - icon_state = "[type]valve_[open?"on":"off"]" + flick("[valve_type]valve_[open][!open]",src) + icon_state = "[valve_type]valve_[open?"on":"off"]" -/obj/machinery/atmospherics/binary/valve/proc/open() +/obj/machinery/atmospherics/components/binary/valve/proc/open() open = 1 update_icon_nopipes() update_parents() var/datum/pipeline/parent1 = parents["p1"] ; parent1.reconcile_air() investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", "atmos") -/obj/machinery/atmospherics/binary/valve/proc/close() +/obj/machinery/atmospherics/components/binary/valve/proc/close() open = 0 update_icon_nopipes() investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", "atmos") -/obj/machinery/atmospherics/binary/valve/proc/normalize_dir() +/obj/machinery/atmospherics/components/binary/valve/proc/normalize_dir() if(dir==SOUTH) dir = NORTH else if(dir==WEST) dir = EAST -/obj/machinery/atmospherics/binary/valve/attack_ai(mob/user) +/obj/machinery/atmospherics/components/binary/valve/attack_ai(mob/user) return -/obj/machinery/atmospherics/binary/valve/attack_hand(mob/user) +/obj/machinery/atmospherics/components/binary/valve/attack_hand(mob/user) add_fingerprint(usr) update_icon_nopipes(1) sleep(10) @@ -54,16 +54,16 @@ It's like a regular ol' straight pipe, but you can turn it on and off. return open() -/obj/machinery/atmospherics/binary/valve/digital // can be controlled by AI +/obj/machinery/atmospherics/components/binary/valve/digital // can be controlled by AI name = "digital valve" desc = "A digitally controlled valve." icon_state = "dvalve_map" - type = "d" + valve_type = "d" -/obj/machinery/atmospherics/binary/valve/digital/attack_ai(mob/user) +/obj/machinery/atmospherics/components/binary/valve/digital/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/atmospherics/binary/valve/digital/update_icon_nopipes(animation) +/obj/machinery/atmospherics/components/binary/valve/digital/update_icon_nopipes(animation) if(stat & NOPOWER) normalize_dir() icon_state = "dvalve_nopower" diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index c1beaa8ae8f..6d41f7ea062 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -12,7 +12,7 @@ Thus, the two variables affect pump operation are set in New(): but overall network volume is also increased as this increases... */ -/obj/machinery/atmospherics/binary/volume_pump +/obj/machinery/atmospherics/components/binary/volume_pump icon_state = "volpump_map" name = "volumetric gas pump" desc = "A volumetric pump" @@ -26,22 +26,22 @@ Thus, the two variables affect pump operation are set in New(): var/id = null var/datum/radio_frequency/radio_connection -/obj/machinery/atmospherics/binary/volume_pump/Destroy() +/obj/machinery/atmospherics/components/binary/volume_pump/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() -/obj/machinery/atmospherics/binary/volume_pump/on +/obj/machinery/atmospherics/components/binary/volume_pump/on on = 1 -/obj/machinery/atmospherics/binary/volume_pump/update_icon_nopipes() +/obj/machinery/atmospherics/components/binary/volume_pump/update_icon_nopipes() if(stat & NOPOWER) icon_state = "volpump_off" return icon_state = "volpump_[on?"on":"off"]" -/obj/machinery/atmospherics/binary/volume_pump/process_atmos() +/obj/machinery/atmospherics/components/binary/volume_pump/process_atmos() // ..() if(stat & (NOPOWER|BROKEN)) return @@ -69,13 +69,13 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/binary/volume_pump/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/components/binary/volume_pump/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency if(frequency) radio_connection = radio_controller.add_object(src, frequency) -/obj/machinery/atmospherics/binary/volume_pump/proc/broadcast_status() +/obj/machinery/atmospherics/components/binary/volume_pump/proc/broadcast_status() if(!radio_connection) return 0 @@ -94,25 +94,25 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/binary/volume_pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_gas_pump.tmpl", name, 400, 120, 0) -/obj/machinery/atmospherics/binary/volume_pump/get_ui_data() +/obj/machinery/atmospherics/components/binary/volume_pump/get_ui_data() var/data = list() data["on"] = on data["transfer_rate"] = round(transfer_rate*100) //Nano UI can't handle rounded non-integers, apparently. data["max_rate"] = MAX_TRANSFER_RATE return data -/obj/machinery/atmospherics/binary/volume_pump/atmosinit() +/obj/machinery/atmospherics/components/binary/volume_pump/atmosinit() ..() set_frequency(frequency) -/obj/machinery/atmospherics/binary/volume_pump/receive_signal(datum/signal/signal) +/obj/machinery/atmospherics/components/binary/volume_pump/receive_signal(datum/signal/signal) if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) return 0 @@ -145,7 +145,7 @@ Thus, the two variables affect pump operation are set in New(): update_icon() -/obj/machinery/atmospherics/binary/volume_pump/attack_hand(user as mob) +/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(user as mob) if(..()) return src.add_fingerprint(usr) @@ -156,7 +156,7 @@ Thus, the two variables affect pump operation are set in New(): ui_interact(user) return -/obj/machinery/atmospherics/binary/volume_pump/Topic(href,href_list) +/obj/machinery/atmospherics/components/binary/volume_pump/Topic(href,href_list) if(..()) return if(href_list["power"]) on = !on @@ -173,13 +173,13 @@ Thus, the two variables affect pump operation are set in New(): src.updateUsrDialog() return -/obj/machinery/atmospherics/binary/volume_pump/power_change() +/obj/machinery/atmospherics/components/binary/volume_pump/power_change() ..() update_icon() -/obj/machinery/atmospherics/binary/volume_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/components/binary/volume_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm index 9952c58ccdd..a096a58d519 100644 --- a/code/ATMOSPHERICS/components/components_base.dm +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -31,7 +31,7 @@ Iconnery */ /obj/machinery/atmospherics/components/proc/icon_addintact(var/obj/machinery/atmospherics/node, var/connected = 0) - var/image/img = getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color) + var/image/img = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color) underlays += img return connected | img.dir @@ -40,7 +40,7 @@ Iconnery var/unconnected = (~connected) & initialize_directions for(var/direction in cardinal) if(unconnected & direction) - underlays += getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_exposed", direction) + underlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_exposed", direction) /obj/machinery/atmospherics/components/proc/update_icon_nopipes() return @@ -85,15 +85,14 @@ Pipenet stuff; housekeeping /obj/machinery/atmospherics/components/construction() ..() - for(var/datum/pipeline/P in parents) - P.update = 1 + update_parents() -/obj/machinery/atmospherics/components/build_network() //doesn't work +/obj/machinery/atmospherics/components/build_network() for(var/I = 1; I <= device_type; I++) if(!parents["p[I]"]) - var/datum/pipeline/P = new + parents["p[I]"] = new /datum/pipeline() + var/datum/pipeline/P = parents["p[I]"] P.build_pipeline(src) - parents["p[I]"] = P /obj/machinery/atmospherics/components/disconnect(obj/machinery/atmospherics/reference) for(var/I = 1; I <= device_type; I++) @@ -118,13 +117,18 @@ Pipenet stuff; housekeeping if(reference == parents["p[I]"]) return airs["a[I]"] -/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) //runtime +/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) if(reference) for(var/I = 1; I <= device_type; I++) if(nodes["n[I]"]) if(parents["p[I]"] == reference) - return list("n" = nodes["n1"]) - return nodes + return list("n" = nodes["n[I]"]) + + var/list/obj/machinery/atmospherics/return_nodes = list() + for(var/I = 1; I <= device_type; I++) + return_nodes += nodes["n[I]"] + + return return_nodes /obj/machinery/atmospherics/components/setPipenet(datum/pipeline/reference, obj/machinery/atmospherics/A) for(var/I = 1; I <= device_type; I++) @@ -153,19 +157,18 @@ Pipenet stuff; housekeeping var/lost = null var/times_lost = 0 for(var/A = 1; A <= device_type; A++) - var/datum/gas_mixture/air = airs[A] + var/datum/gas_mixture/air = airs["a[A]"] lost += pressures*environment.volume/(air.temperature * R_IDEAL_GAS_EQUATION) times_lost++ var/shared_loss = lost/times_lost var/datum/gas_mixture/to_release for(var/A = 1; A <= device_type; A++) - var/datum/gas_mixture/air = airs[A] + var/datum/gas_mixture/air = airs["a[A]"] if(!to_release) to_release = air.remove(shared_loss) continue to_release.merge(air.remove(shared_loss)) - airs[A] = air T.assume_air(to_release) air_update_turf(1) @@ -184,5 +187,6 @@ Helpers */ /obj/machinery/atmospherics/components/proc/update_parents() - for(var/datum/pipeline/parent in parents) + for(var/I = 1; I <= device_type; I++) + var/datum/pipeline/parent = parents["p[I]"] parent.update = 1 \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 69d80ef8b26..6c43ba705f8 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -55,9 +55,9 @@ Filter types: if(direction & initialize_directions) var/obj/machinery/atmospherics/node = findConnecting(direction) if(node) - overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction, node.pipe_color) + overlays += getpipeimage('icons/obj/atmospherics/components/trinary_devices.dmi', "cap", direction, node.pipe_color) continue - overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) + overlays += getpipeimage('icons/obj/atmospherics/components/trinary_devices.dmi', "cap", direction) ..() /obj/machinery/atmospherics/components/trinary/filter/update_icon_nopipes() @@ -80,6 +80,8 @@ Filter types: ..() if(!on) return 0 + if(!(nodes["n1"] && nodes["n2"] && nodes["n3"])) + return 0 var/datum/gas_mixture/air1 = airs["a1"] var/datum/gas_mixture/air2 = airs["a2"] diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 15bf4f2fdc8..e9e42e51d28 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -26,9 +26,9 @@ if(direction & initialize_directions) var/obj/machinery/atmospherics/node = findConnecting(direction) if(node) - overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction, node.pipe_color) + overlays += getpipeimage('icons/obj/atmospherics/components/trinary_devices.dmi', "cap", direction, node.pipe_color) continue - overlays += getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "cap", direction) + overlays += getpipeimage('icons/obj/atmospherics/components/trinary_devices.dmi', "cap", direction) ..() /obj/machinery/atmospherics/components/trinary/mixer/update_icon_nopipes() @@ -55,6 +55,8 @@ ..() if(!on) return 0 + if(!(nodes["n1"] && nodes["n2"] && nodes["n3"])) + return 0 var/datum/gas_mixture/air1 = airs["a1"] var/datum/gas_mixture/air2 = airs["a2"] diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 5ea47605266..555ee08c04b 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -1,5 +1,5 @@ /obj/machinery/atmospherics/components/trinary - icon = 'icons/obj/atmospherics/trinary_devices.dmi' + icon = 'icons/obj/atmospherics/components/trinary_devices.dmi' dir = SOUTH initialize_directions = SOUTH|NORTH|WEST use_power = 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm index 722f56926fd..7cfbd6a9f06 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/cold_sink +/obj/machinery/atmospherics/components/unary/cold_sink icon_state = "cold_map" use_power = 1 @@ -11,10 +11,10 @@ var/current_temperature = T20C var/current_heat_capacity = 50000 //totally random -/obj/machinery/atmospherics/unary/cold_sink/update_icon_nopipes() +/obj/machinery/atmospherics/components/unary/cold_sink/update_icon_nopipes() overlays.Cut() if(showpipe) - overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now + overlays += getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) icon_state = "cold_off" @@ -23,7 +23,7 @@ else icon_state = "cold_on" -/obj/machinery/atmospherics/unary/cold_sink/process_atmos() +/obj/machinery/atmospherics/components/unary/cold_sink/process_atmos() ..() if(!on) return 0 diff --git a/code/ATMOSPHERICS/components/unary_devices/generator_input.dm b/code/ATMOSPHERICS/components/unary_devices/generator_input.dm index e5c64ef8cab..987d5e53a74 100644 --- a/code/ATMOSPHERICS/components/unary_devices/generator_input.dm +++ b/code/ATMOSPHERICS/components/unary_devices/generator_input.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/generator_input +/obj/machinery/atmospherics/components/unary/generator_input icon_state = "he_intact" density = 1 @@ -8,7 +8,7 @@ var/update_cycle -/obj/machinery/atmospherics/unary/generator_input/update_icon() +/obj/machinery/atmospherics/components/unary/generator_input/update_icon() if(nodes["n1"]) icon_state = "intact" else @@ -16,5 +16,5 @@ return -/obj/machinery/atmospherics/unary/generator_input/proc/return_exchange_air() +/obj/machinery/atmospherics/components/unary/generator_input/proc/return_exchange_air() return airs["a1"] diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm index 7e3f5294525..ec744484425 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/heat_exchanger +/obj/machinery/atmospherics/components/unary/heat_exchanger icon_state = "he_intact" @@ -7,10 +7,10 @@ can_unwrench = 1 - var/obj/machinery/atmospherics/unary/heat_exchanger/partner = null + var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = null var/update_cycle -/obj/machinery/atmospherics/unary/heat_exchanger/update_icon() +/obj/machinery/atmospherics/components/unary/heat_exchanger/update_icon() if(nodes["n1"]) icon_state = "he_intact" var/obj/machinery/atmospherics/node = nodes["n1"] @@ -20,11 +20,11 @@ return -/obj/machinery/atmospherics/unary/heat_exchanger/atmosinit() +/obj/machinery/atmospherics/components/unary/heat_exchanger/atmosinit() if(!partner) var/partner_connect = turn(dir,180) - for(var/obj/machinery/atmospherics/unary/heat_exchanger/target in get_step(src,partner_connect)) + for(var/obj/machinery/atmospherics/components/unary/heat_exchanger/target in get_step(src,partner_connect)) if(target.dir & get_dir(src,target)) partner = target partner.partner = src @@ -32,7 +32,7 @@ ..() -/obj/machinery/atmospherics/unary/heat_exchanger/process_atmos() +/obj/machinery/atmospherics/components/unary/heat_exchanger/process_atmos() ..() if(!partner) return 0 diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm index 0b86ff02248..ab107de56e0 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/heat_reservoir +/obj/machinery/atmospherics/components/unary/heat_reservoir //currently the same code as cold_sink but anticipating process() changes icon_state = "cold_map" @@ -12,10 +12,10 @@ var/current_temperature = T20C var/current_heat_capacity = 50000 //totally random -/obj/machinery/atmospherics/unary/heat_reservoir/update_icon_nopipes() +/obj/machinery/atmospherics/components/unary/heat_reservoir/update_icon_nopipes() overlays.Cut() if(showpipe) - overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now + overlays += getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) icon_state = "cold_off" @@ -24,7 +24,7 @@ else icon_state = "cold_on" -/obj/machinery/atmospherics/unary/heat_reservoir/process_atmos() +/obj/machinery/atmospherics/components/unary/heat_reservoir/process_atmos() ..() if(!on) return 0 diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index ed548bbd3e2..56c534d43ad 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/outlet_injector +/obj/machinery/atmospherics/components/unary/outlet_injector icon_state = "inje_map" use_power = 1 @@ -16,29 +16,29 @@ level = 1 -/obj/machinery/atmospherics/unary/outlet_injector/Destroy() +/obj/machinery/atmospherics/components/unary/outlet_injector/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() -/obj/machinery/atmospherics/unary/outlet_injector/on +/obj/machinery/atmospherics/components/unary/outlet_injector/on on = 1 -/obj/machinery/atmospherics/unary/outlet_injector/update_icon_nopipes() +/obj/machinery/atmospherics/components/unary/outlet_injector/update_icon_nopipes() if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) icon_state = "inje_off" return icon_state = "inje_on" -/obj/machinery/atmospherics/unary/outlet_injector/power_change() +/obj/machinery/atmospherics/components/unary/outlet_injector/power_change() var/old_stat = stat ..() if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/unary/outlet_injector/process_atmos() +/obj/machinery/atmospherics/components/unary/outlet_injector/process_atmos() ..() injecting = 0 @@ -59,7 +59,7 @@ return 1 -/obj/machinery/atmospherics/unary/outlet_injector/proc/inject() +/obj/machinery/atmospherics/components/unary/outlet_injector/proc/inject() if(on || injecting) return 0 @@ -78,13 +78,13 @@ flick("inje_inject", src) -/obj/machinery/atmospherics/unary/outlet_injector/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/components/unary/outlet_injector/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency if(frequency) radio_connection = radio_controller.add_object(src, frequency) -/obj/machinery/atmospherics/unary/outlet_injector/proc/broadcast_status() +/obj/machinery/atmospherics/components/unary/outlet_injector/proc/broadcast_status() if(!radio_connection) return 0 @@ -105,16 +105,16 @@ return 1 -/obj/machinery/atmospherics/unary/outlet_injector/atmosinit() +/obj/machinery/atmospherics/components/unary/outlet_injector/atmosinit() set_frequency(frequency) ..() -/obj/machinery/atmospherics/unary/outlet_injector/initialize() +/obj/machinery/atmospherics/components/unary/outlet_injector/initialize() ..() broadcast_status() -/obj/machinery/atmospherics/unary/outlet_injector/receive_signal(datum/signal/signal) +/obj/machinery/atmospherics/components/unary/outlet_injector/receive_signal(datum/signal/signal) if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) return 0 diff --git a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm index f4da714e038..6c3d654be14 100644 --- a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm +++ b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/oxygen_generator +/obj/machinery/atmospherics/components/unary/oxygen_generator icon_state = "o2gen_map" @@ -12,11 +12,11 @@ var/oxygen_content = 10 -/obj/machinery/atmospherics/unary/oxygen_generator/update_icon_nopipes() +/obj/machinery/atmospherics/components/unary/oxygen_generator/update_icon_nopipes() overlays.Cut() if(showpipe) - overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) //it works for now + overlays += getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions) //it works for now if(!nodes["n1"] || !on || stat & BROKEN) icon_state = "o2gen_off" @@ -25,12 +25,12 @@ else icon_state = "o2gen_on" -/obj/machinery/atmospherics/unary/oxygen_generator/New() +/obj/machinery/atmospherics/components/unary/oxygen_generator/New() ..() var/datum/gas_mixture/air_contents = airs["a1"] ; air_contents.volume = 50 airs["a1"] = air_contents -/obj/machinery/atmospherics/unary/oxygen_generator/process_atmos() +/obj/machinery/atmospherics/components/unary/oxygen_generator/process_atmos() ..() if(!on) return 0 diff --git a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm index 558e798c49d..9446c396078 100644 --- a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector name = "connector port" desc = "For connecting portables devices related to atmospherics control." - icon = 'icons/obj/atmospherics/unary_devices.dmi' + icon = 'icons/obj/atmospherics/components/unary_devices.dmi' icon_state = "connector_map" //Only for mapping purposes, so mappers can see direction can_unwrench = 1 var/obj/machinery/portable_atmospherics/connected_device diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index e06e0658a89..bf8a767db29 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -1,5 +1,5 @@ /obj/machinery/atmospherics/components/unary - icon = 'icons/obj/atmospherics/unary_devices.dmi' + icon = 'icons/obj/atmospherics/components/unary_devices.dmi' dir = SOUTH initialize_directions = SOUTH layer = TURF_LAYER+0.1 @@ -35,7 +35,7 @@ Housekeeping and pipe network stuff below if(node) node.disconnect(src) node = null - nullifyPipenet(parent) + nullifyPipenet(parents["p1"]) atmosinit() initialize() if(node) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 530620bcb86..4e9e04f8958 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -1,4 +1,8 @@ -/obj/machinery/atmospherics/unary/vent_pump +#define EXT_BOUND 1 +#define INT_BOUND 2 +#define NO_BOUND 3 + +/obj/machinery/atmospherics/components/unary/vent_pump icon_state = "vent_map" name = "air vent" @@ -18,10 +22,10 @@ var/external_pressure_bound = ONE_ATMOSPHERE var/internal_pressure_bound = 0 - var/pressure_checks = 1 //TODO: make these defines - //1: Do not pass external_pressure_bound - //2: Do not pass internal_pressure_bound - //3: Do not pass either + var/pressure_checks = 1 + //EXT_BOUND: Do not pass external_pressure_bound + //INT_BOUND: Do not pass internal_pressure_bound + //NO_BOUND: Do not pass either var/frequency = 1439 var/datum/radio_frequency/radio_connection @@ -29,18 +33,18 @@ var/radio_filter_out var/radio_filter_in -/obj/machinery/atmospherics/unary/vent_pump/on +/obj/machinery/atmospherics/components/unary/vent_pump/on on = 1 icon_state = "vent_out" -/obj/machinery/atmospherics/unary/vent_pump/siphon +/obj/machinery/atmospherics/components/unary/vent_pump/siphon pump_direction = 0 -/obj/machinery/atmospherics/unary/vent_pump/siphon/on +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on on = 1 icon_state = "vent_in" -/obj/machinery/atmospherics/unary/vent_pump/New() +/obj/machinery/atmospherics/components/unary/vent_pump/New() ..() initial_loc = get_area(loc) if (initial_loc.master) @@ -54,24 +58,24 @@ src.initialize() src.broadcast_status() -/obj/machinery/atmospherics/unary/vent_pump/Destroy() +/obj/machinery/atmospherics/components/unary/vent_pump/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() -/obj/machinery/atmospherics/unary/vent_pump/high_volume +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume name = "large air vent" power_channel = EQUIP -/obj/machinery/atmospherics/unary/vent_pump/high_volume/New() +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/New() ..() var/datum/gas_mixture/air_contents = airs["a1"] air_contents.volume = 1000 -/obj/machinery/atmospherics/unary/vent_pump/update_icon_nopipes() +/obj/machinery/atmospherics/components/unary/vent_pump/update_icon_nopipes() overlays.Cut() if(showpipe) - overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "vent_cap", initialize_directions) + overlays += getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "vent_cap", initialize_directions) if(welded) icon_state = "vent_welded" @@ -86,7 +90,7 @@ else icon_state = "vent_in" -/obj/machinery/atmospherics/unary/vent_pump/process_atmos() +/obj/machinery/atmospherics/components/unary/vent_pump/process_atmos() ..() if(stat & (NOPOWER|BROKEN)) return @@ -106,9 +110,9 @@ if(pump_direction) //internal -> external var/pressure_delta = 10000 - if(pressure_checks&1) + if(pressure_checks&EXT_BOUND) pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure)) - if(pressure_checks&2) + if(pressure_checks&INT_BOUND) pressure_delta = min(pressure_delta, (air_contents.return_pressure() - internal_pressure_bound)) if(pressure_delta > 0) @@ -122,9 +126,9 @@ else //external -> internal var/pressure_delta = 10000 - if(pressure_checks&1) + if(pressure_checks&EXT_BOUND) pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound)) - if(pressure_checks&2) + if(pressure_checks&INT_BOUND) pressure_delta = min(pressure_delta, (internal_pressure_bound - air_contents.return_pressure())) if(pressure_delta > 0) @@ -143,13 +147,13 @@ //Radio remote control -/obj/machinery/atmospherics/unary/vent_pump/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/components/unary/vent_pump/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency if(frequency) radio_connection = radio_controller.add_object(src, frequency,radio_filter_in) -/obj/machinery/atmospherics/unary/vent_pump/proc/broadcast_status() +/obj/machinery/atmospherics/components/unary/vent_pump/proc/broadcast_status() if(!radio_connection) return 0 @@ -181,30 +185,30 @@ return 1 -/obj/machinery/atmospherics/unary/vent_pump/atmosinit() +/obj/machinery/atmospherics/components/unary/vent_pump/atmosinit() //some vents work his own spesial way radio_filter_in = frequency==1439?(RADIO_FROM_AIRALARM):null radio_filter_out = frequency==1439?(RADIO_TO_AIRALARM):null if(frequency) set_frequency(frequency) ..() -/obj/machinery/atmospherics/unary/vent_pump/initialize() +/obj/machinery/atmospherics/components/unary/vent_pump/initialize() ..() broadcast_status() -/obj/machinery/atmospherics/unary/vent_pump/receive_signal(datum/signal/signal) +/obj/machinery/atmospherics/components/unary/vent_pump/receive_signal(datum/signal/signal) if(stat & (NOPOWER|BROKEN)) return - //log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/unary/vent_pump/receive_signal([signal.debug_print()])") + //log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/components/unary/vent_pump/receive_signal([signal.debug_print()])") if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command")) return 0 if("purge" in signal.data) - pressure_checks &= ~1 + pressure_checks &= ~EXT_BOUND pump_direction = 0 if("stabalize" in signal.data) - pressure_checks |= 1 + pressure_checks |= EXT_BOUND pump_direction = 1 if("power" in signal.data) @@ -217,7 +221,7 @@ pressure_checks = text2num(signal.data["checks"]) if("checks_toggle" in signal.data) - pressure_checks = (pressure_checks?0:3) + pressure_checks = (pressure_checks?0:NO_BOUND) if("direction" in signal.data) pump_direction = text2num(signal.data["direction"]) @@ -265,7 +269,7 @@ update_icon() return -/obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user, params) +/obj/machinery/atmospherics/components/unary/vent_pump/attackby(obj/item/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)&& !(stat & NOPOWER) && on) user << "You cannot unwrench this [src], turn it off first!" return 1 @@ -289,24 +293,24 @@ else return ..() -/obj/machinery/atmospherics/unary/vent_pump/examine(mob/user) +/obj/machinery/atmospherics/components/unary/vent_pump/examine(mob/user) ..() if(welded) user << "It seems welded shut." -/obj/machinery/atmospherics/unary/vent_pump/power_change() +/obj/machinery/atmospherics/components/unary/vent_pump/power_change() if(powered(power_channel)) stat &= ~NOPOWER else stat |= NOPOWER update_icon_nopipes() -/obj/machinery/atmospherics/unary/vent_pump/Destroy() +/obj/machinery/atmospherics/components/unary/vent_pump/Destroy() if(initial_loc) initial_loc.air_vent_info -= id_tag initial_loc.air_vent_names -= id_tag ..() -/obj/machinery/atmospherics/unary/vent_pump/can_crawl_through() +/obj/machinery/atmospherics/components/unary/vent_pump/can_crawl_through() return !welded diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index a984cd46aa2..7be2de5d991 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -1,4 +1,4 @@ -/obj/machinery/atmospherics/unary/vent_scrubber +/obj/machinery/atmospherics/components/unary/vent_scrubber icon_state = "scrub_map" name = "air scrubber" @@ -28,7 +28,7 @@ var/radio_filter_in -/obj/machinery/atmospherics/unary/vent_scrubber/New() +/obj/machinery/atmospherics/components/unary/vent_scrubber/New() ..() initial_loc = get_area(loc) if (initial_loc.master) @@ -42,15 +42,15 @@ src.initialize() src.broadcast_status() -/obj/machinery/atmospherics/unary/vent_scrubber/Destroy() +/obj/machinery/atmospherics/components/unary/vent_scrubber/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() -/obj/machinery/atmospherics/unary/vent_scrubber/update_icon_nopipes() +/obj/machinery/atmospherics/components/unary/vent_scrubber/update_icon_nopipes() overlays.Cut() if(showpipe) - overlays += getpipeimage('icons/obj/atmospherics/unary_devices.dmi', "scrub_cap", initialize_directions) + overlays += getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions) if(welded) icon_state = "scrub_welded" @@ -65,12 +65,12 @@ else icon_state = "scrub_purge" -/obj/machinery/atmospherics/unary/vent_scrubber/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, radio_filter_in) -/obj/machinery/atmospherics/unary/vent_scrubber/proc/broadcast_status() +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/broadcast_status() if(!radio_connection) return 0 @@ -99,18 +99,18 @@ return 1 -/obj/machinery/atmospherics/unary/vent_scrubber/atmosinit() +/obj/machinery/atmospherics/components/unary/vent_scrubber/atmosinit() radio_filter_in = frequency==initial(frequency)?(RADIO_FROM_AIRALARM):null radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null if (frequency) set_frequency(frequency) ..() -/obj/machinery/atmospherics/unary/vent_scrubber/initialize() +/obj/machinery/atmospherics/components/unary/vent_scrubber/initialize() ..() broadcast_status() -/obj/machinery/atmospherics/unary/vent_scrubber/process_atmos() +/obj/machinery/atmospherics/components/unary/vent_scrubber/process_atmos() ..() if(stat & (NOPOWER|BROKEN)) return @@ -173,7 +173,7 @@ return 1 -/obj/machinery/atmospherics/unary/vent_scrubber/receive_signal(datum/signal/signal) +/obj/machinery/atmospherics/components/unary/vent_scrubber/receive_signal(datum/signal/signal) if(stat & (NOPOWER|BROKEN)) return if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command")) @@ -238,14 +238,14 @@ update_icon() return -/obj/machinery/atmospherics/unary/vent_scrubber/power_change() +/obj/machinery/atmospherics/components/unary/vent_scrubber/power_change() if(powered(power_channel)) stat &= ~NOPOWER else stat |= NOPOWER update_icon_nopipes() -/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/components/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) @@ -272,12 +272,12 @@ return ..() -/obj/machinery/atmospherics/unary/vent_scrubber/Destroy() +/obj/machinery/atmospherics/components/unary/vent_scrubber/Destroy() if(initial_loc) initial_loc.air_scrub_info -= id_tag initial_loc.air_scrub_names -= id_tag ..() -/obj/machinery/atmospherics/unary/vent_scrubber/can_crawl_through() +/obj/machinery/atmospherics/components/unary/vent_scrubber/can_crawl_through() return !welded diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index e9a36b1fe7b..02ad35248d5 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -124,7 +124,6 @@ var/pipenetwarnings = 10 for(var/I = 1; I <= parents.len; I++) if(parents["p[I]"] == P) P.addMember(A, src) - parents["p[I]"] = P break @@ -211,11 +210,11 @@ var/pipenetwarnings = 10 var/datum/pipeline/P = PL[i] GL += P.air GL += P.other_airs - for(var/obj/machinery/atmospherics/binary/valve/V in P.other_atmosmch) + for(var/obj/machinery/atmospherics/components/binary/valve/V in P.other_atmosmch) if(V.open) PL |= V.parents["p1"] PL |= V.parents["p2"] - for(var/obj/machinery/atmospherics/unary/portables_connector/C in P.other_atmosmch) + for(var/obj/machinery/atmospherics/components/unary/portables_connector/C in P.other_atmosmch) if(C.connected_device) GL += C.portableConnectorReturnAir() diff --git a/code/ATMOSPHERICS/pipes/pipes.dm b/code/ATMOSPHERICS/pipes/pipes.dm index 545fa19bfc8..f0ca8f8e244 100644 --- a/code/ATMOSPHERICS/pipes/pipes.dm +++ b/code/ATMOSPHERICS/pipes/pipes.dm @@ -4,6 +4,7 @@ layer = 2.4 //under wires with their 2.44 use_power = 0 can_unwrench = 1 + var/datum/pipeline/parent = null //Buckling can_buckle = 1 @@ -42,6 +43,9 @@ return ..() +/obj/machinery/atmospherics/pipe/returnPipenet() + return parent + /obj/machinery/atmospherics/pipe/setPipenet(datum/pipeline/P) parent = P diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index d3d0057b928..38cc653cda8 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -226,10 +226,10 @@ var/datum/radio_frequency/gas_freq = radio_controller.return_frequency(1441) var/list/devices = air_freq.devices["_default"] devices |= gas_freq.devices["_default"] - for(var/obj/machinery/atmospherics/unary/vent_pump/U in devices) + for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices) var/list/text = text2list(U.id_tag, "_") IO |= text[1] - for(var/obj/machinery/atmospherics/unary/outlet_injector/U in devices) + for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices) var/list/text = text2list(U.id, "_") IO |= text[1] if(!IO.len) @@ -254,10 +254,10 @@ set_frequency(frequency) - for(var/obj/machinery/atmospherics/unary/outlet_injector/U in devices) + for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices) U.broadcast_status() - for(var/obj/machinery/atmospherics/unary/vent_pump/U in devices) + for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices) U.broadcast_status() /obj/machinery/computer/general_air_control/large_tank_control/return_text() diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 85b57fb7413..9c63c99b73e 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -3,7 +3,7 @@ use_power = 0 var/datum/gas_mixture/air_contents = new - var/obj/machinery/atmospherics/unary/portables_connector/connected_port + var/obj/machinery/atmospherics/components/unary/portables_connector/connected_port var/obj/item/weapon/tank/holding var/volume = 0 @@ -35,7 +35,7 @@ /obj/machinery/portable_atmospherics/update_icon() return null -/obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/unary/portables_connector/new_port) +/obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/components/unary/portables_connector/new_port) //Make sure not already connected to something else if(connected_port || !new_port || new_port.connected_device) return 0 @@ -47,7 +47,8 @@ //Perform the connection connected_port = new_port connected_port.connected_device = src - connected_port.parent.reconcile_air() + var/datum/pipeline/connected_port_parent = connected_port.parents["p1"] + connected_port_parent.reconcile_air() anchored = 1 //Prevent movement return 1 @@ -83,7 +84,7 @@ update_icon() return else - var/obj/machinery/atmospherics/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/unary/portables_connector) in loc + var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/components/unary/portables_connector) in loc if(possible_port) if(connect(possible_port)) user << "You connect [name] to the port." diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm index ca64569958d..7b3081092f1 100644 --- a/code/game/machinery/atmoalter/zvent.dm +++ b/code/game/machinery/atmoalter/zvent.dm @@ -1,7 +1,7 @@ /obj/machinery/zvent name = "interfloor air transfer system" - icon = 'icons/obj/atmospherics/unary_devices.dmi' + icon = 'icons/obj/atmospherics/components/unary_devices.dmi' icon_state = "vent_map" density = 0 anchored=1 diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 6d83a84185d..8c9043ed07c 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -346,7 +346,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/cryo_tube name = "circuit board (Cryotube)" - build_path = /obj/machinery/atmospherics/unary/cryo_cell + build_path = /obj/machinery/atmospherics/components/unary/cryo_cell board_type = "machine" origin_tech = "programming=4;biotech=3;engineering=4" req_components = list( @@ -357,7 +357,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/thermomachine name = "circuit board (Freezer)" desc = "Use screwdriver to switch between heating and cooling modes." - build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer + build_path = /obj/machinery/atmospherics/components/unary/cold_sink/freezer board_type = "machine" origin_tech = "programming=3;plasmatech=3" req_components = list( @@ -368,12 +368,12 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/thermomachine/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) - if(build_path == /obj/machinery/atmospherics/unary/cold_sink/freezer) - build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater + if(build_path == /obj/machinery/atmospherics/components/unary/cold_sink/freezer) + build_path = /obj/machinery/atmospherics/components/unary/heat_reservoir/heater name = "circuit board (Heater)" user << "You set the board to heating." else - build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer + build_path = /obj/machinery/atmospherics/components/unary/cold_sink/freezer name = "circuit board (Freezer)" user << "You set the board to cooling." diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 7fb0d411b64..2feee4f8561 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -63,34 +63,34 @@ Buildable meters src.pipe_type = PIPE_HE_STRAIGHT + is_bent else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple)) src.pipe_type = PIPE_SIMPLE_STRAIGHT + is_bent - else if(istype(make_from, /obj/machinery/atmospherics/unary/portables_connector)) + else if(istype(make_from, /obj/machinery/atmospherics/components/unary/portables_connector)) src.pipe_type = PIPE_CONNECTOR else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold)) src.pipe_type = PIPE_MANIFOLD - else if(istype(make_from, /obj/machinery/atmospherics/unary/vent_pump)) + else if(istype(make_from, /obj/machinery/atmospherics/components/unary/vent_pump)) src.pipe_type = PIPE_UVENT - else if(istype(make_from, /obj/machinery/atmospherics/binary/valve/digital)) + else if(istype(make_from, /obj/machinery/atmospherics/components/binary/valve/digital)) src.pipe_type = PIPE_DVALVE - else if(istype(make_from, /obj/machinery/atmospherics/binary/valve)) + else if(istype(make_from, /obj/machinery/atmospherics/components/binary/valve)) src.pipe_type = PIPE_MVALVE - else if(istype(make_from, /obj/machinery/atmospherics/binary/pump)) + else if(istype(make_from, /obj/machinery/atmospherics/components/binary/pump)) src.pipe_type = PIPE_PUMP - else if(istype(make_from, /obj/machinery/atmospherics/trinary/filter)) + else if(istype(make_from, /obj/machinery/atmospherics/components/trinary/filter)) src.pipe_type = PIPE_GAS_FILTER - else if(istype(make_from, /obj/machinery/atmospherics/trinary/mixer)) + else if(istype(make_from, /obj/machinery/atmospherics/components/trinary/mixer)) src.pipe_type = PIPE_GAS_MIXER - else if(istype(make_from, /obj/machinery/atmospherics/unary/vent_scrubber)) + else if(istype(make_from, /obj/machinery/atmospherics/components/unary/vent_scrubber)) src.pipe_type = PIPE_SCRUBBER - else if(istype(make_from, /obj/machinery/atmospherics/binary/passive_gate)) + else if(istype(make_from, /obj/machinery/atmospherics/components/binary/passive_gate)) src.pipe_type = PIPE_PASSIVE_GATE - else if(istype(make_from, /obj/machinery/atmospherics/binary/volume_pump)) + else if(istype(make_from, /obj/machinery/atmospherics/components/binary/volume_pump)) src.pipe_type = PIPE_VOLUME_PUMP - else if(istype(make_from, /obj/machinery/atmospherics/unary/heat_exchanger)) + else if(istype(make_from, /obj/machinery/atmospherics/components/unary/heat_exchanger)) src.pipe_type = PIPE_HEAT_EXCHANGE else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w)) src.pipe_type = PIPE_4WAYMANIFOLD - var/obj/machinery/atmospherics/trinary/triP = make_from + var/obj/machinery/atmospherics/components/trinary/triP = make_from if(istype(triP) && triP.flipped) src.flipped = 1 src.dir = turn(src.dir, -45) @@ -316,7 +316,7 @@ var/global/list/pipeID2State = list( P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_CONNECTOR) - var/obj/machinery/atmospherics/unary/portables_connector/C = new( src.loc ) + var/obj/machinery/atmospherics/components/unary/portables_connector/C = new( src.loc ) if (pipename) C.name = pipename C.construction(dir, pipe_dir, pipe_type, color) @@ -335,56 +335,56 @@ var/global/list/pipeID2State = list( P.construction(dir, get_pdir(), pipe_type, color) if(PIPE_UVENT) - var/obj/machinery/atmospherics/unary/vent_pump/V = new( src.loc ) + var/obj/machinery/atmospherics/components/unary/vent_pump/V = new( src.loc ) V.construction(dir, pipe_dir, pipe_type, color) if(PIPE_MVALVE) - var/obj/machinery/atmospherics/binary/valve/V = new(src.loc) + var/obj/machinery/atmospherics/components/binary/valve/V = new(src.loc) if (pipename) V.name = pipename V.construction(dir, get_pdir(), pipe_type, color) if(PIPE_DVALVE) - var/obj/machinery/atmospherics/binary/valve/digital/V = new(src.loc) + var/obj/machinery/atmospherics/components/binary/valve/digital/V = new(src.loc) if (pipename) V.name = pipename V.construction(dir, get_pdir(), pipe_type, color) if(PIPE_PUMP) - var/obj/machinery/atmospherics/binary/pump/P = new(src.loc) + var/obj/machinery/atmospherics/components/binary/pump/P = new(src.loc) P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) - var/obj/machinery/atmospherics/trinary/P + var/obj/machinery/atmospherics/components/trinary/P if(pipe_type == PIPE_GAS_FILTER) - P = new /obj/machinery/atmospherics/trinary/filter(src.loc) + P = new /obj/machinery/atmospherics/components/trinary/filter(src.loc) else if(pipe_type == PIPE_GAS_MIXER) - P = new /obj/machinery/atmospherics/trinary/mixer(src.loc) + P = new /obj/machinery/atmospherics/components/trinary/mixer(src.loc) P.flipped = flipped if (pipename) P.name = pipename P.construction(unflip(dir), pipe_dir, pipe_type, color) if(PIPE_SCRUBBER) - var/obj/machinery/atmospherics/unary/vent_scrubber/S = new(src.loc) + var/obj/machinery/atmospherics/components/unary/vent_scrubber/S = new(src.loc) if (pipename) S.name = pipename S.construction(dir, pipe_dir, pipe_type, color) if(PIPE_PASSIVE_GATE) - var/obj/machinery/atmospherics/binary/passive_gate/P = new(src.loc) + var/obj/machinery/atmospherics/components/binary/passive_gate/P = new(src.loc) if (pipename) P.name = pipename P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_VOLUME_PUMP) - var/obj/machinery/atmospherics/binary/volume_pump/P = new(src.loc) + var/obj/machinery/atmospherics/components/binary/volume_pump/P = new(src.loc) if (pipename) P.name = pipename P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_HEAT_EXCHANGE) - var/obj/machinery/atmospherics/unary/heat_exchanger/C = new( src.loc ) + var/obj/machinery/atmospherics/components/unary/heat_exchanger/C = new( src.loc ) if (pipename) C.name = pipename C.construction(dir, pipe_dir, pipe_type, color) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 8814dc6c64e..31f6baf5409 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -46,7 +46,7 @@ var/internal_tank_valve = ONE_ATMOSPHERE var/obj/machinery/portable_atmospherics/canister/internal_tank var/datum/gas_mixture/cabin_air - var/obj/machinery/atmospherics/unary/portables_connector/connected_port = null + var/obj/machinery/atmospherics/components/unary/portables_connector/connected_port = null var/obj/item/device/radio/radio = null @@ -900,7 +900,7 @@ . = t_air.return_temperature() return -/obj/mecha/proc/connect(obj/machinery/atmospherics/unary/portables_connector/new_port) +/obj/mecha/proc/connect(obj/machinery/atmospherics/components/unary/portables_connector/new_port) //Make sure not already connected to something else if(connected_port || !new_port || new_port.connected_device) return 0 @@ -912,7 +912,8 @@ //Perform the connection connected_port = new_port connected_port.connected_device = src - connected_port.parent.reconcile_air() + var/datum/pipeline/connected_port_parent = connected_port.parents["p1"] + connected_port_parent.reconcile_air() log_message("Connected to gas port.") return 1 @@ -943,7 +944,7 @@ if(!can_use(usr)) return - var/obj/machinery/atmospherics/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/unary/portables_connector/) in loc + var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/components/unary/portables_connector/) in loc if(possible_port) if(connect(possible_port)) src.occupant_message("[name] connects to the port.") diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 50ebfc1f37a..f27b39312fe 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -102,7 +102,7 @@ health = 3 var/amount_grown = 0 var/grow_as = null - var/obj/machinery/atmospherics/unary/vent_pump/entry_vent + var/obj/machinery/atmospherics/components/unary/vent_pump/entry_vent var/travelling_in_vent = 0 var/player_spiders = 0 @@ -133,12 +133,13 @@ else if(entry_vent) if(get_dist(src, entry_vent) <= 1) var/list/vents = list() - for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in entry_vent.parent.other_atmosmch) + var/datum/pipeline/entry_vent_parent = entry_vent.parents["p1"] + for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in entry_vent_parent.other_atmosmch) vents.Add(temp_vent) if(!vents.len) entry_vent = null return - var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents) + var/obj/machinery/atmospherics/components/unary/vent_pump/exit_vent = pick(vents) if(prob(50)) visible_message("[src] scrambles into the ventillation ducts!", \ "You hear something scampering through the ventilation ducts.") @@ -177,7 +178,7 @@ src.visible_message("\The [src] skitters[pick(" away"," around","")].") else if(prob(10)) //ventcrawl! - for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) + for(var/obj/machinery/atmospherics/components/unary/vent_pump/v in view(7,src)) if(!v.welded) entry_vent = v walk_to(src, entry_vent, 1) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index f18a053d9ba..131aa4596fe 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -195,9 +195,9 @@ M.name = replacetext(M.name,oldtitle,title) for(var/obj/machinery/power/apc/M in RA) M.name = replacetext(M.name,oldtitle,title) - for(var/obj/machinery/atmospherics/unary/vent_scrubber/M in RA) + for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/M in RA) M.name = replacetext(M.name,oldtitle,title) - for(var/obj/machinery/atmospherics/unary/vent_pump/M in RA) + for(var/obj/machinery/atmospherics/components/unary/vent_pump/M in RA) M.name = replacetext(M.name,oldtitle,title) for(var/obj/machinery/door/M in RA) M.name = replacetext(M.name,oldtitle,title) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 08808afdc04..4c7241d08e7 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -341,7 +341,7 @@ if(G.toxins) G.nitrogen += (G.toxins) G.toxins = 0 - for(var/obj/machinery/atmospherics/unary/vent_pump/V in T) + for(var/obj/machinery/atmospherics/components/unary/vent_pump/V in T) V.welded = 1 V.update_icon() V.visible_message("[V] was frozen shut!") diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index 6334d129400..4ed1f4c0e8a 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -27,9 +27,10 @@ /datum/round_event/alien_infestation/start() var/list/vents = list() - for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world) + for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in world) if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded) - if(temp_vent.parent.other_atmosmch.len > 20) //Stops Aliens getting stuck in small networks. See: Security, Virology + var/datum/pipeline/temp_vent_parent = temp_vent.parents["p1"] + if(temp_vent_parent.other_atmosmch.len > 20) //Stops Aliens getting stuck in small networks. See: Security, Virology vents += temp_vent var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET) diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 2d2899250ba..771ade0995a 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -20,9 +20,10 @@ /datum/round_event/spider_infestation/start() var/list/vents = list() - for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world) + for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in world) if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded) - if(temp_vent.parent.other_atmosmch.len > 20) + var/datum/pipeline/temp_vent_parent = temp_vent.parents["p1"] + if(temp_vent_parent.other_atmosmch.len > 20) vents += temp_vent while((spawncount >= 1) && vents.len) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index d535c7f1b4a..6bb3a5abab4 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -16,7 +16,7 @@ /datum/round_event/vent_clog/setup() endWhen = rand(25, 100) - for(var/obj/machinery/atmospherics/unary/vent_scrubber/temp_vent in machines) + for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in machines) if(temp_vent.loc.z == ZLEVEL_STATION) var/datum/pipeline/temp_vent_parent = temp_vent.parents["p1"] if(temp_vent_parent.other_atmosmch.len > 20) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 388da344db4..87750456a62 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -123,7 +123,7 @@ Gunshots/explosions/opening doors/less rare audio (done) /obj/effect/hallucination/fake_flood/New(loc,var/mob/living/carbon/T) ..() target = T - for(var/obj/machinery/atmospherics/unary/vent_pump/U in orange(7,target)) + for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in orange(7,target)) if(!U.welded) src.loc = U.loc break @@ -220,12 +220,12 @@ Gunshots/explosions/opening doors/less rare audio (done) /obj/effect/hallucination/xeno_attack //Xeno crawls from nearby vent,jumps at you, and goes back in - var/obj/machinery/atmospherics/unary/vent_pump/pump = null + var/obj/machinery/atmospherics/components/unary/vent_pump/pump = null var/obj/effect/hallucination/simple/xeno/xeno = null /obj/effect/hallucination/xeno_attack/New(loc,var/mob/living/carbon/T) target = T - for(var/obj/machinery/atmospherics/unary/vent_pump/U in orange(7,target)) + for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in orange(7,target)) if(!U.welded) pump = U break diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 33961e8fd0b..43772593e9e 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1139,7 +1139,7 @@ /datum/species/proc/breathe(var/mob/living/carbon/human/H) if(H.reagents.has_reagent("lexorin")) return - if(istype(H.loc, /obj/machinery/atmospherics/unary/cryo_cell)) return + if(istype(H.loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) return var/datum/gas_mixture/environment = H.loc.return_air() var/datum/gas_mixture/breath @@ -1409,7 +1409,7 @@ H.apply_damage(HEAT_DAMAGE_LEVEL_2*heatmod, BURN) else if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !(mutations_list[COLDRES] in H.dna.mutations)) - if(!istype(H.loc, /obj/machinery/atmospherics/unary/cryo_cell)) + if(!istype(H.loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) switch(H.bodytemperature) if(200 to 260) H.throw_alert("temp","cold",1) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index b019a52ab44..fc74ade712d 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -32,7 +32,7 @@ /mob/living/carbon/proc/breathe() if(reagents.has_reagent("lexorin")) return - if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) + if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) return var/datum/gas_mixture/environment diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index bec6d68d0ae..112fe73cc82 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -89,7 +89,7 @@ adjustFireLoss(3) else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) - if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) + if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) switch(bodytemperature) if(200 to 260) throw_alert("temp","cold",1) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a91cda31fbe..74ecd2ffa6a 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -822,8 +822,8 @@ Sorry Giacom. Please don't be mad :( var/turf/heat_turf = get_turf(src) loc_temp = heat_turf.temperature - else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) - var/obj/machinery/atmospherics/unary/cryo_cell/C = loc + else if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) + var/obj/machinery/atmospherics/components/unary/cryo_cell/C = loc var/datum/gas_mixture/C_air_contents = C.airs[1] if(C_air_contents.total_moles() < 10) diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index 5df785e016c..e2c487ce665 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -1,5 +1,5 @@ -var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, /obj/machinery/atmospherics/unary/vent_scrubber) +var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/components/unary/vent_pump, /obj/machinery/atmospherics/components/unary/vent_scrubber) //VENTCRAWLING @@ -13,7 +13,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, src << "You can't vent crawl while you're stunned!" return - var/obj/machinery/atmospherics/unary/vent_found + var/obj/machinery/atmospherics/components/unary/vent_found if(A) @@ -34,7 +34,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, if(vent_found) - if(vent_found.parent && (vent_found.parent.members.len || vent_found.parent.other_atmosmch)) + var/datum/pipeline/vent_found_parent = vent_found.parents["p1"] + if(vent_found_parent && (vent_found_parent.members.len || vent_found_parent.other_atmosmch)) visible_message("[src] begins climbing into the ventilation system..." ,"You begin climbing into the ventilation system...") if(!do_after(src, 25, target = vent_found)) @@ -62,12 +63,13 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, src << "This ventilation duct is not connected to anything!" -/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine) +/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/components/starting_machine) if(!istype(starting_machine) || !starting_machine.returnPipenet()) return var/list/totalMembers = list() - totalMembers |= starting_machine.parent.members - totalMembers |= starting_machine.parent.other_atmosmch + var/datum/pipeline/starting_machine_parent = starting_machine.parents["p1"] + totalMembers |= starting_machine_parent.members + totalMembers |= starting_machine_parent.other_atmosmch for(var/obj/machinery/atmospherics/A in totalMembers) if(!A.pipe_vision_img) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 0f8711f2fef..14eaf43f0a0 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -15,8 +15,8 @@ density = 1 use_power = 0 - var/obj/machinery/atmospherics/binary/circulator/circ1 - var/obj/machinery/atmospherics/binary/circulator/circ2 + var/obj/machinery/atmospherics/components/binary/circulator/circ1 + var/obj/machinery/atmospherics/components/binary/circulator/circ2 var/lastgen = 0 var/lastgenlev = -1 @@ -28,8 +28,8 @@ circ1 = null circ2 = null - circ1 = locate(/obj/machinery/atmospherics/binary/circulator) in get_step(src,WEST) - circ2 = locate(/obj/machinery/atmospherics/binary/circulator) in get_step(src,EAST) + circ1 = locate(/obj/machinery/atmospherics/components/binary/circulator) in get_step(src,WEST) + circ2 = locate(/obj/machinery/atmospherics/components/binary/circulator) in get_step(src,EAST) connect_to_network() if(circ1) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 149a5c5c365..678b01b6f2f 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -20,7 +20,7 @@ /obj/structure/closet, /obj/structure/sink, /obj/item/weapon/storage, - /obj/machinery/atmospherics/unary/cryo_cell, + /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/item/weapon/grenade/chem_grenade, /obj/machinery/bot/medbot, /obj/machinery/computer/pandemic, diff --git a/icons/obj/atmospherics/binary_devices.dmi b/icons/obj/atmospherics/binary_devices.dmi deleted file mode 100644 index bdf19ecbb8467a1908d6b3e65128af5858b0300b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22000 zcmeFZ2{@E*|2}*VA*qn0vZjR+k}M&kqSA)!Sqs_seVtK>2$d{l8Bt{4_hm%L7P5sH zOV+{I1~X=PuTeeE@A*H^d;EUy@qds1alFUzc6^U7WA3@{`?{{rb$-tC{Cw_tu73CW zzCB0xKoGP~^@j322%-bO(m}f!!H;#XULpj+6nwPw+>|X`&0MUV+^iiPAjm5rG3v9! zlXH8Yb+%~gEk@sYDuI76>gp}&PmChJ zaKE&oUsa|5aG_~5+~-H5iuFZgvrwniv)d$r@P4rBq zEI-8JKDehTM{cz}Oye2+=(!(v+b5@`vc4j0xm=#-!JDt_#^}b|GDm!^hnQPVnJXAf zm-a=cnJgxfA790xEPf#9?;qrP&vD#sqQ@qsxz}#o>88NNv~_Of-L;?gjNIgcAOT2K z`LdQ*!orBZm)2B`I0@IrH8GaWEC%Sz1sqKp>wjL%tL#iU=t z7nk%MR$E;8u6U(2E!d%IvHMB){!sD81NkaXT$oD_WxbYZ7}a9A!{%OQ@IXkA{gfn@ zU{-j@_LS|YWsYzEPfVw~GsCF{Kb$`Ltv=d4FIGcKJE-S&qMUZkYO6?rAHl`V-TlF2 zQ}`?nr>h(pc7rkM)SY`X?Qfrmts%!d|KFPefcy!UnEl*CZKBe z!HqjRZ@%iexXSw>^Na#tWbH|%)w#Jj7}Opo@r3E|(CvSI8iE3qpwJY7!+S&d_6**R z-w+iRHYGE#lPMgDYHwJ7rZBzCRT8K>t)v=s<=6{unf;;lnrIc;+i&64-#*DPYi+c2*rp`Ubb z;!}i|y%Y}1IPgT$m8q`lbc*CvKh`z&Zd~8gvD-IwpYm!G(_Ag?2lJx(pI%jw9G;H| zYJ+=6*g=p3?E9R^mDiVQsfoA~)ty8X`31rIo%p-i8F4wx9&kiC!wpE5{zM&Wdm9FM zmXyGt2;n_RdKCvCrvUvUYikN77rHx5+yY837Q(uI)gLm|*MHk}`77zLK z?vk%GT_7~-H5nckDdoFiXXw&$63iyieScFpcRD;q|JlfNM8FSkIeB)vvAKmWLusel z?QI+C{5N5{`32m~-7r?UGoA4=tXzgpfpgp6ts0)~Q=Q4XU$UoeZqsMoSNibYl>B@) ze}8{SKmntguuOD4uoICtsLLER2dWne+n|Ke2^PjD>e`%>&5^;GnX=xi9|CG!E?cIuRYq1e#CfvmvUXpB9^v`xTX^(Ti~%H& zaw;?Pp_kWTMHFjh=DfiQoIIztQqLm(4sdn`Muanx{$Qc_MOCF3<$ zgCU5jX7Mq=%`JDv)6FgU)2AB<6BTr1U=Oa(d<{WpGnto!^F>}qh+mg?pFjBcb8;66 z=a2JM6-_rBdozHFGFPA%*uLx~UbFt1;#oGF<2hoP2GZi;p<&jRY%0%=H>LIkzuBtNtaYF<&JcyIk{mhlQWoS zm-^wP$9L}3%`zox_vGpPqOL?DdNE}~dlRI?n4X$on$qOol44B)yxR--hqn8-YWey2 zu7NGk<(KYU5BAJ=2QbN=cX^(kd>8U0--Q8-8hLUqarORp#a#oibU0~mwqpL-ctVSq z>!kPS^HmIj>VK>AD%UI2Ef+F==7hBr^r%Pc1pnK}t1qJ!J1$y&o8z|sx%!~?hhMic z9MMe}jM1S_zH^D`$>q6pqy>OYu)DxcJ4O;vC{&vnc9b-k_;aMr*H5qz#dnFn##g+? z)(EeM%I zc9Fp$E(x=n=vj~_UV*D7Ml?OC3;A`NNEVkv37dTAgRFWeLTX9v^QK>qfF0vB@r5}6 zx^;7X+k^)BH?m+|%fe0YDy5xVN~*+T!EClJCZJOL$o;J+bw*g z8wUobOc2artebNAyy(%eV9<4AKfrw2_EKSevWtyO;Q~l6{#}vL)ZAPdT`k%&6D~7a zN859xMMnh3rGtfU|K4rCJM;qMb8S_^SW#-UY*-`Uz~4{5g9!@@ccEvWZI6fi68tk1 zC!wS4AAfy$&T*KJugMoz6YM$a&D0#pAA1IjQ#j$;aY4b?td>wnNXUsVjL49X8&~Z9 zn-_2TKO!w;Xo-hQZEH3)(o5A)P|#)XH|RqKNG}Q7tIfi1&#SDf-*~xnMAC~>^tn6r zB|cW)vuq8EixYvpvv+TP*w|kVaF5{?P_ z+1Jkq$)*TShY9AQ-EAgrwF@_|#iBRTzf4bw%b9qj zU;x7?YH{9I_p>_)H@C10@{*G;D9vDY-KUbjT32np+9H<{3xZ~_1K{|p?&#d~B94=( z)Y2k~;F^UHkt`$!ALc1x8S5mIg&Ed^{1KO7OLI$%l~s5Qz0z`QO6y;PN8Ea&*1v75&AG9@ky4sz(~he|$X?AM7P#Zpz&kg$D7d8eI@&8_)ZXhI zP_^eQn+N@mzTT(0S(*8l4%TOBYtvqhq@tOi0nz9yYb|nB?7jrsY(s)jlv=+*f6tSl z)|+Rsb4S+XvveuX!4Rrmec8s;M-7$V<=ei0BHcYd!%#9yXdqK8U@uGmXke|HHDn*e&i?A@|G5|D zW5FYmTHR&>&X4jb_sqysF|2r9t-h7cKyY{Wz8rxB1qGQaR9FSH%SL^&_Rs=vt}Msi zh7M97&Zge1ooN&EA@FM)R48yc2}$6~9}ebT6Lua0&&VT85H@)JB)&eU3B zVk)X+I>O`UCfC8Sq$P*sD*1^`$x6#lOlPwZDSm~Au;McPa9^GZ76^*LuP2ul9%%FN zX(D}_kEXr-%>k-<_iouno3k|didRYI9`GuE*oj{RLu&aI^<>~RUeVzUPQTvrMzFm=6%YXMA3u0{TLz%DJv@u^HTrGQR* z(C?O(fl!C9YZhEJB$#Pz9dS5OT)rCz2YZ%-rXW!E5ecyJteiV0v!ByWmG5nQ zdCbJ)WNMqqcF{yZ^M}^oaOpSroThm?Pc`$>FWOk-6kheP25WEDd1U zUdq~{xH{#Twk0DKjR9$?_aAch(E_M2i4V;G_tJlY=s&=)j3rrFd)&tM>h3x+1H+He zk$rBSW{Km9JHeE>U+>-v0IEKJqR@0>K?1$~U~@0N`A{GHtzY5Y^EmX<(h(a@4Aon7 zbUSZ57=R}K8Vw4U=)mCLgV^4DdPUDfJE$bJ$N6ZM4y9!}3J)T3V*{Pnqvc&2UJApn7vYwk-$<9@TghD-BFFT7fukn|dt`=g)@;2&Q}h ziW3?abz&DW?IsYO(opwfcCymK{8hIA#jyh?z!4dldm@`t9iO+wpwxCwaTCzCgDRKL z9e#5jZnAThH@oOy?=_cG*47weO&KdK+tpPf1HU{VPo1(Qm(b$?zj|sH81{_``7lqn zk0N^!wNHsLb3e~mU;2qAV%wd5V(=f`D>ywD_Dy`lr?2(h(dv~Jp-_w4Bf82=P7 z30-&3$-c}pyKHR6z{QSd+ITaG{fE1(%=6#JPiaQHAdFPZBs_`Wl~>o-d@}m&?yaTzOSh+}hgO?C?&bdS?&LFE zt?0aXin`h+-VCG|Q*0Z9iUu%OfHh+%#-*j*c*HURrlPStmyS9W4fiLyZTTsZox!_W z+A2Vzf?t6C2_Vx&Ha|&85qwXGu!WGziZW`JLVz_j`CMhnEg;VR1iM$X-^3vstp_fi z28Wqy+lzJ$&c%@;BK9BT_aE^mxWoYzA4aH^I@lTT?ECk739`;~5D=B%KcEGh z%u#agdp?`0Th&e;MV8#TLsXP?^TawTR&9KyWz7GQU=7(ES$Z?)5Lv6#t!8-rq6gNX zRVJ0^+Y z<)U9R@2(rl$`5}HdoLHx6z%NF=r?aZxz2oR{QmJ)cTdlgVE%x^WHPxl5q3-tj#|D~ z2R8PFMO!azZB7@_fWI5}bws#8AQlGH(khOJ+2Y=YNf4nZ<2AcaH z?^~qQM#$){uEDqg!@2pcbb`|zN}474)zdKS^|VXHm`By|+%rO&0gB^0aKP~7@{1QQ zlr-LiIKGQI2}k{g5o@sfBkH*l|3Jidu;ppu92XNS`uC7TuvQHX4PLmK&E;?MxG`{- zG?WV9+F^P-Kz8C74YQOFJfxx8fBypHOQa^JZw-<2O~n3vD`6QYcj7qKptct!30VvO z3ywVZl2E7g%p)v>u;RzbWU5NP$u%FcqjLb6*Yot47t3(O-P=Gf{3gRYyyN%w2kCW) zL45(AS%&cz+StSc8kHTo=b&#*X0!_1zpi`X&c_TsYwUxd1st~F7eiYCZUwJbZ1pN& z8|%AChn!Nm0Vw}N@)Ur*aD1m2NKjBdI0QoG7?jPICHj852qoj93RYFv#8KJJw1Z-~ zv8YQC3cK^Gs)pBvAiJMM*R2%w#Ya~+9n8sVMn5;H68&&YV-7Va8*zqb5Yp1teoNVf z)GjFjQo&~>hT3(8_P#$=ZRc(Ew;tFt5&SN3JdJE`^``PH9dWebw%3vcFl0Ew`@cNsDbxMN)fdzbX@j4%E z36I3a4CUH zj0Vgk{=f{#OnZX4qn%ji(B=OWOpXlKX)BJ-V~yfE+g#f`VAh?YLR`$ljj%v5T*ovN z^}}{<5s>dHo&gA|1BcK}ikGZ3;?t*Mpkaf~2O0b{2A;X!LccO0P?CddBIYb+f`>T_}uF(5N2Q7>kt(DBN9=oyp#0o}CF znQ(`AV*UjPf6tg@{Nz!Zd}>WN9tqG*Fr}S_8G^6bXpkewT=0MN#Y=;AC?OLda0!~9 z_vk(4h@gev+w5OKgH*o8q1E53Tzy!WT0n8>nWvt?il5A(IBq4HAXKyyr8fRQgBWKA z%V~%KV&9;8is}m18mv7xy6ra%XlqB$sX<;I+Bsc2K~)CgVK^Hx8dgTqwKpYef+EZR z9~6HxiE|r`k^ask*qsalAaON=5}GMzyRdSols7RBct^i2k^d@7X`WFsh&e~}+Fg(s zxYw${W&$VG776=bXzFhqEqk1L6oLSt1h=rnm|-Td1yX&yYX*o zFan$kG6jdgAcHc8K1cb@1XoB2BV;xeCSbg?>HzU}w7fT)si$WdSnMBO<9zQ4<~8Mb zcoT6({tt@$6Cg%&Ip3-EhZ#_xXCrEX6VgPqj6BYb^y1ZXv`nA6ZZ@sSG^_lNTrgQ~ z20hZ&nnl1pKhu$CKyGwf`0>Ddg#$PYJK4g;j9e5p0CUp&&&k#Hw@!~x*ztkRH~hb# zo$g6nv>q&Z|Ninwg=;!73Pn;D6%i@Ivz%0(;b5PlmxkVystccRS7d(`RRBwV!+G$j zi8Nq-fH+qA38whfF(P?{4(tnyx;(ur>TKvQxbX31`_fI@iE z41IVHqE*D!#%Z?e*qhkcRPf5en$AxVb>GB<6|%CjQZg~&_wn@|Un6K$jfS8Ch^KAx zDi8FCZyl(v?VKDyJCq%ddC866B=}_(P&^*BiRsQG8usC3w-<`ocfZJ|9C0$FH~qO9 z@u>NxUK?(4;ps~H?K^-qZEk~_Q~*?$-E?i(#UETxSB4)_mn%7V{P^YGzK)q-WCsW; zf0aHHg+$5(B*4tbjyNEInU}EtQY8sMw7#J{Mn}J4`0Ye*q!f1J9pek$Fgo?(er9> z2FfnOeWrILu&AZOJbfS|Q)(4&8|U+E^O;1dgdLhIL)UtWL)fw}98+yqdJiQ((lI+8 zBW4tul*Gp)>m;z)tU4X`6i7Hm`yt6!7Q zt0yM0doufe$xUjJ58lQPYk>I3inZsw}AO$8XNo)Hllcl5SdpAixk7Y{~HUAv7^M1SEus*XqHe)wQ+3rayS_puoXBmo*NOwVFdiLqkxpMjl6!_{r2o=uu}< z_zZMgL>yeRzPiFS-(&H_@ zL0Ol}#7_bUX(03@9G7?!{5J-L6YqzPJUc6Dz7JR{I_DxUgp00kgz(nJV{M{{~i{g z5cKRBV{w^~r)e=r0hyU+0L@f4HqPab6B0Bz++}Zxdfm&SIbTL=d;>FR zfTu1;lvItV+)rct{r*6Ik2i8P+Xb2wnZkfbf=ovSp_X4W+n13;lzcL!N7J$BD0lbh zs6!i}yov1G7AxKiPUSq?^}cuwlpeE>maUhxadTt10DM~CY=+$27QO&cj2B&e_3Bkf zjsuvJBaHUaO50T){My>%9#wcW0^s*)Uiz-l(TJ7FW-PToH_3{0#sXL{lx7*3}YKm8xxY%y=`?p)q6Dr$^Z@xo&};r8A>=%WkOkLOAEJ9t7a9GnnmG(?}w zWW~%MY5LJnZ$l>>sNTBn_s355!vZ|AfliuvO%8wuoY)d}l2^Oh7UcTE^}*hw{g{A? zbBuS|G~mlD@YV;N)?VEdLYZ!I3b=t0UL}XKz9LOypk&2{7&Pi8RG4~g?P{f3OXMa= zGBL68){i%UO#5WEr^_7ZXM6BwfRW;zS__!QyN-+AA9o zFt!)^*goYlm!3Z2+|2u<+&MLe02(lwIdu&K9sMS`y|6iD%gYU{!|&A6%XX>wEw45h zEA+$Rva2_dCt^HqzU7S_f6+L(GMm2e>M%(lh8v6X1DV_6`0;TON9%CpZqOkBcT576 zrDh}O&3UkXBf7?)f5FMjCOkY(YviGN0!Z@cPy3intBor%jm4c#oS?&^xVD&Yo^}Q8 z9(`El2{A}8W!;$(dGF9(#ufBT$JMJ>>E-0*Vezc>lE&Ypqr{8f?{&&j0}|1gHk^}e zyJrW=%Hm6>a4TM3dm(m>cRwKYA!W7CVc&!VUCskmbiSMB;XV&ph2_y4sT0S({d+C$ zYsCO;Ec(;09Rq{rO>ids)^DA3JDToyrTNz^W8KV}Gx5s9zdZ5nEv$f25d$1B5v*)prND-x$lLzwIg$oyw^YU10YHCUk)z7SD$oy1~Eb3I` z26$kyOZp!cinuk7&g$a)^|?;2v7r(8*J-ZL>a2#_s`UOc;=HcZzRnpkdT|)FJ;(yZV%BvbmyqzDA~;IT zMo2fk^q?Pe^xhMo!0?7Hyhi5Z_BrcepLJL}XgBCoSbH(0-(;Pq{47{a@BGP+?zJi^ zldo&h(fo9x*U5FApd{U8VCPSNXfZHnTc5gXv#gjByB!z+zbOROuxU`kcK%jKp~P^H zH>)PQ$sM&Hg?8yt&6iN^hrf?9bd^t^a^s=wTk@Yqq;0busqpPSYiOWIhiD5g{iUs= zlQQ**KRP;kxlAEwb=76dK=JeXT+cYjJ%AM`f&2_w{y4!Z!AlJ^-`KP3=7l!?3ZSiK z&HPO$mA`s78aCn}LlQ;3ploL><06TYh(c98&7UC+W$t5d!OQ7 zmbA9sEH+#kFku=e!lmw0)y|nU?cFkPD6XaqVMj2lEmq{?*xVY$?9yr0a9L90euXvu z&7s#^i%Tk0mVuZ7Y$wKMe3Kkb#3ol)^MLtD#UpHrDX1Un)E*q@ySbFMQ=c#!#4;XyFqU6?Qwz@8 z;{btyBsED8A2_B+RHVA1wHAN%9 z?|I+9v(EJ>#mJFwd14)DYiT3L?hx zZ3W`iK4Tue@HBT0`xZ0u@e&@q+58iCJz{^&&bw`q%M*2LR`<*5V*nD}qpb(|7H>?F zYaU=xrKAS(;jN7@Jx`q|QE$S1YB4twoM>gD&Ia80sgdBXUoVBp7bLGgC?0WckD;Z= z>!h934bg0HXjW4rZ(%eXF^uLH#|v`{fT`~10B&J zqEsg|jqFiZ_})Cc(kXr6tWW;!z~JD5$1}i(KfqL1+%L7$yz;g-CH96TAfB6l{75% z>C>mKbo1;O7Or<+gCwl#ufrmtsiLm(CJHMO^NnEHZz6zb6IwPquI|ujt=Apkn}Fw1 zbt6*=Ww=6${!1PDa|(WR@S&2!x}9&IJPF?az-!B?v^lz~qzVBolv=X96x_#(s)LiQ zqKv5x4MKMO4J8}_(E4x@!;M$K$)NQi;DBXvA!wmF@0rFssJRbcR-}(3rD_yTu zx{x{6s#&Wj)v+z;^wGEZ6yOX1b73a9m>a4iX5GZX8JODGWIa2+P9p|k@_T!Ujii(mx@BUWOJYr{2VtOZU@Zp`mLZTEUd$dbO$1I z1*3jDFe2yQ!Mf5W7D2jxpLxcM9W-X8tbdTAH7f%`oBw1P$be^AdDlQ1AN5)^5 z*rY(<5B#4R0H?KMJrf;FI8^YLfP%_JGH0)#$7RqebJ6J9KIA7O2vn~e%D4f8AJ>Nt ztP%WvGM$jvv391v6VD6mWZqA4BLjPAlMx9Dl-{m0V^c;|63!FK>zkXyG~@Qam;hjD z)~>fUL!h8nQd`Rhbpey2wpMX{V}q89Jvb)-QT+sf{Wf~+)-q8s(u7($5}|j+p%(+* zZXyo975(ii1*mQ-6E`+Iipzp^tA|+X_tO$WRy-?2Q#r3*3Czz=uc??y{#{Sf%kF5m zTr|bUZn#u*g|{gClNHa<@Njo`0SEGuc%9aUj6VKKdyvH80?M==!nS}i(Pa9C81H(I z%ks+%{!- zMpcJE7Ayxv!2^n;1L)d4G-d+E&+GZqnF*9dAAc5zQ6QXv#wwbcLYfBx@}@>-H|e1y zqgq4iNToa03HTsez_1vnQZQcz6t=n}1D=8z0?PY7!no(&Ea3kk0|=iu6qqHiI%zoJnz^RQpP3{r{GZ$f1JtuY0GMEwtPbq_S2D;Z-y zT>9X?_r;$MT+(;_nE~=mOP=gQ)F3!0cVT|Ud7^lJo}=}M%%Qc&6Po1C`dvSYh>=FrJCvL) z?ug0la1lFyYTl+}y?z{$GdxUi31vh6=m<$Wj_w7n*ZBB&$nYgTR^X6<&e;Gs#GIaB zJXphx+J~x3(nUlzhH+u3xNKHMAhd~S81V7TK;I>m8L~ty!?d*faAjUA5A6mE8UCot zduCk}-0?^SP^nIZ$Ii~ocvKabetujYsq$d17tY;-1nDlcb4IhKw$se~L|pG-B9VAL z{G;&7Ji22hsPt4}Dn&8R(`~wevecT||y@J&3=v&omndO9okfW2=&U zEE#-)_YUti3Aj7!`|4;7)CE%6Mx#IMu(EG6qQ|=@)Z)&;cG`n$7{ntT+?h-Q^fB`? zcd51p^LZ~u(`wgW*M3xdP`_)z8^8G}D<1WI{hMuGO&Zmx$|prSm3>c;7iZ(akN2n& zjudloBO4d^;#Gk`;^xN2DbDEA^693oFf9L^qpV`(YSdLlTI`IGH!*6Nx7r3$l}<}6 z?u%VdN6Ku^DGL9qx8f^EnqLcvdHoRoH9}tA64Z*CIzJ{u=<{08`{q=tt$I_EqEi4ZOC-gY7%gdkp9VN4@-t!gfkNovhZ0 zUykf$lsJF>u_el1=SPM)O_o_iei`G|0PP5%*g1163wCZvn$7*9K8Os|Es!vjGgNK4 zX#UNTNS^5`itUTB=8B#>;<`)pTNuKvCgh*vDF{5v;T{j&dP@01J8IhuD# zaiUebHGICmg8?IG3$r%;9=I%tiHXP#rg3Wn%8<Ziv(4V~1RQalCMM3W0N^2k8d65ZqA{xM6rd2^f zO+e&N(LIS_r`-Nq?S1XuhwPl0To3y4ca?3db@k^lt^)%Tm|UPMTdS(b z;vXey_&o>c-~C~G(WhY7*#6TR24H{uA7K9)By~XDtQ;MgAS?0R^0Z_FU>ZsWR_?WH zk3npAas|@-UQmGp`RMAk0a!VOh%Ep>_QkWk5C}5x(d*Zn??M~Zkmex9ypKhKYbPO? zk#ib}Vcb`ho4Pv3*8+y;<0L?VGW>G|7u{ojex<)6>U+3Nq9e_L#i4M#5?FpJMP~rv z6ve+x%zhCPhL1!bvapCtI-p<+>sr&NmT#&(+8f~jEokZMKi^)e5+5hmQt;a4wykTAGBNGL-HywHo!mHWJ=<+$R@cxY|2zRwqnYo!5Ic3nj`v)9$ zLb2SlMKf3gRZB{R8$y{P6OU@R2_&K0?-eFhD+@midS9AN5ssr zyR{ds2Ijc@m_KUX0+~^hzu^=(5dAr{={kPfakz9J_@`QH zZ_`;{c`WOTT1Eq#f(i09|Ggf4h{o;kLO;s&UfQ6CagS@;r3B|$pPGcR3_R2QT3Smz znbL=Fnw=@<6RGb|JE(zYsxNXL&SzG{m1$-oo=HN~-374+w)P=|N>A92Rs$}UmH-Zf zl^#)KH2EhSqkij!e*)-XiDyo0MNaL(P9`QMX$7kK-CLi!IFX6_tlY>o%P`jP5vZ_; z0GoAOuMFe=Y_o3iQLbi;2OJ-di5+Z&}&#Opup9(a;WL z@lP;nQ{W&Vv| z18=an=4xhMUS#>flY^kY_V*4(3unF?vA@TlP}?aY(HwSDKZ1{onE+KX|4C zx|l0{ynHERp-$5#S#D8^4lMTc)t1exBz|FPTX{yZ~aMyt=A z_|pLWKdjY%M4VLW_Bwgy_r|3a5E=fQZ3mxJ|Mt7O(E}Kf^*^>lRB345{?VN+dGIkm z50BP){<}72aWbC!0jk(|mM;9`#%MVMfC?51N}eFnXR+9;j*fXbLBLG1p-B?pYCj&> z^se1)_vP;_n0!~_M2-j>hsB$`+oqI^`xR^mX zA_YB(Cm{!7Tdtaa$>mCR9ulDyePY~F@6Q-$T@ahwp7FijPHaZQu_)eb1Q4K;82DQW z^Ipgf&9bccrscTobqkA=OI5hqr<>cv0p0Ou-1E(cl&V~`Q?hj4{!|;DVNgPOgf-`$ zuDGK~TE1dPZzZ(D@|W~+n5XuNd7}D2-M=`B|J+1oo`A&cxT7*Oj z2Sa)WdWS1pqh@p_IYn^ z*TJXsnz2g{AyD03@Q79Cf?_7-x-uX-jtuv0@B=A{c+4*}r!lHr4G9R`GI8Nz)Wu55 zILQD;I<9j;j1CyafE3Yfb;J!M+v55602(fh~DpTW0+1?Jg7F zcUoB7PaIwT;B-ek>?zl|YDF*p$JT3WtxF?Yc3ZnPs)^g#3oJ)Lkbu~j$NTdgKmNJL z?A&sF@QCp&{X7=ic0u~I$WeaIA!w+AF7y+;zK!Qp9;^zRcL^~myO0TAj%4#a{R#u= zS>3wlMuyoBa+$_Im>bro?x2!wS1xgQ5cyW0h9iRpE!h;Maz>C5gY%5=nCZ2Mv{W{x{gyZeCt_d)!MfgU7{GR5wij_Nj@7W~OZh-5i=@2JVmOuP}j>{~+O& zB7lUq+o4Th-+znM*y#ZKc4GAmA7D)b}{r!ad zw}gx36QLqqeSJZo`DhG098|dYn2q)y?g@b#+{VH-`retN^q9$f$#vm9a;Z+3d4hVFWz6TFp&Y%#AV1Jx@Q2*48@02}wMERtA>$0Y@RQcyX<_gTFwoj!v27dRS*9ZynVCR5(bW}O_dpPM zn7P!Bd>+0{IKoTMwwF;uPcN?J>IW5hcMT0$teWzheJosJTAV7XTg?m9Q)|=%mkzBh zc6$EWi)@>E3<{Q+nSd42t~irXe{4djZEHp?(g#HMQsvzzIP-}kPZZ`$y6a+|_1wo6g` zoUE*JXA9UhY?2TZZ!mMN?Y%1*nq=!7zYA+KosnCc-xB4=c@t0P=H&D_V)7q6u@3NR zgOg$A@5G6O;b_!`1Vr^24-yX8wkKhOxPS$2y}jO}1}b--N!Do$nNuaOdyBvBCj#bS4PR{Sn}-AA z`>+2WAdgjhQ#n6xlc3;zk6Knbk&&Bw&DGWQi@$+^L4ifvA*ilL4bHpioT^)Wbn=kZ zy!c+w9&}Kb_PqeQy1L({<1YoAAr$<;lcHMGDq!Uu*v2OTa1SZziRpO9Ch*){P=zNZ ze7M^9LYh><`odt*b)5MNwUBK0_<=B{;AiX6wf(z(7*Rn#vL2OoE4&sK7VIKPq6VeP zcFs0sWu>JL2MaCCbktiyM(HAA`S0}mihnOwgTgh909ss5Wk=1IzT^wJ2{{PY43_b3t@ zmcjQ7fM@OvuSH%2$R$Or+C}RCS=74Tfg@2uCRtykm6kOucmNjCG<@Y!07(`)fj44o zj^LH-2x;`HOuOd0e<%(-MUb=+D-5drW>d_ORyGNaGdmBADK5ezMmJA7&mfYWi~? z7tPs953K_Oaz=H^!oSf{s7ZQ9r zFL@P|aAF)Cn$X5x$0*ywj+14q3P>hgEjJaYAtru5HhR>h@b8ihBLm>$&2H{HZ6u(* z;C)5y-SmuEO=B8p3jN zyz(oK1mnu-gMxwp!MkOl5#G`oOpGV!^kzg11xA2XoOZYkdREyS!!C1Qx3?GF&${nH z?t|)~Ep+ttbgSu}evjPeC3tSzsn_i~pfbt*`0T>;Dr@X*#VL08^~JWEa%AVu#(P&W~*0t(!0i5Gtnj+{#L zJneK=VT1L0QF!NgQ|1{G6Y|}=qu@+l3Q5JZW_LIr2(8IO?tnQWe_>G>pq%s&JRHt! z8?e?PL!UY@vBedbZgoFg1hLJl;Ke5Ixy0l8e8|fH_~A=02vvI9b($TKLQ$ky#xHTG zg?^7p!lOvX_Q-)3AEHp*o-i+Z49v+Vba+0aY1TjgY7**!;8Mq|go*E>6s=hXO3q`O zq4S#0NIy5=lsU1 zvMsoA9Cv(g+wZ}|U1Z;UIM#6FFyhpDf#S*+4))IR79muxBNGyI9gX{9wv8*p#Kh+8@B!?n>-W5e@AM2aO;c%JQbKR|oDYipD~%-Cn{BT>b&{Y!lJ z_rtpNO@5P$gg8g(?FXf#$?)URBw%RS?h$bLm1pXw zPv9FuYz;IH7IWWq--R^l>x;u~PDFe`1vvy>cRRMAjZS4VOP z-Gz1|;=p4~pz9jbycHhYB*J$M=ja&ugX-sVyR6ZB|0ssMA6jQTVMI_zNV0m@Y>jli ztX=KB>z?rL8d=hPtS<0_%_zXI42^Uvn<|Og3H-zG#>rp3egWs=J?>hx8F1iOtnVel z*rM}t%u7h-I<o5T3MS7&_Na1wkL;P3IV-=ek~Xav>L)(=HQntbY$C)33;%^2qG#1-OVL zbW}d_0!XZK8FPR8<7+CWXt0wZO^3`7i)Es3TUIMgDbeD+W3LTTuNGG zex6Gscd8aICt>ftDWFgS-b6>AEID9fZ?B@O%k?fk-g$ZKbIA6`B8G(9wbu*?28sNR z*x_$8{I*kIeL($nXlN)ze6rw{m_KhpyK+Bf>!k9KS^%$v#&mIXSD{5)lVMDM`2<6~ z$u%<%HiJ_Jbt|i|8*d#A36}EkMI0T(w&Gsx;pqRIB=_*`)J-zA@fVN3V5=c@_M~|U z=c~6~x;eKzS>gyAGwD+F=K@Gxe)uet#yc`2Pr(DsEZi~Gro~4!Fq57}Bfb*PQ_Er1|7MX?Ma1UKtKBNfX0>Yt4{wC>aZzBrM8| zxN(3!P>HgN!HvA*rz9N0|6uF*T9UD3;VsPHXu=ZhfyIo=0?YAl4z!$a9{Dg&tFAc2l z7hpw)OY3N2054)f*yB(+cZ#%)rpojA%pNnKHOX|;2eD||%gMb0bd1KsnOOO5&%4wX zfE|x;ki<|(FFar$dKAo~+NMIcj+%g{t2#Fphogo<&O7ATybw7*EiVMmxkv(E?g5^j z1ZaM&8D<4)N8me;f~GjwTa+~p_Ss>3>^^=W{p?iBg2_5h?0Oa)yfW&G8&C8c{R}K_ z8lT_C$~p-;EVtHB)EA&YHw^9!_`p*}(0!%}kE)fg$0L>91P0?6Ri#Zd4%!VBtLoJb zQn;oiQH1u+8NXKXhx;dmfK~kdUJ~qFQem=D_@}I_w$i02Lc68n+S^XQY0D&j3Hp4e z@hjRIZ=NFB`Gnt6V`mHEI{m8FBzaxW5P+iLSwql{lr+(*9o~XEIy&Mmx;|=WVOKT@ zE3d3P3RF>?wEfXT;>Istzditnx#W_?ZW+5Dratm(Z^h5^L$%u@xF%BK0JafL9!8&R z9}t^4vdD$r3Zf{4k5o$hzL&*zPg@zl!?3Y}yO7_%pZD83<}|N`XuoX1vgUdYy>JcM zKF5X+I_NP4SJz>L%7>r%Wxa`shHaf^B%&H*(1bfY7Z23Fv0RVuI@4q!EQrp}-#e4U zvUhJt3wkB+-op0zE)yAnsWmWcj;SgxF+!jDNI+=VmswdE7xm8PY(D+P^|F(w; zcbGdNeJ~NR#8ekdx3;-B94tQBMhw#{odHt^9#)1^No!!t1lx|WK*+q*;xR3$6*2Fcm`Q#$X^rJNDy`7=b=tkLD-!tT>wtbl^NYXfnFg*DJW zCklj)(iNRWOjrf$21z@RqlE&o^u42?^pvyonr1Fc3UMJMY=0=#`a~)&27)&kE{aB#ozf!3IA!%1&1|)}5ds zLeX05;KS&5QZM!l+qZF%NU6G{M}z_^Gqv@VteRI3!?k_Inq(fjySvvHd^uWWM4)#c z-wyKu&u&L?it{78NH1d0V*}`o!NgD0mZ=%m4{Ip}KYaui_ zhqN<&QABhADb_(OqFgkfhG3x+_X*rmGBT-^mG^NyC7 zL(PikJ_TQaLe#pONmwa_VNnP-2RGgYKg!(>oUlkw`ggOb`0(SSKcsSUa?;FOLM^_~f0nuCG+0KuZ7i%ios(fQ!tQR-)vy-3d8!>vnn{iCq-;;T*rn?U? z7xGhWysUcufca}B`gSYxjag>P-pYK|pY;dQtAA2o26XV?LG0YQ6W{#iH)Ag7Xz|Wn zG}{79Ha}UJO1`#ywftmXr}hV^=Ow~dTHGASK}Q8 zt}(8Jjrp;OZCdFx$dUWy?F!pn=q907T_$D;X_6nUzmA^0mj; z{vPZ3Ge7hEWdBdH`H80H;*G^=`DUUIj53ZT(H3a7^OKQje)NZMGG|a_E1&g`pPvlb z>mShow6?a!Jq6F~f#RKp6-%rwKrP=a&-i4FD_|@0jbn&aP^9lqYs~!D@mQH3{hZBK z1a>}uvlRsE&-z=PpHBTF8i4-(ew3A!CG{cP+S-b)t}Zk;H{;;JgAw;jXA3Zye2rF6 ztMlV^vvxlJSSvr~XP$2~G&Gd-*KsyCH>0(+HK{kDHdeDsaYpY0bZUO04g%(oX z0%Jb&MdkzPb>IN>i*77lyci`VB`7H=iFsd*vFXWV3xN5|XFl^Y$#-9O-F0~W`R4&Z z|IekR4*&oL2JVjd_mLxw2_HO}K^wcCl9CeU=Uo2(-`@SBI0!^x0RLQa3}F{6Q_U$- zO%>}sMXEi(f{@-*q|qw<)+z0T6yD>d(C4bFpvHe2z7M7t$nYB7#BL4ZDd#BSK0C4@z`}@!7{k~)RMr)<#**9yMBnjd;hPC$3T&D1~R)??LZ`N{d z|5%)$b}0^0Y4+*Aw%@gOX`lYK{9P19j^j820M=T#u3LUs^V`p!o*+i*$g@XPqRS!r}L%VzL3L*K*gN?9xIS8ADM8R9rb5Cjkrr#hFZe65wHTFWJT-DukS z^k3iaUc2aT(cb}ph?I*kFz%oChNOA1^y#nZFOe_|0igEfTXHV+>C>m*^dTZ;v(^fL zUdL9D$Ng4Kw00000NkvXXu0mjf7`Ozn diff --git a/icons/obj/atmospherics/components/binary_devices.dmi b/icons/obj/atmospherics/components/binary_devices.dmi new file mode 100644 index 0000000000000000000000000000000000000000..832bf766d0f274b11ab6c9dc181c1968bd50c786 GIT binary patch literal 22360 zcmdSBXH-*L+b+BU0!k53s#FmLMM0D%Ehu0|K%__uiu5ME6BLyW8>I&`VM`eXDE z1To#Xu67rKsK8q)=pZe4+4SlrKoCsP=bnL^nuV*mi_K#<8z)By@=AI0s@5^+JmZV@ zCLM$2IE`nLxY%3j($3b1_hHvXV*=HLYqqu&^0oDvAB&;>P$n0k6VEL%3(OySX?|0o zN6x`^j0OE7cGHkRC0D5)%XSk%5BHOksH8f~^EpR;aWMR+lW5FW=bGc`!cJ-*c^{j} zW)q4UPM6c`zY$e%&wW;(daAwCI`X8d2WnVbNcVJgpeoyKTaKDKD{A4KpLYv;f=zeSs%(!DaVB{GMT>Zv_%EAU}x)O$d@x%}A z>1xrxTOOwK4t(@Hyn5Rwr|D~5dH7nH0`G&^AFQV6`rESHzBYr0nod1ZG@2>tiAzT; zzac(VT}4^+BdHD9INu*V;Wp7_o7&iIKmPcp;HC6U9<_tjpXf(!azcY?7S%lB&pokNT4efuhMavoON zIZ2Elo)m006x-=L9b0<$Tk9;$NGc@3%?+Z(YIZ~H99K!QMuRm-0i6=^43cmQt z`|YJ!1*_`SK6huDQ{O7luF4l(m1lkVuXai?-MQ$!@o2eOEbsfTkGDDp20|lwWK;9< zG+C9zg}84gp1=J0^XG5u`o>S%+U_h3mmj?r&0oAs6p=@XBG^LsRpd9*PjWG)=I3jz zS%*yBy?5_fUELL9ukq)fK7FbwbDsRrEYi#wWe>TDCop7aqBxWog-(YCkVD%v;+1N-$Mtb`;60IHI)A~Qsg?lcfM={&TXUS{Dd-GA5pU~(!!pVK)+#v z8Mh>=*!qlJBR$$K&4%!Yxv8PaYO_bD8Lr7dU!PK4V@6#VTladrvs@a^|Dt>U%S&%g zU@n8JO|EkpQ3<0~Rve+4BAYHR!B4IK_G@Ttd*{6&yv;OiLt(Nnj%+&eNy`YyA)mZ{B=tk=~UmVl{+n<>~g?W8OuHPgZ1==dU#0>A439igLeRehN(VW)PE-I z>$f_Dx#NYxF)P;WDz}NDn(0n_J)0%nw= z?C;YZ*Sfhg2WMblNF$l*m1~i|ewFu9e5+l$Lk#dzR&Bh-Zk_7dm;_568T;$<$oepLsI9W^1g7wb3iSN>^SR|^8fYAUXX05O>Xlpp z>>zDWLojMCZfrUMad_+}2SSh~Fx`er!Q-ry#mpv(+ z+h`q*Z_->Fc5Sae3;t8eFm`Q~9$YTPL`ej!hf6MsXOWN#i>jxu2t0)zBQL{N<`<~G zevQCT*Q6;ay{G=b`v=^v_pI^bTAIh@#tjA1Xn}V5#j~PePnmdRgx^rUn{<9!D=4LL zakT4+O3iP@H7`ZcGiQz@tqR}qCSJN>$W%iy0|_L)#o(*k>8<6VV2xy%0eNsMWf*)IjCmY!`#cOzf5URFBz{KS~9B0&%7Iec1BwpJqdVta)30A!(IQF+>TXI$@-u@bzncbrwA-=~$Ve(fVj@5EO{a&X$UbYQybr zZF#V1cTM->mV#$6=Y#aB9E*F$YxH*GNfz}Twg|5 zL66`ESD$m5o+qt%R7B?PEETrDz^uwDe`i;h^kAMd+LFgs+xy#f`Wa>W*QSa;Hw5?7 z&#cLm9L(<{nz?flTU<;if9Sf6>{uKcb`yDp_T665ZVZ@PHNx%$SX&~Y1& zC1;j+YoWt+&FtAo59T_zX1g0?7Gt^;{MyAYgqi~T8Ig*gt+U=D&2X2gkdL$P!+*4& zEGL196&(w-?z$%|@H$%ck2uNJ`}&?US9wbP5+!61Ql0Gxw}6t5J75O zJN9#lVE~J@_;k3S{GY$k{YAJSNQ6qim^WJbDyqd!g7B*jf_He)F^K3U#ed+cut4W3 zk`ix)a%fdhTX6S{YNo^jD6n+YC!CJz=GDy|gqyN<_4Us%;00g>L$=OY3)6wgp?0T4 zQiCs3g#?hp+d#Uq5uiS=sAz9I8b5^{w96YWpM9%CBJ`od_~{33|8$Ge z0(ES4Xjv2vvfBQyTOl?!HZFwQH{xS87uLNo#Y&VNjSRW#vN3gok%?)%YJ2qCkP|xc zsK}k`ahkCbYwDkr4ExPLEv zO=WbZ<<90t^iQ%5LSR(E>-!svhIzAAX4d*+gHsy`dBxyLnK0ym=^y6M zimgL^(u`#`^;-YN^aBA}73;63;!Y>q&%P>lc~2q)2LLw`@5ShyJb~*Y$MzeOU&as? zk?{_Lk9678YqybGa=EZXrMrHb*XW>{uFfaYt*wa;XP(B>}53}C(AkPdiI!VXnJkWVA$AoQdG>YJI8bQa!U9%p@&E!&D@LKttL$w+7LYXbD6bQ_&!34z6B@nspD-Ez@o_c##bRh~sJ zAtP(f+_n_tJaYH66e>GrX@lHY*jC`i`((zF?Vj%VTQio$&sh=v9gogockFI>%G!#F zefdz~+r3I&zi+q549$ADM>dPtog|Xb&sWKhE@i=>wk6l~zHSKGm6m>7Tyl)=AyhMd z;@Y#BSMF+kNDbGED-Vg!JGaZ7Osjc8fVBrNEiw)lwwkDV`w*CAvo(9xHW~Vnt)eH7LFUKub60*w z%G{~ix3oNzZ8s9*Z`DR^Np$!|Xo*|o;70(({E_9; zI>bxVf20F1Thpu%c?aCEQ}sCP<|&Q31HA}CaLmR>QdoMVt)+q02dlzVuEfsf)Y(vC)5!;BPQ z_p@YoASXwZuY9>aX7>jtHO0x8#pwBss(Aww39B#`v%lB)8b7txufZ_j9Sx`>Iv1g5 z>2`Nt7u*mb*Uwl^wijq5XNRSVt{lrG%R>M*^7k@=8&A%SAyB`UMT-fcvg`M56@Q~N zRA^-6?Dgp5DnMFIKhRdmVP?}$xINXUB!-F(B_~LDZid&~u#B$6EAjC`5OB5LeuIDW z!3V_Y27*;Wng?t*Gp{|-gM3SueQRs;T}jrNrEO@f2a!^TZvXNxfAJyWWOs-(G-Vl| z8Rix)1TaIW-3c}`ZQ?B{rrch=1J^b@Bc}2SPet7Zx8)0IVD=L?gjJ3|IWqDoC;R)$ zl@)C?8F$X=zH+>4#n-FTuZs8mO@3x#8eH)p?K*HfQ+vk-{*+Ae07oCZV>sez)|ug> zj1T>FSMwLw`6oWEi{&w`Q&r4v_0O)gj{iC>XrNc5T`$xKwp3OuOy$~sP374aFySc z<+Wz-FZh98m^Q{wuMbn%-r3|7knwPDsrH;mR>frGHIIWL@d~`>1G##qEro8OrVE}D zMj0GP2=EH8lPbYe|L~qAH3^Vn^_*{0a*f)+WLXdt8WJMvY7d2kgb0794Gamne&zq( zhYRO(?2=CTFbcOZ8z3{?zmV=O5}sfe^Q@C5QPdzcehk@9jV|H*Dp`(II6WrFvb2N> z+JX*B$x=fBBrHk{|5l>n$22n}L7$Bt0S-kZ9i_wy3UwQp`N2&gK9SG)tsP&q++*b4 zu+YCyu#1C(IQH@k!Xp)fq+~n-;I;5%UQfoFTQoF-<}C@|K+gF5_3Ik2gZABIw;*!@>bh(1IxHS|L?Z|gq|4AY zC!5(dea?=a=kDn{w-=Mrt8{VkC+n}DLS=6!0E=6mhgr7q;wl8(G`dIwsRR*_q;AX* z`+B4`K2Pkx^Xh%c?nJXBJzTpVS>#(x1w_@_D*7p_PN`O~S6}x*>kqe-wyZd00sc`H zFla5K`=P+p(*mq;&2Vky`(m9t?SFpjwF>{NPYT_5^WB-L1|(QYrUsS^adkPtl1HC` zwaCy!^Eo=c0G0~ewh@E?`yBL-|2{QH@ZJHU=xtUfWe~#@>mt zv}kj#pcvTyHana8;Y2MgBqT|R!#zDc<6&aCDppn^9xKD4Y1g996im$?Z39_C`&U?4 zn3jP-2!li=3p+bIm#kyTJv{yy69i1_=d{cC=6u($nOSNI_8|u;!jy&qF{RV=-w%gpfSwq+AIeT zeE8YUxp$V60cgY=TjkuYU+u}nC%HCVQk~|4&cNlH43Wf|3LrBaHyTUD!rt{S_H4rM zv{_OA@g%EsbfPCixPj23(MzBUx=f*oVL~(W;cXIIKE=&R$11lvuYJnSd@`b;B793$Q1f7Y3J^jzRx28vv1@&h7=Y&FP=H0 zwS=?P%RTTKMf3xq9eS*9C)O(^Ywlqu2JG%}e!b7p~56NkZ zU(9N$Cb#srm#Lu^{ig$MC<@;*Fi7n2b8>dR8|^;v{SX@m$CXFblOC|jds^?5O8hP< z^6`~reP)o**R4h9P=kx{cS^M=JpK=(>_JY8{T@S;?7COm;H!#7tHYsSIX2zg3@-3F zst4%kyz=N&=j5j2Xi)gHCITl(9+}4Af&{oQn(yH0c-!ZI&i~2i`37EczFsZk{?9Jz zrjeX}-#zfo1^gpEfUC37UM40cpR%&(cf3iJ-cVqq@AkwmP5)*|e4%A)9Sx^3l+Z$> zuKmvD7+}-J;+#MRxNr3a{AF#uQ9vY)!el;W*(w6jqR_an}=glPvmYisk&Am33x86Ee^?VsLYlJB6;Q;!{^w z2W%aJN{1rH$H((`fDkgd9l9alH3o}~kDr)odIdqzjnv>D8UsJG11$aE0jeulzCI}1 z#!+Ug_WkD;FYG`u^BuS9{iLvuwPv4s8NJifAREPzgWP1pMq}F)yk_5cUNuQmfm?L?t*5?!e;nLf`c_Y4YN$pIq6_>(7HD|?&MG)< zuBty@_w@hh3YIZZTl>k@8-;TSyp;kO2uzv;QoU(jyeRnx$enL#{#f>Fn)FIr8OMRnd>_!Uiq#!V*D8+;MpFfKM-{>#%%hN!P-?tD3`17thK9-*1E5AbnD@}-Hbl+^kHBZK1A|sT*6)D9z>^Vs zFjFlpEQAq`LNWnXe;Nn5E0SUrrMsM8NZ!%7c7C9f>+0%iBdKb_n2N7pn|#*e$)$P} z%NX52CgIwB0nY-OZ%E%09LO^PQkKdfF?|1*0V>d%QG(hwcDD6mK-;HJDm!g&;yEd} zYmX%C<8VGGc=|u!@PU~!N;C<%Fbgyf3O>5{e-C>9H@rW^p#)`|+47Mlt~S!rvB#Jn z-`QWvcnRDrqslR0FgXS3wB+G+)-!gtb*7B5WN=I7aY$ehFHOmPer zI8phrpFHPt)*!#8jM(G91J!H@2?IIf@4KAT*>K#&+D(*Kc@0KZEv)D_3o&(gW_IeL|{?CQMf24r_ zT^~y4U~;+uAkHJX!+(f__orf1I?m*K+*dvBIjGT$qiH0FwlQ z2)l-BZ~x>udjzXJZhRTQ}m!J6FM+)r?r z+2rgteXGb~eGb{V7mnGpt-{8?Z6SZ6m0}B3WjKL$!mI-2cK<&X8$>N$oznPqjEAS# zq{71nPFjyHE-1KQgx0#^rp&6XY(}kO!$2E!clIdjC2k(*=Kaf;=PZsMJV0SIEh0kA zfEoRu6pTP=XV|fH?mY|ZB@X!I(-ws8ik9i8Ez<=`7(l8je7DRd0FEgn6ER->TdaRP z4l5Y>U6F1g@mN@xY7xbr0()09ue0vK06?V_Q&NLDIV9v)JvVgob-E3}v~`E;x}=zR za;uL;Mn-xOaeYrBd7eiE9hlHV0q4pdV}w4|uWqYqvmK`!KOOdP*W|nSL7`N?8rr~L z6Wcq_m#Ow;euE-w)^@5t60@>~>4YVF;jZ-CY3UjLi_#p!AnTnR^~Y)y$&S|41Uj^s zQHs!w0?3FZVA-#8@r7ki-qr?SI2=E&6q-Sl6bA^z{65kODh*=_``j2OkoH`M1c%5sU^7{5Dj6%FG=76Y^`$N=z(iC9qny zrG#d@^=aP7_RB?|Xs7yDW`KWfPD(1PIF#L%P#=+gYWGtWU*Cvt-XFWv$^rpi%f((Z zD-{=gQrN}xxR83e#-UCD*yILOoS6Q@>E<{nu(|mr?;1V=H9b8oH->$%(49$n87#7) zylhN0m4Q3R3lHEG)6bRS_tn>C^#CQvXq&d4Lj7E0o8fl9o%P8^=Wk3*iHhDX2Jvrm zqU#l}LJj6ul|@_~zfz`mvzU}t(#vMy+uyVJFw_O^kMhjImEP@I(0otqfRB%6SQ@@% zZ+$vZp-mbswthWbcrve`;7E16$kl*=XB!(XzYQI~cW3H!UJ$$YD&D-e2fdXg27}Hu zUTH72h-Y>z<*AP6fjv7`(9te(*T*y}83qOB=8E6b)qPG>M2;##HMK!>&u3aD0^5Tt zXdGc}KnMk8y*0vO-Xtja-q>*#FP}OxdGE@eUP7tP?NzlSboj*1oT&>i4Zu%(c}$T@ zVTqSqPrZem|5(ZESjymP+4rC|N!n{6GXoUHyAkALVX5!Z(?R{4yH5)^EFhSG7zd_` z{@#q@15qKt*yRwQ(SYYkT6yrbDQz3a-Vv|o*P$%fNtXytgrDSo<@&7-sJ^F)Uj1|J zGDrjcN4lduG&4wg8^yy11(ac@^wVsLaj5c`64G*ju}jlQFT#8VjM3;VXSF?|cCUti zl=5d4#HUlgtK4xY;H+Bm>q}THkSyqc1$Ak{BNfD% zdOpzf_Fz5-9Q*bSX3X@iqJn3-{-6m>anX^Tt!3&{0NPin%>QT?zO*0@0eG)Rj>{V> zpG652(*(3udRt@4j|RGfhOAepRXW(h&bPzA+iq92TH9VRGDtM8(#GRq#u~=1&3NVIfPI1DK?}Vch*?XD2gQ=?H7=vc zq@5d8rW-iXF}LYk#8>Z~o_};9`|$=1EMQQXa5E%v)nu6I9gp=PzG$*7cFR2Fbi_Pq!V9mW<4j|Onz`YH}~_m3OeSAj`yl1(U&)EtS4%e|p8?`%x1@^D^9yI9{Ol%z`hz4k3FehGV1ZR)x8 zBOo=N(_bJO)@F&u6-++>3V(cGOIx4ZaydASjCn8HE6^Tw^gM|%+t@c>0{tM6k0==r3rX?x7k=c!5JqXQ^pV&BI*wi zMl8@{b}^S+DUKQyb+~3GXzgc0Ve1rwgDCaz!Yd#iaDwUBtnUyTaLdc-PIzBMehS`> zJtYIh%5(zR1{)fZ62SzGT;t`ib4gWy_!0u zdWAnRO$*3K&inT;h%%YcQPa)M&3?m!y1K9FTwy)aQ5ir>h5cwcKf3hc!$=YEOTF!IniRuuACKn zQ*(T$?@qCF0+EWIo ziY|zTX%WecW9>C$C`k|5yzvt_4aF5evU|NCF+pr6SeY~0$U-2yjeR?+a=N42Rp%@7 zs}hICfM>5ST1{kTye&{{QCyCrz=m7tA2!=cKUv@YwOzWQ`ffUr`FAGsN605E$Eik$ zXgvh$h1U|#<&e(`bj+&G%e|u$T0kCJM2(U3dNF-2C;a4SV(+NGYUK%p7EwQmueenQ zE5N8Q&$d+24ON=NRW|{l6P^-@PwZNP$L-2H<0}Ccpe*x#_SG^qJ&b6%mMHIj#_yc$ zLx2cCZvF;zSW2=_tB_V7;P=2~8Ke$tf}2T6$q{~QLYuU16(eiKeo`B&B3IDxnU>wA zQxDvoj~*WBjmi+O?u)Oy?kVBL*B9?3^%mW8Mog^pLW@=9;VU@g!w)0@3hY=b9=7%d zAh{xMIxU6}+-HLHH*mnMCO@7lT=rT(uN0q@_%*^nV$MD1bRL}I%IXeJWZz|P?@NYJ z_^S)#@7Ia&g7+k=(N)J%-+Lp=1Vwv8BI6+Qn@C^OLJ|1wQw%0@17%`2G;8vSB*2{) z1Q15iPx>D8bYlA!p_CWuK9#j*%;X=W?9no5?Qu^>gcR~br+1K2|P`=kX=tcmE7lLjj zh|{phi#G0d-2`T!1;>9b^IRuedFx4SJLS}3iDI3Vj+N)Uvyo--=E}DN^7+FtWqljj z)+-o-sv?GbHmUDi;mK$mbKixQ;3i~l;{_N#Q5+pw%L@Nlt3(^Jg7S= z9TnfMB0_gcdq3>3aF<&>pqq(Pj_6g08hTl3(Gs7J+G}+io6kVeLgr@{J}UXH3D6xj z+Ya|FD3Gu=GgBELPVnzeOCW1OT&9A)R;X(9E#{#QL;a;r0#L+KG#uM?vvo0k98a=x zCiebJ^Yiyc0VmPQ)}2oxmI!$d8$CBITJqcZ+-C6?@^s zU;C0e5nGBSBn{v?EBvurt>5?(3P`WJ;nTNZi#w`6bu=_Sqb~0y*ryBlzf#;4gV(49 z<#$_KCiewyW$grJ8}eH%AT6^pZEzU|WY&#t^3QJHu7zaqzMvbUh^ziu7K#%XFCt|4 zvzT=)SW#|>o2Tbwj+=lmbwju7tvTu+H$mJAn@dvx9&M@d8E%nq4%vH~3Q22dc^}E4C4P3tmGia5>vdAjcTDHjk#I<#xPso)u&DE0LoVw{*7bLcNkBH(%j49Z3i zvQ5kUDJmgnTRu?~WFf1YJ69;G(3G(aik8cx>Y+x3GEdNPy1gC>ionH?LOJdwOZ5KB zpLyutEBmo})aPw}3FmzIqCHe>m#{S{KsFE)6D!22P=WS4HMKhlos6JF^|M!w_q8Ut z(ml{vM?>?T%(15g6vzvTOdVxq1)bH=lvY^4*dJGPp`$>ZH|FOr!=MG7RnWsJo*?#_ z`sRz4={nEtrP}YMmaSZfY7{ zq_l@mt{+r5s0mPS8Nn7n?g?BU0w4~y3x|({nEWZB-H+KiRf$;*P8Gd!xK1bbBI5G7 zhnxq%FuE+dp^!luP|gKKnlIL!LT_mVC3SVnnXf;j$ZzDIA8{5cogBM>{2y7a)=QMK zdFcTvlRsaZ1dm9p)c#(d?Ck5aG6IFMK7>G!DYBx_Vz1=TE^u0a`dwC5Z$}3NS=-yI zIXOxA`1pXoSn40YlOp$I@N@3>?r>$gJc7;cg1&>t_aiQ8B*4&T2t%*W?F&W$H+Iwr zB_%RN#n1IB2@G|I|2u)NK4=dR*?xsX;KJ9JZD8)v%R{9i)#mXa;{w;_865J2<=juVTVwP=%?z3Xx}hx|$QUBGmK+N{L2a#VHu(Ll-NW6^JP3WSIn)b9pg)e~ml z;;LKwa}6;N72XIr&l8xGbj&*G1>mOtiKjx(zP1^ZIANkrPftItFiE^vad@#e=NlkB zOpq3mXeS!>aO!l}k*%W#O)z6!3LYw5QWS~^1*(U0JZM{zr{pZrH^xcbT$^7^{nqOn zu)k3IL=}knGrFkn6N{b+K8fhPB6nnUb4ZTb9Reu}<_LD;AztpDF-W z-=}Z^%Sv=N(+fgpJ&|t_PNvA!pN361ii9h4?Ik)6PcG9mpk(q`&= zwWnV`DmxC#E&1a;Kjop4e{Hsji`T?y2aVwKu z9}LXaaS08SGhF?!$M24((W-nuEtoo0M=#CUUoK>$@% z712h(IraN`#z%taoaZ{;+eeF?zEB0Z{vGv6*UMoY8A7&sUyl%j3G3s**Ho{i4-Ov( z(&96du$N1{B`+NQ53r`A8L^jG+cdOLLUQM%>jf1irV{TKfqIlx*Oy2AJT;V zIS_sgmv!|YE~uk|^odf412TVCyd^+3@9*t>0Wt#=NP3zd1P%q#C!{hzb(fKuP747~ zkf2KbYY?-+5xLZl0qQpg(n;uQqJ_G;c?bA4KzGoRH!QsX-IT@oP&}eG0v8>HE9F>} zaAbVI9Rz>AK#cE^Ov@(?@C3O^95}F}9Qd=#G?bC)P0jwykN&8082p-TN!_6RWq1*@61`qLZd0 z&p2)_OILd(V--tfcDth9yf1cm=7zG@aYq_6kzQmGpC@cI*go_~6iz_Hr1wBS944$* z-3w2nH7i`z^U`(B3v8`+Sj*Zu|9*|P1i}%P^r^3b93{%60s3EqYT#zs6w*IU=(J! zQSFw|HUjmDyxMrfvkJc+MbzdJBouxLx6C39h;%YL`IF*YEyg0LB$c^hIi!a5bNj^| zgpdyi(8#dGFK4@V)mU_qf>J!Ce97;9&~bN(7gJ!r&wMw%Io1cw481I}XyJekCcDr} z!)f{*30!_Q?fiZh+>ZDnNG5t)G)#<)q9Ey;;<~u_4?l}M-o5)%0C#+NXeimn{%*W9 z(Rhx&rj1srfMoiqMm0?~a48!OP2!UqALtV;j_4ut=$&E*skizB4pwn&dp%$b!L=(_ zk=~p0SF^j$sHzcRkZDh1xW-2kw=~p}#PKX=cgb>_Ui5Wl+mqo$ue+z;tAPDlD`8x=9;!3fCMf(ikVkZt0)mqX@o~kP-efU2PhpC9b zf_;|&dX&V(u><&1{}oq*L@GX{@ZrUa7x}leUn>386@U#-wVC&S|1!X*ZiRFEASn9& z7;?l-*S8i0YpfXpK%Q;#lgo^xfR6tcqKsuW((O(b@+wo!UhKH&9TL%xqmt6}J$XUO z?bl1kd#iroVGY9mWWUvr`{du-R>Z;}fGx9;yE`HmUql=W+zSmCybsKN%Fh1ozde$$ z7J%3pq#u5)`fZMCPCxgiTThngcGtEy?0ovj#234pj#y!VN|ruoFm$ga$hUV##=K&o z_@o%1^xD+7KPS1m$Rg)0PAE+M;&e<)KmX(>FoR`BpfADw4`4+P_d9 z4zW5E;d;K!YkB@|4%!vXP-AISVh>|6tXa!iQ-1cTwf*0K-Ji0<-%xDqC)e#ttuKuX z<|;s$f8B7(;(k~AbD2Po+`zhp=#C55V*3I|aD6DWH?K#Jz+TLn+KX9i_mL`yEfB5@ z2_C)hy^wUQ=rhSf#;g+zoTX$bhb@OPO3sO&!FeV)Os>zhyVv04dkd>`v^6WI=N_f& zy?DqDACSlnae))nLB5g&sBm*rn0?yoTyaUm7t;9BE)@0F$%(p|5WFLHCn9@y>W^rg zryDg`x$QyQWD z=Wijd`1>mbkasXcZ#C6~PpE4bEiBmHetm&vwR%TfUO^!eW0Pcww>pn4Oh)xGs%UGo z(lanP18|)R++(sK^49EwUow_Ixxlu`@uv*pHR_xuk9?K)81<%m&Hh&IwqApm9E`MJ zpDl%7yOi6viwM1pNw)!8MUFv~Ye8TKpiN7!1hx=`>XiJmm$zzJ5IhRwD6&1wDnqynK0ta%fOckff`OeSgg^Z?h(_0bX9U z`JVDrBMKD*+J1j;1^p z;90i-wnrZk>9b>zU_uM^S9m(r?Mf`sZLMOM1#z%PClH(1QZe{6?O1J09C_PMdDqBF zgfyG%^w3}DDE}t@u7J%8FK+W4CAk6+ax9aP%5rjYMw|U1qSEckJ7?21QOdRpzc=Tr zi}aMgmb=crAo}*@nyf|rWb5ngJyz<}pMTsoz`6xaggr{ypWv1xMBc);r~Ph~U3Wr} z{k}5ClmHEs%fZ0`Q1n8jI?Hx;@%&1gr!?ez}gg_o-J^WoMsVSZ3f9 zzrEnxNG{-lIuIC6j|y)FDHPUxIlTSjZV^wQ*r?ypJU1p}RZK_Ah|C#)}uU zP|cq`zF-??ORovbfn5o+Ei{$H0(`l-XA$l&DD^Yt(osz%T&%OgqGs$@VCX6G?#;hT zt0yvZa~raBKi92Pcq|**k9=i^)}~%*Huw+!V9#r-q!}C-cwLC^)GW~u#@jp@w_-lf$<3&5j*NHfI8)1b(A?i6xMQrOXv}*2fL99A!F#<0#?!2i3k2kpB^YhTrQ`RwdS^`royd?+HzeQItNyYvF+#4by}T=?*;%BkoV^W1fImlM02jL=LC>uB%!nf)pR^4FcDFTp@(J>FVX}m z>Bp?*m2Wp6W;*=P1r(H{1yFJ4YV!Q1#lWL24pyX&Px-FYV(t1Sd_U`rW0c9>yX~@= z?@j@mCltN5M}8YwoaFagyS$0q5Wd-d*c~wm`dWH=a*WH5K=}{r!}5o4cAN*OV3owJ zAt*3h{Hy5FmUVBAQE+q2lEJ3rh{upa;xcwz7EWNT_S_z6aP+k|2}R!kc9~u2W(m8{Bs=@M(TwD|wQ4Evb8#fNC^)515|SK??4;b(!Iv#oQMc! z=-$115OgX9$qjUUPE&HJGqAdG(2>&64s6_fZ*O+EL^W4fsvyh3ckkXoVX0gR=ii<` z?v^^czn8*dSDcISh4cX+I_KH{-a(Unq4xuUKYm_rr%rraYf-b_(GTZpl7R>Fe9l@! zK(@BFphFEvRliIf@ps8yn>u{0M%{67anQ>=WIE{Kh^X@2K9!AcmBlbd7>7?HXx^sU zNayY@Z?9CWJ_HdkO9Z?%CyC^=6Y$EyuRnSzFc6rCeKj(8M;1OfnT(y3J~2OK zwP^x@3BgicPn7s%NxBFuy_d2mDR{009~8kpVGn64t{<>WzT@t<^ri7U z4@ISeplfh1_eay5J|sfeb#f-^?bi1n(=TEB&rRT>Jb?tLcn1VGam_v@c;%SQ#_o)@ z*4LBH5(IeSi!WB+xE9T$l{mI|`9bH%qz5GDPmrqK8CgxQnA=Dtt*f;`kX5`%0j~X? zr>AV-cWEGS)qXrd7IC2!6r(9|S{W%Rvw~LrX)z_=Lyvj6d}aPku3 zAl0cSXV;gjaY>|?Bmb?yx%SE{Qh9+nKV_qj_tImscCB}I(;|;|?PmXk=9UzHm6eom zfbK@{WD#{uP0d~b_(nP7_p*^YF#|vuAn17(IoJCf9uO)Zm5zAufU7pSXsk zW2s@fbSZY?_9JF7JyK&7pQ^L-+^_OXUhUC=flCXd(CP>f>+&zbH)<-p%nO9zcZ=Bb zNKT)zM|*_!uHN6|7qIg-CTB?IM!P!)F-5(XjJReiv2o>|(2otp8xhtEu+KZIgz@-?NcdXi3RNp^iL@wc@7MwU^KZ6~@-C`wgtyFlQ^Ma}MkZWVQ zMmC4|r^;8d~Gk?Ck5hH{UI?BMZ{4N<8=@O;PYLV+Sb) zpL5HTArZedn;}ho-ebwY58r}lpujfSQ7>v9S;yP64=xBTEQXwx-BMkgEyEgnrv7yE z@OVhroKJIH4KIt|9sd^W{Cn*I1ytyy-wwrlWjewxB8&sBHbSCd#6=huzbrfAb`%ta z&inS98A3-TelI&W!RwDLU&)4R+vZlR$SZ;eia>z?sX{f8A1$CjE5c44iC8m^IY}&Q zdK+wd_imlv6FlWv7GdyS_r)AGy!-bA)!eii3oChs?^~`Tp&PAHd1!1`4EZYb`X0LbPl__~3ipXTy} zTJBO#bu*u~a+g%A!6DeZiMIrMjDE?Z>N3B2zt;ngG?JulBwzeXk)=q+dpoTho|u5g z$qXh`Z=M`>>(cn$PTtj2-0V;-nK{Zjos7rM+7aB`gg|znK=M(*-#>`Y@`Qs5!>kN; zxxL+*Q$@a2Ri@lHH$QJ3>{{Gh>i=>gGg1`Wo7Gk+WM1vM(UtT~0yF|*Rho-$>i%o=l>O}#VK!T+k!X-W7tw#yc}^Hwnw>^iI59`*GCPknL*ZM<&$ryRg$ zDoS)DZDzpVmzMScA_0`)Ti%?3qffw!C~o{X@qq8TO#0=Qt@>;<$+Auy@d6HH2JGv0 zznNKAnjL|yX4kc>d@5sB_4G4|Vc9Y-CMHK$0l`{5XJ99ED5ss`*7rj{r z@8lPKO-`8mlGyH7fxXD*dIqdQy8zf10nT?3aj$x47or$H*nwwm8X~x1_#Ldy+|ttb z*wZ?cx(v93X28IlB~;5Ee0%Y!6kJ0H3ma3w;P3pzcvqS3HX?Vg)%g)!-o^xM6{5J? zyM}X;FYcWj)8!WMti;jd3XB>^MRRF3|atD z!x_Q(#l9UZv}WvTz}A43q(5O(TPGt!bNgfQMyT`{=v?PUXj@lvtiNF5Nkj$ViT?gJ zAcDjpJrM{)G4efZ>n7&f4toC6>Y^(0yF*uoW@BNyvYj7wqW9T>w&-1X?F#IU$R>=H zbD;=_hhKz+dgTJ`)xpA%2)icp^yDh2dwx?)nKlD<=1m zQT5s^d0H!geDUE14V;XKn(7nzL05+f0lf1>*LKaidE?7w5U*}@52fWi%L6{2ZBij) ze>Micd;(7v6h#*)#UghFrhfL-@0jBJ+Bk^>2|hgi@MI&+Gy{?(`(h&+ZDv!=bI|`w z4droC3UdOLz-A1JZFT#RrWGFN0Qsedyudch$-`%QN#@vB%S%f|;_!#{DBFOdM$cX> z^3=j|$uvU%DMpNBjsG%duDQAX86ER5QWq&cBMW$zd)=4s$0|(lMBMwGa38RV_Z7Q@ zKw!siL_B(|4^0|)^NHLvJZ60Q8rR;^lv>gsBv1Bs@zw9J^wF{`buHU7lP*SGQ_ZQZ)n zcyT4nFDo;qa#GEYmkn6|{3CNC>tN^ecWQonS(!1F9xFfEIO2_6w|4E?sAFBYaN(%e zu0GaiyEJ0u#~Qm``RP9YXydRt-~7IeWd5wM^7+RbgPqGiYxR%u*_9|i+Bh6p{}i9U zQ|mwKQoyNfQ6;)>e}7-pY52W+_ZokqJ!Z5Ie0>2gT)5D9k_q$s`l3!lC(4h;oSo>t zMt+*lKU!`yc07M4=hyf3MV(4F=f@gHtg$DPAL~sRO|1M_W49|mljonxeKXCE{7i^^ z-ibadvi1DUV@PygEAq{;JYQKl1V7J-*e?-#i9j^m1T+X8GyZx^-(xuT@=jbv25M zi}CTtA7?a{T*{C4*O1r`R2S>FK*^%CqLCUV&r}|^O*F%C-YiOcOPIb zz{AiDF&X3oOFhBMDXkuNABbvx@{Oo5x!`!)ZjW6nmb-#FH zaY}x)$BUI8OQz31SMv4ctLG>CI?b2*M?Qbn-x>8!ssY%wYggRst4F%*vdiM0zZ&l- zaGiN2Y|f9>UFA!DwAl}Hexfdu`RV2BZ^UR<+=}(uk2X6rI5?P6vl6)l;H3O$V=?C^ zBOCeV=V#7OrdfA#elFGDd|%ezIrSga07TouPi4zH(V&6UX8=Uy>nj;OKbe(JHuCky z*Z&^t`7=NB{AB-6viXUo=HiXTY5CDa9vEdFOQJ2%Z09E<)BMN};bhLB%2qz>A3r}C zve!SX0a&|sZQN7vqCHT&)39QRwFRi>N6Rxm8S@I*%6#(}VinY?d~>e;?`UISes=Ox z-3J%#wW^OV)*CO{Skv7Hm}~jEc%L0ssjWX=KquJe6wh?S9ayI{;YpG^*0)T zW5M6@T9XzM>4`Fc*QG3fWTGT$tftzYJ+cMO2n>rH7NT)Zwk+I|23_U<0HQ6PW< z@MGm;AlZ^Tr{WZ;rV53toFWoZ4iE_`y|3WHX`o8Kb?Dq7IntcK7nm*ZkO2=E^Jn6H zPohAAeDf0zGl_w^vfP7Tmm&RfooyF_G3#%;K(PPW|3mw2`oAy%I2;aGEEbIh;V=x5 zBng5bK$@n759_vGu)XaCcmcK=&%1JnoWf!LP1r?$0S0n(>G zwr}Q|8Ms-FBuS7YiM6a%A3UA5D**cR>C^A(&wy+YUaeLaPnJ?bN{QWWSNouaYgb_O z>EF@^+ReZL`}?)9 zFXi*aAKs+U=B&qcUHX&rpH6=EPU`vRBJ&^qj^e++XWq-p0RZs%mhC@0_wP47r)hLs z>G#=}+j76(BaUMTAs)&uZdLNO z()&hRN+}V?F~Tr}Qpz#Q(wDE>O2=%=F?@ZYvF+2pf4_R{qCZ7{1^`N_d=LiOJ$dh% zlq*Z0{w@76ve|3^pzz@vvn=%K)2Cndp_IxuA%p_ZX!ATz`M$3_&ue^+ZKF^BmVVo< zjW2{K)K@75`t<43zm;FO3m}Rj2MuDb)^rN9ik6{I|CWB!^y#-bk3N0+^!xDtw81^k z!*aPqnx^?T3T=fNBJ}Cgr%#_g{qFwN699%`7=~effBpfl6F!DGU6UdJ0000 Date: Sat, 11 Jul 2015 19:56:54 -0600 Subject: [PATCH 30/52] merge conflicts? --- TODO.txt | 2 - code/LINDA/LINDA_turf_tile.dm | 10 ++- code/_globalvars/lists/flavor_misc.dm | 2 +- code/controllers/master_controller.dm | 6 +- code/controllers/subsystem/air.dm | 1 - code/controllers/subsystem/garbage.dm | 4 +- code/controllers/subsystem/lighting.dm | 2 +- code/controllers/subsystems.dm | 9 ++- code/datums/supplypacks.dm | 4 +- code/datums/uplink_item.dm | 2 +- code/game/gamemodes/abduction/abduction.dm | 1 - .../objects/items/weapons/cigs_lighters.dm | 6 +- code/game/objects/items/weapons/defib.dm | 14 ++-- .../objects/items/weapons/implants/implant.dm | 23 ++---- code/game/objects/items/weapons/tools.dm | 7 +- .../stool_bed_chair_nest/alien_nests.dm | 9 ++- code/game/turfs/turf.dm | 2 - code/modules/clothing/head/helmet.dm | 2 +- code/modules/events/vent_clog.dm | 6 ++ code/modules/mob/living/carbon/carbon.dm | 14 +--- .../mob/living/carbon/carbon_defines.dm | 1 - code/modules/mob/living/carbon/human/death.dm | 1 + code/modules/mob/living/carbon/human/human.dm | 16 +++-- .../mob/living/carbon/human/human_defines.dm | 4 +- code/modules/mob/living/carbon/human/life.dm | 67 ++++++++---------- .../mob/living/carbon/human/species.dm | 32 +++------ code/modules/mob/living/carbon/life.dm | 7 +- code/modules/mob/living/living.dm | 9 ++- code/modules/mob/living/living_defense.dm | 14 ++-- code/modules/power/cable.dm | 4 +- code/modules/power/cell.dm | 4 +- code/modules/power/lighting.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- .../projectiles/guns/projectile/revolver.dm | 1 - .../Chemistry-Reagents/Other-Reagents.dm | 3 - .../Pyrotechnic-Reagents.dm | 3 +- .../Chemistry-Reagents/Toxin-Reagents.dm | 16 +++-- .../surgery/organs/cybernetic_implants.dm | 12 ++-- html/changelogs/ikarrus-maint.yml | 36 ++++++++++ sound/items/WEEOO1.ogg | Bin 13533 -> 8482 bytes 40 files changed, 198 insertions(+), 162 deletions(-) delete mode 100644 TODO.txt create mode 100644 html/changelogs/ikarrus-maint.yml diff --git a/TODO.txt b/TODO.txt deleted file mode 100644 index 1187050192d..00000000000 --- a/TODO.txt +++ /dev/null @@ -1,2 +0,0 @@ -make air flow - likely an issue with multiple devices' process_atmos procs; who knows \ No newline at end of file diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index 8d6ba7d7802..011b627dae9 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -232,15 +232,13 @@ archived_cycle = SSair.times_fired /turf/simulated/proc/update_visuals(datum/gas_mixture/model) - overlays.Cut() - var/siding_icon_state = return_siding_icon_state() - if(siding_icon_state) - overlays += image('icons/turf/floors.dmi',siding_icon_state) + overlays -= SSair.plasma_overlay + overlays -= SSair.sleeptoxin_overlay switch(model.graphic) if("plasma") - overlays.Add(SSair.plasma_overlay) + overlays += SSair.plasma_overlay if("sleeping_agent") - overlays.Add(SSair.sleeptoxin_overlay) + overlays += SSair.sleeptoxin_overlay /turf/simulated/proc/share_air(var/turf/simulated/T) if(T.current_cycle < current_cycle) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 752dc718e94..df39c500d7f 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -31,7 +31,7 @@ var/global/list/frills_list = list() var/global/list/spines_list = list() var/global/list/animated_spines_list = list() //Backpacks -var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel") +var/global/list/backbaglist = list("Backpack", "Satchel") //Female Uniforms var/global/list/female_clothing_icons = list() diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 838bcde4e26..3ad2acefb4c 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -103,9 +103,9 @@ calculate the longest number of ticks the MC can wait between each cycle without SS.cost = MC_AVERAGE(SS.cost, world.timeofday - timer) if (SS.dynamic_wait) var/oldwait = SS.wait - var/GlobalCostDelta = (SSCostPerSecond-(SS.cost/SS.wait))/(SS.wait/10)-1 - var/NewWait = MC_AVERAGE(oldwait,(SS.cost-1.5+GlobalCostDelta)*SS.dwait_delta) - SS.wait = Clamp(round(NewWait,0.1),SS.dwait_lower,SS.dwait_upper) + var/GlobalCostDelta = (SSCostPerSecond-(SS.cost/(SS.wait/10)))-1 + var/NewWait = MC_AVERAGE(oldwait,(SS.cost-SS.dwait_buffer+GlobalCostDelta)*SS.dwait_delta) + SS.wait = Clamp(round(NewWait,world.tick_lag),SS.dwait_lower,SS.dwait_upper) if (oldwait != SS.wait) calculateGCD() SS.next_fire += SS.wait diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 969e2fa6d97..27f6a92016b 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -5,7 +5,6 @@ var/datum/subsystem/air/SSair priority = 20 wait = 5 dynamic_wait = 1 - dwait_lower = 5 dwait_upper = 50 var/cost_turfs = 0 diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index c7cceb73f24..4e617f76af9 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -6,7 +6,9 @@ var/datum/subsystem/garbage_collector/SSgarbage wait = 5 priority = -1 dynamic_wait = 1 - dwait_delta = 5 + dwait_upper = 50 + dwait_delta = 10 + dwait_buffer = 0 var/collection_timeout = 300// deciseconds to wait to let running procs finish before we just say fuck it and force del() the object var/max_run_time = 1 // how long, in deciseconds, can we run before waiting for the next tick diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index a039417c3a3..053241cd2e7 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -7,7 +7,7 @@ var/datum/subsystem/lighting/SSlighting wait = 5 priority = 1 dynamic_wait = 1 - dwait_delta = 1 + dwait_delta = 3 var/list/changed_lights = list() //list of all datum/light_source that need updating var/changed_lights_workload = 0 //stats on the largest number of lights (max changed_lights.len) diff --git a/code/controllers/subsystems.dm b/code/controllers/subsystems.dm index 777bc2e5a1e..3d36430f592 100644 --- a/code/controllers/subsystems.dm +++ b/code/controllers/subsystems.dm @@ -5,10 +5,17 @@ var/name //name of the subsystem var/priority = 0 //priority affects order of initialization. Higher priorities are initialized first, lower priorities later. Can be decimal and negative values. var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer. + + //Dynamic Wait - A system for scaling a subsystem's fire rate based on lag + //The algorithm is: (cost-dwait_buffer+AvgCostOfAllOtherSSPerSecond)*dwait_delta + //defaults are pretty sane for most use cases. + //you can change how quickly it starts scaling back with dwait_buffer, + //and you can change how much it scales back with dwait_delta var/dynamic_wait = 0 //changes the wait based on the amount of time it took to process var/dwait_upper = 20 //longest wait can be under dynamic_wait var/dwait_lower = 5 //shortest wait can be under dynamic_wait - var/dwait_delta = 3 //How much should processing time effect dwait. or basically: wait = cost*dwait_delta + var/dwait_delta = 7 //How much should processing time effect dwait. or basically: wait = cost*dwait_delta + var/dwait_buffer = 1.5 //This number is subtracted from the processing time before calculating its new wait //things you will probably want to leave alone var/can_fire = 0 //prevent fire() calls diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 55cfeccf68c..5253e7dc68a 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -382,7 +382,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine name = "Standard Justice Enforcer Crate" contains = list(/obj/item/clothing/head/helmet/justice, /obj/item/clothing/mask/gas/sechailer) - cost = 30 //justice comes at a price. An expensive, noisy price. + cost = 80 //justice comes at a price. An expensive, noisy price. containername = "justice enforcer crate" @@ -1279,4 +1279,4 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/ammo_box/magazine/toy/pistol) cost = 40 containername = "foam force pistols crate" - contraband = 1 \ No newline at end of file + contraband = 1 diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 418aebff054..4d7cb7b8469 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -735,7 +735,7 @@ var/list/uplink_items = list() /datum/uplink_item/badass/bundle name = "Syndicate Bundle" - desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 10 telecrystals, but you do not know which specialisation you will receive." + desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 20 telecrystals, but you do not know which specialisation you will receive." item = /obj/item/weapon/storage/box/syndicate cost = 20 excludefrom = list(/datum/game_mode/nuclear,/datum/game_mode/gang) diff --git a/code/game/gamemodes/abduction/abduction.dm b/code/game/gamemodes/abduction/abduction.dm index 790ee290f47..cd462b1fd87 100644 --- a/code/game/gamemodes/abduction/abduction.dm +++ b/code/game/gamemodes/abduction/abduction.dm @@ -139,7 +139,6 @@ agent_landmarks.len = max_teams scientist_landmarks.len = max_teams for(var/obj/effect/landmark/abductor/A in landmarks_list) - world << "Found this [A]" if(istype(A,/obj/effect/landmark/abductor/agent)) agent_landmarks[text2num(A.team)] = A else if(istype(A,/obj/effect/landmark/abductor/scientist)) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index b8f023d7047..ba9b852999a 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -479,7 +479,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(prob(75)) user.visible_message("After a few attempts, [user] manages to light [src].", "After a few attempts, you manage to light [src].") else - user.adjustFireLoss(5) + var/hitzone = user.r_hand == src ? "r_hand" : "l_hand" + user.apply_damage(5, BURN, hitzone) user.visible_message("After a few attempts, [user] manages to light [src] - they however burn their finger in the process.", "You burn yourself while lighting the lighter!") user.AddLuminosity(1) @@ -503,7 +504,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!isliving(M)) return - M.IgniteMob() + if(lit) + M.IgniteMob() var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M,user) if(lit && cig) if(M == user) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 5404fa7eda1..297075cf669 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -325,7 +325,6 @@ /obj/item/weapon/twohanded/shockpaddles/attack(mob/M, mob/user) var/halfwaycritdeath = (config.health_threshold_crit + config.health_threshold_dead) / 2 - var/mob/living/carbon/human/H = M if(busy) return @@ -343,6 +342,7 @@ user << "The instructions on [defib] don't mention how to revive that..." return else + var/mob/living/carbon/human/H = M if(user.a_intent == "disarm" && !defib.safety) busy = 1 H.visible_message("[user] has touched [H.name] with [src]!", \ @@ -422,11 +422,7 @@ busy = 0 update_icon() return - if(H.heart_attack) - H.heart_attack = 0 - user.visible_message("[defib] pings: Patient's heart is now beating again.") - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) - if(H.stat == 2) + if(H.stat == DEAD) M.visible_message("[M]'s body convulses a bit.") playsound(get_turf(src), "bodyfall", 50, 1) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) @@ -447,7 +443,7 @@ H.adjustBruteLoss((mobhealth - halfwaycritdeath) * (total_brute / overall_damage)) user.visible_message("[defib] pings: Resuscitation successful.") playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) - H.stat = 1 + H.stat = UNCONSCIOUS dead_mob_list -= H living_mob_list |= list(H) H.emote("gasp") @@ -469,6 +465,10 @@ update_icon() cooldown = 1 defib.cooldowncheck(user) + else if(H.heart_attack) + H.heart_attack = 0 + user.visible_message("[defib] pings: Patient's heart is now beating again.") + playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) else user.visible_message("[defib] buzzes: Patient is not in a valid state. Operation aborted.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index b8c72c0827b..10c9ab9737c 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -123,6 +123,10 @@ imp_in.gib() explosion(src,heavy,medium,weak,weak, flame_range = weak) qdel(src) + return + timed_explosion() + +/obj/item/weapon/implant/explosive/proc/timed_explosion() imp_in.visible_message("[imp_in] starts beeping ominously!") playsound(loc, 'sound/items/timer.ogg', 30, 0) sleep(delay/4) @@ -156,21 +160,7 @@ if(E != src) qdel(E) imp_in << "You activate your macrobomb implant." - imp_in.visible_message("[imp_in] starts beeping ominously!") - playsound(loc, 'sound/items/timer.ogg', 30, 0) - sleep(delay/4) - if(imp_in.stat) - imp_in.visible_message("[imp_in] doubles over in pain!") - imp_in.Weaken(7) - playsound(loc, 'sound/items/timer.ogg', 30, 0) - sleep(delay/4) - playsound(loc, 'sound/items/timer.ogg', 30, 0) - sleep(delay/4) - playsound(loc, 'sound/items/timer.ogg', 30, 0) - sleep(delay/4) - imp_in.gib() - explosion(src,heavy,medium,weak,weak, flame_range = weak) - qdel(src) + timed_explosion() /obj/item/weapon/implant/chem name = "chem implant" @@ -254,7 +244,8 @@ return 1 /obj/item/weapon/implant/loyalty/Destroy() - loc << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away." + if(imp_in.stat != DEAD) + imp_in << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away." ..() /obj/item/weapon/implant/adrenalin diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 27d36934ae6..213faa834c0 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -209,8 +209,11 @@ var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) if(affecting.status == ORGAN_ROBOTIC && user.a_intent != "harm") - if(src.remove_fuel(0)) - item_heal_robotic(H, user, 30, 0) + if(src.remove_fuel(1)) + playsound(loc, 'sound/items/Welder.ogg', 50, 1) + user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.getDisplayName()].", "You start fixing some of the dents on [H]'s [affecting.getDisplayName()].") + if(!do_mob(user, H, 50)) return + item_heal_robotic(H, user, 5, 0) return else return diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index ca90bd6e6d7..0a7112be964 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -9,6 +9,11 @@ smooth = 1 can_be_unanchored = 0 canSmoothWith = null + var/image/nest_overlay + +/obj/structure/stool/bed/nest/New() + nest_overlay = image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2) + return ..() /obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user as mob) if(buckled_mob && buckled_mob.buckled == src) @@ -59,12 +64,12 @@ M.pixel_y = 0 M.pixel_x = initial(M.pixel_x) + 2 M.layer = MOB_LAYER - 0.3 - overlays += image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2) + overlays += nest_overlay else M.pixel_x = M.get_standard_pixel_x_offset(M.lying) M.pixel_y = M.get_standard_pixel_y_offset(M.lying) M.layer = initial(M.layer) - overlays.Cut() + overlays -= nest_overlay /obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob, params) var/aforce = W.force diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index a2851a7c4c4..6edae35f9e9 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -107,8 +107,6 @@ /turf/proc/is_plasteel_floor() return 0 -/turf/proc/return_siding_icon_state() //used for grass floors, which have siding. - return 0 /turf/proc/levelupdate() for(var/obj/O in src) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 0702f6b741d..6bfa9615112 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -78,7 +78,7 @@ alt_toggle_message = "You turn on the lights on" action_button_name = "Toggle Justice Lights" can_toggle = 1 - toggle_cooldown = 14 + toggle_cooldown = 20 activation_sound = 'sound/items/WEEOO1.ogg' /obj/item/clothing/head/helmet/justice/escape diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 6bb3a5abab4..80673b4262f 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -16,10 +16,16 @@ /datum/round_event/vent_clog/setup() endWhen = rand(25, 100) +<<<<<<< HEAD for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in machines) if(temp_vent.loc.z == ZLEVEL_STATION) var/datum/pipeline/temp_vent_parent = temp_vent.parents["p1"] if(temp_vent_parent.other_atmosmch.len > 20) +======= + for(var/obj/machinery/atmospherics/unary/vent_scrubber/temp_vent in machines) + if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded) + if(temp_vent.parent.other_atmosmch.len > 20) +>>>>>>> remotes/upstream/master vents += temp_vent if(!vents.len) return kill() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 0f282ea5811..c3c789b3b9d 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -78,23 +78,21 @@ shock_damage *= siemens_coeff if (shock_damage<1) return 0 - src.take_overall_damage(0,shock_damage) + take_overall_damage(0,shock_damage) //src.burn_skin(shock_damage) //src.adjustFireLoss(shock_damage) //burn_skin will do this for us //src.updatehealth() - src.visible_message( + visible_message( "[src] was shocked by \the [source]!", \ "You feel a powerful shock coursing through your body!", \ "You hear a heavy electrical crack." \ ) - if(prob(25) && heart_attack) - heart_attack = 0 jitteriness += 1000 //High numbers for violent convulsions do_jitter_animation(jitteriness) stuttering += 2 Stun(2) spawn(20) - src.jitteriness -= 990 //Still jittery, but vastly less + jitteriness = max(jitteriness - 990, 10) //Still jittery, but vastly less Stun(3) Weaken(3) return shock_damage @@ -371,12 +369,6 @@ var/const/GALOSHES_DONT_HELP = 8 /mob/living/carbon/is_muzzled() return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle)) - -/mob/living/carbon/revive() - heart_attack = 0 - ..() - return - /mob/living/carbon/blob_act() if (stat == DEAD) return diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 50a9c2c47fe..95e6875e55d 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -19,7 +19,6 @@ var/obj/item/head = null var/datum/dna/dna = null//Carbon - var/heart_attack = 0 var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks. diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 4326f45dad2..2f84b03bd20 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -22,6 +22,7 @@ stat = DEAD dizziness = 0 jitteriness = 0 + heart_attack = 0 if(istype(loc, /obj/mecha)) var/obj/mecha/M = loc diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 8392a006fba..1f5f0b11935 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -272,6 +272,11 @@ if(gloves) var/obj/item/clothing/gloves/G = gloves siemens_coeff = G.siemens_coefficient + if(heart_attack) + if(shock_damage * siemens_coeff >= 1 && prob(25)) + heart_attack = 0 + if(stat == CONSCIOUS) + src << "You feel your heart beating again!" return ..(shock_damage,source,siemens_coeff) /mob/living/carbon/human/Topic(href, href_list) @@ -280,11 +285,13 @@ if(href_list["embedded_object"]) var/obj/item/I = locate(href_list["embedded_object"]) var/obj/item/organ/limb/L = locate(href_list["embedded_limb"]) - if(!I || !L || I.loc != src) //no item, no limb, or item is not in limb (the person atleast) anymore + if(!I || !L || I.loc != src || !(I in L.embedded_objects)) //no item, no limb, or item is not in limb or in the person anymore return var/time_taken = I.embedded_unsafe_removal_time*I.w_class usr.visible_message("[usr] attempts to remove [I] from their [L.getDisplayName()].","You attempt to remove [I] from your [L.getDisplayName()]... (It will take [time_taken/10] seconds.)") if(do_after(usr, time_taken, needhand = 1, target = src)) + if(!I || !L || I.loc != src || !(I in L.embedded_objects)) + return L.embedded_objects -= I L.take_damage(I.embedded_unsafe_removal_pain_multiplier*I.w_class)//It hurts to rip it out, get surgery you dingus. I.loc = get_turf(src) @@ -304,11 +311,9 @@ if(href_list["pockets"]) var/pocket_side = href_list["pockets"] var/pocket_id = (pocket_side == "right" ? slot_r_store : slot_l_store) - var/obj/item/pocket_item = (pocket_id == slot_r_store ? src.r_store : src.l_store) + var/obj/item/pocket_item = (pocket_id == slot_r_store ? r_store : l_store) var/obj/item/place_item = usr.get_active_hand() // Item to place in the pocket, if it's empty - //visible_message("[usr] tries to empty [src]'s pockets.", \ - "[usr] tries to empty [src]'s pockets.") // Pickpocketing! var/delay_denominator = 1 if(pocket_item && !(pocket_item.flags&ABSTRACT)) if(pocket_item.flags & NODROP) @@ -322,7 +327,8 @@ if(do_mob(usr, src, POCKET_STRIP_DELAY/delay_denominator)) //placing an item into the pocket is 4 times faster if(pocket_item) - unEquip(pocket_item) + if(pocket_item == (pocket_id == slot_r_store ? r_store : l_store)) //item still in the pocket we search + unEquip(pocket_item) else if(place_item) usr.unEquip(place_item) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 9b373ba72f4..a47ae39f009 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -51,4 +51,6 @@ var/datum/martial_art/martial_art = null - var/name_override //For temporary visible name changes \ No newline at end of file + var/name_override //For temporary visible name changes + + var/heart_attack = 0 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index c99b39e3995..bfa438e032f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -42,6 +42,9 @@ for(var/datum/mutation/human/HM in dna.mutations) HM.on_life(src) + //heart attack stuff + handle_heart() + //Stuff jammed in your limbs hurts handle_embedded_objects() //Update our name based on whether our face is obscured/disfigured @@ -85,55 +88,48 @@ /mob/living/carbon/human/handle_mutations_and_radiation() - if(dna) - if(dna.species.handle_mutations_and_radiation(src)) - ..() + if(!dna || !dna.species.handle_mutations_and_radiation(src)) + ..() /mob/living/carbon/human/breathe() - if(dna) - dna.species.breathe(src) + if(!dna || !dna.species.breathe(src)) + ..() - return +/mob/living/carbon/human/check_breath(datum/gas_mixture/breath) + if(!dna || !dna.species.check_breath(breath, src)) + ..() /mob/living/carbon/human/handle_environment(datum/gas_mixture/environment) if(dna) dna.species.handle_environment(environment, src) - return - ///FIRE CODE /mob/living/carbon/human/handle_fire() - if(dna) - dna.species.handle_fire(src) - if(..()) - return - var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures - if(wear_suit) - if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT) - thermal_protection += (wear_suit.max_heat_protection_temperature*0.7) - if(head) - if(head.max_heat_protection_temperature >= FIRE_HELM_MAX_TEMP_PROTECT) - thermal_protection += (head.max_heat_protection_temperature*THERMAL_PROTECTION_HEAD) - thermal_protection = round(thermal_protection) - if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT) - return - if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT) - bodytemperature += 11 - return - else - bodytemperature += BODYTEMP_HEATING_MAX - return + if(!dna || !dna.species.handle_fire(src)) + ..() + if(on_fire) + var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures + if(wear_suit) + if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT) + thermal_protection += (wear_suit.max_heat_protection_temperature*0.7) + if(head) + if(head.max_heat_protection_temperature >= FIRE_HELM_MAX_TEMP_PROTECT) + thermal_protection += (head.max_heat_protection_temperature*THERMAL_PROTECTION_HEAD) + thermal_protection = round(thermal_protection) + if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT) + return + if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT) + bodytemperature += 11 + else + bodytemperature += BODYTEMP_HEATING_MAX + /mob/living/carbon/human/IgniteMob() - if(dna) - dna.species.IgniteMob(src) - else + if(!dna || !dna.species.IgniteMob(src)) ..() /mob/living/carbon/human/ExtinguishMob() - if(dna) - dna.species.ExtinguishMob(src) - else + if(!dna || !dna.species.ExtinguishMob(src)) ..() //END FIRE CODE @@ -338,13 +334,12 @@ if(!has_embedded_objects()) clear_alert("embeddedobject") -/mob/living/carbon/human/handle_heart() +/mob/living/carbon/human/proc/handle_heart() if(!heart_attack) return else losebreath += 5 adjustOxyLoss(5) adjustBruteLoss(1) - return #undef HUMAN_MAX_OXYLOSS diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 43772593e9e..bfd11f1bc46 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -782,7 +782,8 @@ randmutb(H) domutcheck(H,null) H.emote("gasp") - return 1 + return 0 + return 1 //////////////// // MOVE SPEED // @@ -1138,6 +1139,7 @@ ///////////// /datum/species/proc/breathe(var/mob/living/carbon/human/H) +<<<<<<< HEAD if(H.reagents.has_reagent("lexorin")) return if(istype(H.loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) return @@ -1192,6 +1194,9 @@ if(breath) H.loc.assume_air(breath) +======= + return +>>>>>>> remotes/upstream/master /datum/species/proc/check_breath(datum/gas_mixture/breath, var/mob/living/carbon/human/H) if((H.status_flags & GODMODE)) @@ -1457,31 +1462,14 @@ /datum/species/proc/handle_fire(var/mob/living/carbon/human/H) if((HEATRES in specflags) || (NOFIRE in specflags)) - return - if(H.fire_stacks < 0) - H.fire_stacks++ //If we've doused ourselves in water to avoid fire, dry off slowly - H.fire_stacks = min(0, H.fire_stacks)//So we dry ourselves back to default, nonflammable. - if(!H.on_fire) - return - var/datum/gas_mixture/G = H.loc.return_air() // Check if we're standing in an oxygenless environment - if(G.oxygen < 1) - ExtinguishMob(H) //If there's no oxygen in the tile we're on, put out the fire - return - var/turf/location = get_turf(H) - location.hotspot_expose(700, 50, 1) + return 1 /datum/species/proc/IgniteMob(var/mob/living/carbon/human/H) - if(H.fire_stacks > 0 && !H.on_fire && !(HEATRES in specflags) && !(NOFIRE in specflags)) - H.on_fire = 1 - H.AddLuminosity(3) - H.update_fire() + if((HEATRES in specflags) || (NOFIRE in specflags)) + return 1 /datum/species/proc/ExtinguishMob(var/mob/living/carbon/human/H) - if(H.on_fire) - H.on_fire = 0 - H.fire_stacks = 0 - H.AddLuminosity(-3) - H.update_fire() + return #undef HUMAN_MAX_OXYLOSS #undef HUMAN_CRIT_MAX_OXYLOSS diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index fc74ade712d..6573b1465cb 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -10,10 +10,7 @@ if(..()) //Updates the number of stored chemicals for powers handle_changeling() - //Heart Attacks, etc. - handle_heart() - - . = 1 + return 1 /////////////// // BREATHING // @@ -238,8 +235,6 @@ if(reagents) reagents.metabolize(src) -/mob/living/carbon/proc/handle_heart() - return /mob/living/carbon/handle_stomach() spawn(0) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 74ecd2ffa6a..fed1558c693 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -708,7 +708,7 @@ Sorry Giacom. Please don't be mad :( "[src] tries to remove [who]'s [what.name].") what.add_fingerprint(src) if(do_mob(src, who, what.strip_delay)) - if(what && Adjacent(who)) + if(what && what == who.get_item_by_slot(where) && Adjacent(who)) who.unEquip(what) add_logs(src, who, "stripped", addition="of [what]") @@ -719,11 +719,14 @@ Sorry Giacom. Please don't be mad :( if(what && (what.flags & NODROP)) src << "You can't put \the [what.name] on [who], it's stuck to your hand!" return - if(what && what.mob_can_equip(who, where, 1)) + if(what) + if(!what.mob_can_equip(who, where, 1)) + src << "\The [what.name] doesn't fit in that place!" + return visible_message("[src] tries to put [what] on [who].") if(do_mob(src, who, what.put_on_delay)) if(what && Adjacent(who)) - src.unEquip(what) + unEquip(what) who.equip_to_slot_if_possible(what, where, 0, 1) add_logs(src, who, "equipped", what) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index e41881fa2f8..978df4d981d 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -121,14 +121,20 @@ return /mob/living/proc/adjust_fire_stacks(add_fire_stacks) //Adjusting the amount of fire_stacks we have on person - fire_stacks = Clamp(fire_stacks + add_fire_stacks, min = -20, max = 20) + fire_stacks = Clamp(fire_stacks + add_fire_stacks, min = -20, max = 20) + if(on_fire && fire_stacks <= 0) + ExtinguishMob() /mob/living/proc/handle_fire() - if(fire_stacks < 0) - fire_stacks++ //If we've doused ourselves in water to avoid fire, dry off slowly - fire_stacks = min(0, fire_stacks)//So we dry ourselves back to default, nonflammable. + if(fire_stacks < 0) //If we've doused ourselves in water to avoid fire, dry off slowly + fire_stacks = min(0, fire_stacks + 1)//So we dry ourselves back to default, nonflammable. if(!on_fire) return 1 + if(fire_stacks > 0) + adjust_fire_stacks(-0.2) //the fire is slowly consumed + else + ExtinguishMob() + return var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment if(G.oxygen < 1) ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index b98482bb11e..8b2e9f5ae2e 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -514,7 +514,9 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \ var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) if(affecting.status == ORGAN_ROBOTIC) - item_heal_robotic(H, user, 0, 30) + user.visible_message("[user] starts to fix some of the wires in [H]'s [affecting.getDisplayName()].", "You start fixing some of the wires in [H]'s [affecting.getDisplayName()].") + if(!do_mob(user, H, 50)) return + item_heal_robotic(H, user, 0, 5) src.use(1) return else diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 5f2b72bd833..63ac0410ec1 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -9,7 +9,7 @@ throwforce = 5.0 throw_speed = 2 throw_range = 5 - w_class = 3.0 + w_class = 2 var/charge = 0 // note %age conveted to actual charge in New var/maxcharge = 1000 materials = list(MAT_METAL=700, MAT_GLASS=50) @@ -276,4 +276,4 @@ return /obj/item/weapon/stock_parts/cell/emproof/corrupt() - return \ No newline at end of file + return diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 6f442a439a6..e891aceb82c 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -471,7 +471,7 @@ // if hands aren't protected and the light is on, burn the player /obj/machinery/light/attack_hand(mob/living/carbon/human/user) - + user.changeNext_move(CLICK_CD_MELEE) add_fingerprint(user) if(status == LIGHT_EMPTY) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index b688248a352..c2aec9dd829 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -61,7 +61,7 @@ qdel(G.pin) G.pin = null visible_message("[G] can now fit a new pin, but old one was destroyed in the process.") - qdel(src) + qdel(src) /obj/item/weapon/gun/examine(mob/user) ..() diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index c31eedd7b5d..6e8d226b7e7 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -80,7 +80,6 @@ user << "[src] blows up in your face!" user.take_organ_damage(0,20) user.unEquip(src) - qdel(src) return 0 ..() diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm index ee938882277..8a9ecf7173f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm @@ -171,9 +171,6 @@ return if(method == TOUCH) M.adjust_fire_stacks(-(volume / 10)) - if(M.fire_stacks <= 0) - M.ExtinguishMob() - return /datum/reagent/water/holywater name = "Holy Water" diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm index e8d4ebf6909..545f4020afb 100644 --- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm @@ -44,7 +44,8 @@ /datum/reagent/clf3/on_mob_life(var/mob/living/M as mob) M.adjust_fire_stacks(2) - M.adjustFireLoss(0.3*M.fire_stacks) + var/burndmg = max(0.3*M.fire_stacks, 0.3) + M.adjustFireLoss(burndmg) ..() /datum/reagent/clf3/reaction_turf(var/turf/simulated/T, var/volume) diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm index 212414de446..04b93d4c856 100644 --- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -493,13 +493,15 @@ M.losebreath += 10 M.adjustOxyLoss(rand(5,25)) if(3) - var/mob/living/carbon/human/H = M - if(!H.heart_attack) - H.visible_message("[H] clutches at their chest as if their heart stopped!") - H.heart_attack = 1 // rip in pepperoni - else - H.losebreath += 10 - H.adjustOxyLoss(rand(5,25)) + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(!H.heart_attack) + H.heart_attack = 1 // rip in pepperoni + if(H.stat == CONSCIOUS) + H.visible_message("[H] clutches at their chest as if their heart stopped!") + else + H.losebreath += 10 + H.adjustOxyLoss(rand(5,25)) ..() /datum/reagent/toxin/pancuronium diff --git a/code/modules/surgery/organs/cybernetic_implants.dm b/code/modules/surgery/organs/cybernetic_implants.dm index 7230c1d0572..61a58711ac8 100644 --- a/code/modules/surgery/organs/cybernetic_implants.dm +++ b/code/modules/surgery/organs/cybernetic_implants.dm @@ -366,10 +366,14 @@ else cooldown += 200 - if(prob(50 / severity)) - owner.heart_attack = 1 - spawn(600 / severity) - owner.heart_attack = 0 + if(istype(owner, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = owner + if(H.stat != DEAD && prob(50 / severity)) + H.heart_attack = 1 + spawn(600 / severity) + H.heart_attack = 0 + if(H.stat == CONSCIOUS) + H << "You feel your heart beating again!" //BOX O' IMPLANTS diff --git a/html/changelogs/ikarrus-maint.yml b/html/changelogs/ikarrus-maint.yml new file mode 100644 index 00000000000..511a39906bc --- /dev/null +++ b/html/changelogs/ikarrus-maint.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Ikarrus + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Robotic augmentations have been made a bit more difficult to maintain." \ No newline at end of file diff --git a/sound/items/WEEOO1.ogg b/sound/items/WEEOO1.ogg index 71707a1d2dc1cec2784c00f2adf6189777686341..1d9f9c7d772a7409e1ed23b46cc875b3b4c88ea8 100644 GIT binary patch literal 8482 zcmbt(2|U!_yZ@Q7uc>Sa4dH9w_f#m`*k_Ejv5!nlVhl+%)}%-pLbAlrj7UOR^R?B-QT_Ue_!|Yy7%?^e_rQv<~ip)=Q+=Lp7(j?IWzXBPon`G{QKj< z`G=4d%wd5^!XiS#eDTDcE||3QpOH4~pHDi>erM)?JUcUCPz!PI;A#FN+yCXsWBDUS z2^w|9p9@sA4?B$r#``+&3P)HWG}SdU)iu?%5c2kfv-opiI3n(BxWbNP7~7wz(xxYz zVE|fzjNm@dO&-p`03ZN>X^MHbLpg=@R(z6xMW@5%j8%s-9}wq}KD{|>fy`;tOl1UXR&A(mt(#Hrzxk80atdIq#>8-IwDa(b$&YRQ_H#} zC!ZS|fUKghy-54h0>dLnzYiJ>6*RwN=Dt0 zDqVu;;D#>Oph}(j*Fg?_qJGyjy8pA{+}#HPfJ77a1O7XblXivf$m{vDEd(I%?A+pp zVDAm_-WxJjH8R#CGDBaLp<=&Z#}RFYAz>!#VkU3JOh%F>9>+{Xklb$J+#(4cw@5DI zB<%lNcDIgzfuh3(>ANNKutFw0G5J0m`0toxRzCe7{mjD#*?v~prB-?G+zQ^|3*^q+ z<=AC`Jj%MG4JeXN{YO6iuvIn{pEpk{kWVe6)9>Qxbb4MH{(mXPfzK3yF&r58go^h# zibFNDE3RD&KLe0Y+Z+TfZix3klo=R-_Ne_r>!=IGc4`!J@Lx{&1Ie~8;zM7=?Y}~% zfCw4;5p7$>|FQfrEQE1HifOXOzra8ixO+omR6+J{s<%|{$;!P;iC{p`WqhSN3XPS z>^hkY0Pi2X|g~?ci$yjA7 z_hxGMJ~HZu3ge{hsFNcG%Zwn*e8)SS z>2tf~tz~K{D3+=K;K0st*H10cPk(Ef{?0X17M~dqm3=xYul!2h0&JJX_)kOtKtA=Z ze(IcMCJvwXK8pTV>RlS09+(HA=YIu{oPbyjH^=~B7y?hIAOxPBUBP!Pthswa1-l$& zdcu^g9%(~+v|Y0q62hVNNKE#BIpI%eJ7?5GH0rr&1epRNdT;(8k+Z`F8CG`Zq>vFk zwFxp@iAC{m4|IxmmL5ogC_{GHuD4Ry_RM7XD!87rb*EAMH{gXA=rHFPWJ>p4DiX0Lo2ULeBG2P@|QG%19MOK0X z%Hj@yA_xcc@)Qqe2*Hf=0of!|dtgL+=#lo&s*$4;#$FJ^+;^0*W`o8YWjJBbIye_6 zTeo_n7uq|`A#Dss8#AF}%OoAe)ZrKyl3O@tDuOWa80#i{)*gfNaKd`%VO+*AZuK!P z^#redW*8yN4l@bMB#|b=vDkGdOoZ)t7LGw8OptIME;zRh9n7C*ICdfe=kgfiHb!_s zios^#-ss^b)^Q%=F>a5ue8RDl5c9gNn{ezzb`k_gubh*Pn4_31EQH(faIA+5cD!DP zNx|+&cEY+jL(Ev0F_J9?H$lNo>SA58F>c>UF4-gxNDVz`T}V%o%i}aZNKa9$3nY0g z29r(l8YB7SkS51Bz=e!uEmUW9D2*lcE70dX0^CqOm^uXJ_>3^(x^c4_D7A-NkPECuuYHX!HlS ztAc)&DgSJ|KiPinXKUESs->TF<%3TZC)-1o8pD=b?SGsa7jbqIPG)8&`9KOyB>B)@ zHEK3DhKN6?ROUT3Ecy^2a~#;YcaYY}1zcr% zSC#wsnf2G4bkv5tVdjWYvDLD*U9~|ojG!oqCYdpuu+|J4^r|*v)M!B4mKly=Xyee@ zwvY)J5oVBcm{~YC5*90L%g8cghT|Z9sOjPiSyUDhH2{fPg+yT(S&%er|Ed#u^(5mP z2)SJw<5F)lsa3hZUYSl`%BxcBFQfO>EB805_SaWeR0U0zE%r4k^@qFFVQ0P*8W$Vu zAM{l{XsQWbs`|KCb9SeT~YC>etGhkhYJbH zZ`#N#z?jU1D;mzo0>**>c=P&QGYO=G4H|H!p#}{&q=@{coHYMI6VBq&=LVeAQi=gb zF@<6ZQKRmh5akYKTt#g#fM{d4z0w7P(82{u;XqW}f?>lT;U+|dA&P-zRwEUp>+}k z<1q_blA9W0=AWMZL{iP)T~U?Gc;&G zQ6+I0Wkt<$-Vs1S%0p_nE7G9+CXkvmg0zCBAr%#j7u=mBO z>k2iRr~aS)w}*un490v1~`v~96B3LDf@@arDXq0{v%`Xv>wlzUhtjY z56Nj02ad}W+EBWbQ~YvmlnWKEQ-w4TPo8h}06Bt^bs_Ju+}6u$O)PCCY_&BM6t}ON z>A2+S%Y)*B^BqZ`oRWxz&wloU+MJe1byeb4yscU8B1z1%{Rz^VIZJa38X1>e&@ zR`~m!vg%<~YTt#p`;iyS8*$hQUA%A6;Q6=m!lcYCoi;C|D)BF!K|3XfbEKhU;@rHQ z9)oCCe%(;TCTXxG>L_0pbPuCSUmwk6DZd?4dj);z?APm|vsX0?I!EtZKUPtu$J3G{ z?9Co$_UgAtVme$hbnv%=o}CCk$^RQOoYtrlq4HX|0yAykb-hYST&2ITrZr}p4kd!0 zua55lsUKsG8IJ^@b*gna?>Ybpn_&ThIS1R2I)_;3l`X?hylgX;R;$(@oJiBL-Hgwh z-@g4gh4oUkX#4hL?RT>g40x}^#rc3WjIen!Z1~ds@k7_U!-05FF%LUl`^NA=VPeX5 zv$g-{s@}L|$0CQUpM6J;)4PX0zAM(x?g$uuIk_#-Vk8W}%cZG6a5l;`H2x5e8XsqU zO9M3^;DwBAUrx8bqPVAs*lMi%unqm^OX`dtVY#<-3w(d9t0j2eAr)@|9=&~m6M25x^RG?QV~jTcxGw*^L{>$T z((Tym=TBb597ZY}$e}x;S1(tseAz~b{j=fn*bh`|J}(>^NF}E|wIgDtV4dx+(~g)I zl~}=8WoQc6o1DlOE$s3@GRk9V8uj`?>jS;wad9$C-Bu{&v^BY*bv5Qf0kN+M?GxwK zoGZ5f*d?b#u<|qR(50+6>)EC=G3Cy0TCVK>yEE5lVU)9tQlu>$>2YG_$sM(Z)Ar7c z=>Yma^@}g`3X?`0bXd=Aesl$|6Mod2gR`aV@(guyP*nec*9Bu%41-Pe(4qxOt+o4z zn66^u$Y5}u)xQ05q)F>bUWe?}qTS5{4+&!$<`?^VwDYA+X0~D8``3pWYGE61C$9$J zKjTDyg~^6m1X$kp9FH`P=rBw)u)Z8$%2hS2pv- zx;^~Ud#B={g*h**IM9v_uyvbl{d8ftH|qu{i9XFTKaNK{m0S`z_eLJvTm$C^mTkN* z{3?~vjBNR_kyfspGy~sSgo9VCfVYZHU(>(-JwYuNC4{AI_{TMkBU*%^Qyyj);W|LngPwCni-OH^>^iGeFuPy(P;rt75t%%&trCTof z4>;TWRzA!ndT$6f2|6u)<#|>e3bc(kaD_(g#VFa3wU&hh%xM+%R`kHFV@4I-b8@93eA@Eu?QWtZDqsRV! zur^Qb{jmzRnS-Q~Y-%(*uuDYNwQQdB=9jd2u`5Dr@wuCzm>BWqnzun#(2b4*u;G(= zdYHnJ%_?71o>#2raj$Un;|e9^@S_z!-%%eMKGsuh{L!uNS1H@A%f2SUVtA_guG7H6 zs^pViRdt<5`Q{D+m#>s*JU=oE_7U|eo5~p5I=R)W&ZM5Xg{$r7eoWVXn+T6uCiz%0 z)C)bGx_Ms~ExnWWlqPsh`p-xg(^XKq<)nZyGnz} zMYfEUTwhRm+P=tS0U`TNVTcMrZg-E`^BpxP)H}p@8Tt@2<;C)1YVeUBhDXp&G=$T* zIyc3hY!Ei!oC<(<$kQ_$X z-G1I-G{!9!8W-Dqw%78QPNvt^GZ;{!uY~OZ>P=DhD-Y-JDI004^W`~WYjr^v3nux< z#Pyg2FUf^I&hR|AnMrurTp-0b=RxFz_ZbecNM!6&ZTmyFW*L=(&1!=fiOKbEIM(k! zXXJ%7Up!oG_L`|sV*|4XUJn|+fps36s)B*mH=7D4cB)9^p_A>>;MnOtV@F?vSxAaK}81ed-5u zSevIDP6|^{a)HMh!iW{4;PGEF=W!gO%eQ3$x4IIGa?VvbazEGNi!AS`h6{&GVhfi( zZe@A6n|>t=gJgQ1S`bVS?QA6U`_$Eh1B>cI^FeBX!)qnCc)U}BHI6v@zTmGms^JLo zK4bM5v+0D)qa+XiT_SJl$FA)HREZUHU;ernt@Vp(Wgx%>itmZdN6CRA=HU|>XUSPd zOUQ0dw>uF|)Uj-TJbT?$Nu} z6cd3gx_724?ctLZ!{X~+r})9=YOgAJZg4?~yZlLLFDp3~uv}5ddXLYd1gy6xVg2kX z8%$T)8G+oyvk7oTLaR}M&no#To8WP8SffY+4LRWP@pk-$!QTk6j52=n;^1$iZU$yE zQf;$k@xE2C4!)jSNm7f?X-jF>Fl+oDi!>DyD8FC9^_t?)uM{k`fo6z6`iGlCGLkj= zu(rN+sWX@?>B8FD&)U&&rNc|Z+xcJiOp3FF(m1`VgGFv?EZeuRav#5T=dk4_kuRY9 zvRycTDen+38o$uXqDn9_7*Sa?%?y1M1suL&v@kkaU%v<6r{U|j+8dBW~rqB6gjd< zl_7=7N}3`|^gGT)4pa0W%h;^)Um57G{#@_H%ArBe1B&ykz(Fx}ZRvpP@qy{?>afk+ ziOyff8dHr++cZf=4vorQ)}H&N>`J|C!!=WTF+%+BGY38XF7B+?X0|FeUuB{vB&b6c z$4OqLQ>T71nNXtJ5iRE}{G=uqAf9wSu>E0d^I9(8*7;OM&ahY?(sb}-^>Y@n(7$7= z4)(wK;=6vVoOWRmuP9Rf=vH|`RQhC8O2#POpmqEG_&YXoiv_*S#0!^Ag6AI<(R00| zNKUj{p}pZ67kd_2Nj-SmeQ%g4&%O}x)?4*p&E)q2mOUd!KWP_;^8Mc=~ng?RsEc%>T$h_oiGojA}G$NpHixAwQR{?%*6GB;l zuzJ5?1-So_4ROLEC-ss>8N-Mor(;xvmv21zWv`uMkv1QcXf;ib<*R9rAB?%PTt;jB zZriX~?|dzl>zv2$Zc*?un#Pn6c%-YN=-pm+VSD4n-(A`n)_3T$GB%0(PZnrN(C{`O zw%$%qGi;BV_Wrh=iYat0BI^?)2Ihn^0 z)RBKQ*K)lL;2q-#w*k~S5+nS*;80L1iyU#%di#9L>*D*PVWt#uVNAd5&(`Cb@U;h? zEW>B!8Mh*gT&JnLjMngKOeG9u9l;{?WOUM(@8a>83+}I;-LQ6G0jGP98cL<4{{vJb z8SggGlV=rv4-B0-M1S?DeSq+eBoh!f_fxGBUi~DCl!Y-4kKOG0)Juka@+6tLb}MaoMtJXc;k|yE5%uKb(`#3G937{+In5eeDZ5r@b1=rOhSS`gdcx<% zA_0CRTJRsizik*d@)+V{K$FlZ!8|BrHR}Hb6n#43dn^bucZTnLcC9LTsYT5D+qZ>x z8p5T=(aFql$&9?@`7MctS#|N~I=A__Pc*;_%-BscO-ZF>4#?8Z8NvT3uxSS7+&=5X`bV>@FQ`R5}*0_ zg?O2rit?NL8Kd`}Y6&qi497!d@W;$ryQL6dUx#N8(~_&Am@|HjW5YohIcC zs!nN;(lobhhs3>KXFqy~aCCCzF?Y~Q51r+eoo)XWoN2K1m-n?o%c2hp{RK&!f=lc+ zw}(v^{7>dvQ-v|Emm5raB)e)2OEI}GMA+mE-NFTB;?#_B{otOZ2heG?0< zfFg0b_*Vt2bc)?a$;F1xL#Ru=YurmZx@Jz`{k6Y_o5NpbqprWVa^x2a5#3&Vc|`Ei zLA4hD!g>1H&S$43#cnkIey=p=7TBqs)EPw0%b%#DF(WEdozj8;~er4JJ72(48+ha4H z(!l$%Jn)?R$&Ln#1fjCy?^W*hh-4z}@FTUq77xhByS+aoMnYbCo)G!^4WV)LisV}u zKGf66!i=;oR2961lk$0ijrvql3;hvVU84+UPhEJV0xQyteW=W~UvOXg;ht5;*EcUX zhMSe|zj#b!M4GUlHpMDOLj78jPrEbEy?L&jGryvuHKq~$jk*|-mpmVN?b=^_kGGGA z!9*_+S%x?=3g)M?S-daptJ_!=qlIo?sE+3!mIW^K2Rci*7Ri%bHEN7@LU0z(@!C90!touzaLM^kL%YP8Ao zfIYpKx<2_W(L$8?_5P$5;zn9OjGSMnKIke)t{2YMae33XaS|5yGPc*>sIQL z+nPS!6R4z8XAw7VgJszlI_dX7@srxLvSt4a(`hRAQ)(pBM58JpdE(OizFD|1j%C|A zhy`|0VqY!a^<{T5rdi(Kc;)soBD`%c=i8vQszA$b2Ou0ec>+qqekk5{M}{2|uA*O# zUTyF?>Z=3Y%J0~d?>rE#s*$kcRSF8P+_${0`{+c-lsK6Et3KsE>=dF}?Cf*DCqP<< zBk&V)|GqpfRYJwmoc%(C(l6!<2R`L}z|@AhdFM17KT~;`jU?NdeQmh1S`NkiHs~@e|OLVS$naHmhvIX4|Jvx4!y?s=X{;3LoY~aB$ z9r2k@#mfXL%hjP1Lj#XnXkFZF6>tdHHSwj#p8W=}viO;IPvV1|9^ z!fW_1J{IzptepL+a2a2kuCYgRUD`YUZ6)S@z;^QoaW5yoWWcJHwU24s9xII#ftdUL zL`8zOc=AD2nFGRCwLr7ixHJ7sS<7=n#gY8^t#^T!A2?ONEHDp|@?L4?I$j16jYfQw z9GcEv(tMIM%IPVeXI^4!@XxhHCw-V9pTjvx{vf5f>Cf!lKF#B1n2w(HhN*m2m#%?{ zp{pVl$1Z5Sf99<&_+eVv{7h5l*YD`huLi#6`-C^N+!nnxr}_2ha|Np;e#g-D-1 literal 13533 zcmch-byQWs7cYJ&2>~gQ4#}&4(%m2>0vD8!kZzEcMn$@$r2En#ap_P}TDmU^($a8g zc<18x``&uLKYr`2_11c4opabTduH#M{h7UIpW&)mT51C5z<(}X-hadcvm!DyIy84j zXA^4|R2AC8SN}Nb9sm9op{b#I{?7~56Adi&qU}%+ao+rI7e2;6L9`%W$NH@mmzuLB zgPpa>t6T95N(?+tp9($|;Nd|@L&N&lm{~^l6&fG~02DGrkFd&2qeOn(XN;iC$&%@V z^w7%uWXxrj4H4<)@1ZbNXfO+t>3#n*<|TmYkVm7f?ySVQmgbU6p*`TV&Hz#?43+~< zxGW$QCA=2v9L4>QOXv(iwR=yd5av`s0aAH1AXSK>?78b=ori=$YLy`v>Rir`;!;== zI^RV}=|;)hLP?I`uN(i@?zZvmD*`3{mU7@;BX=oBNdb#A|LPd{%_h0kOvl{Eb$%mg?Dx>zWS;(+ZGgYp!^U^-D2))}l`IqWGpk4mbn z`>HtltF{`sZo4Z2fVu`**IP2|+kR#Mfb)huELSM%k4`L1Hv>B`s1zLt002y|9lk;( znd(0C@PXLy;s5vkrEcp1pD|4@`=TC zRI^kXhtX$O`~=~>`ws#l05B#K3VGkdjKdgcLdGWNl+OTCE6h55p6kpw3m=JO>eIaY z8^9j7rU2*ojUkXo25bYqAbIgnMM!>tz8e$s3-A(boUQD-U04Gdzhtezt9AF^Xtx#uB9?idLflSo0 zr;&#;D>ySN#4`8Bawx@#^;e^A)p0r1`!6S6+D{?vjga<>6XuIZ^SKFggGBQMxV^!o zfx(p9|9;<2JpdC3i24Is9lRBz@)YrI!HGcwh=71xp|E8|5RWJp-B?!ZL`%=a0?(Af zP`cYDATXfSz$+l<7B*(x#C+?F0u2>{>%0Bw&Gje-+R zj}vNEw-#o=02ly3R)a>~nWHC`PX(OgnB4G@zJ`FCrndcmK>(Yet{xXL@a_do0TOXy zN@IMg|A#lqu;>7|_-Np-Ty|T6BZL(zk#xK;ikc+vAu=9i=ysXuGYVFCK@6h_*?5NX z4_!hMJFBN2BugBj7oZkj-R znLCW}B+9)EflwJGVi!UgY>=yrn{7rU17S=6Aw{PFAC5q9ESP{3I)EcH#MsRs7a@(q zl1C<^2rvMwrR zYtHylJ&-Z37s*+x#{>>zNU1k14hpp{iyzkmMG?v<(+0*vl{pjR^#;=7Mx_;CA7h|O zEVZ%F2*v~o6=m+kcoRF$?s>gZVNldR1|*;Ab%e0Of0e^fI*Q=ns6bI7*enV0CLApA zBw@B9P!u*JEEZ}9fuTnAk1=gBzz>_Yfk3)J9V{@4*AejAX`8>yHRRAx?)XuY@XEY(N^i{H+9+HX1evgwdCI|~>uabST&%IqvK5M5ZF78u{(V*pYC1Surp7-UpcBmfRBz!0Gk#=XW6 z9}86`mWdF?W(#s4aIQR9OiE*4c7TLX{yP1+}g0 zN`fjE!6(6X-FlkJ5Rd}vbZl+FwPXUuCp}wLkkX6bp471|1A{w_5Ezgtq}eE6k{jpZ zKA;P@U9uXWrMN@5J1IUyDg9uUBjjPHjK3qJSd<&D@rWgnidUH>pTrh3JC_XF$DTl? zQbGwMF%5+Qz*h`x@VT4)GbRC$q62{UG0+Hbj-VO3(_9D{yC_VDgbOH42f)2Z6Eq08 zA>A@$a410rXftqsLIq)Prvig;Hp=phfj@7JBm-hq_zewU`1b7cAnvmdcm%q*KpyC6 z-A_R=M9S9j&V({Ju$po9m0Oc?f=&s6)sVjitqxkL3=S4iri!2ifl)5%q7cQowJY5H z7843v0$3jT>r(h671+3o!nO>KvN{};4I%~>`Pa~aZ=^Ip0G^!=?e9D*j<2_KyaR4C z`2X277z5+Mor47c-rSBekVoC>hcdu$9{`>Pp&(aR&LsmU2d<-M5OA*QP?hA5;Lup$ zfe49jaUgqR0+|k(-usccWHR7nNxw z3yj>htYK151uTMtY#;{$e*OXg_ctAzIBfE!?>_~VVgd)?4g@Z35PT2~?(QTPMFUdyPS~upA`1)(4J)f9 zl(B&%j6!Y8EI?<2e14 z2sUj}3h&kf;~JdGwzLck1uA6|df;|U4!k)4&5-bB8UL}8<)_^5w{~#G0B`~+P>YHs z9_2!E%Ku!F9W*{P6y@>Q*&qyHOpXN^uAs-G7)mUlsjwO2L6<~SQ1c0Fs;D*Cn_&iSs9W*g3_S{I(C8<6ax9D zTuWJ*1r&pW5(Oy&xnRFr70$Vb7KY%)x9>;SnqjDdBPcqbBv%nc-mYylqnU zF<$vU6r5byrU;D4x5c}R|84wV?td8nC&m8@%Z1SdM#=m$Ju%OaFk3e03SjXE4j>ir z7EDjR22Q_hNX|19rzYw6!|WUO+XjCT9pE;Oz(r;6onSH*NYR}Hrlp`;-}-Ts^g077 z(xRN%vJ4eN!MFw*^^LZL^~5tLO*YRF?DuNxA%j0+REm;%L$efY3cHlQ%090De)rpd zvnwJn`3RHO#euA5v8*tfl6_2y4~~%T(^aRE>1MF#dKUo+j3;A~Sto<4M}%>^M@T>6 zp~#fM`Mz!v5miaf1dd7?2nYZ_Krk?|c!6)f0OLPWSxf=nvI&5vM2x)er5X8zeqaV* zhu{u7eEuAt5EUC8|M^QoLRv~fa#CV)bWH5$_|I{eaHn_Y#_#R1 z$PbuTV-Js95#CRD(25IRTpmRX-Za$3$8A>4J&~_dS$uA+-1vZh%4hsyfH$L(6Mbm; z9-@J50(n2d+U-H)Pjk95Z5jUh#QTa3@*s)y1lKe$M1*5?8Og(>W;geO}P!8kqqZzV`FRQ1`2MFI6 z5w%qqDKjPglbS8TEH6&(9-rK44tO(3W~|m!!T#Cec%Sucw)D4#)g@%FeR%MTn1~x?-1Xc<459$H_JB{a^{$!@T~_|!TxpgPn0+waiiD2qF`2z zuj9>m@?^Lq?xnj`Z9U`m-U#=~+TfbMMO)8QQ#!3=%@yD8;f1t|bGy;4FX?BvDzaLL znEphJ>-AjZR{i6N4{HhM%jgRk>K`Eaf+t)SPeeZwue3pbaT$6Cxt5p>rahhWQ$}uq zy8!t8`FGnyKu!BO+5@1|vC+7vv%0Ehr`q3J3YWXPFw@~9ci>XPrt*XDM8VuaF;;Dx zu67|!K~8T(2BW6@32#*AXoW62sK$(vv(vmf8XlRvl$cSC!FTuhn_1`S@gQU4?)7zl z=GNlNLOnf1zhOd*wMAdBFyg|U%lHfpBlG4@d*;|xO&^EH;gz1{!|<~e6EG12e9mSi zL#}2dMQ@Nk{ib@Y!;j23F%K40rLVM3)rRL_n zY~$gm7T%;qB5F5T!+M)hSet%d?QEX5nK z(|xg5e!6jBbWKAn*FCPV%RIK9iQ^ZCPhvJh_6^J}#x}*j=OC=HG(y$YOox143{HhO zNwg&k3HJ}#;-`>I9O7n|-Ob5Uq~P@1V7feZ_lpph#=^{=?b0&*f``j1)4Z=u?ZCry z|0b@W{w*@fTo~(;gKqOuxN`{Hp@5hPLGjjdBSagu9o~z41rM)G&yl#VMbhtIFJI3L zZCzhH-Wy>ChGblJ%kh7$J(!}4o3qf7XAnX z(<6|kgx@*RuP%xcY;<%x=$Dif#N~d;hN&|&$Xog zLAZ8Z>tXPh_WtBPAc@jAaIoNHHrK`F%s5p@WSy1IXs?|J#bxQ__oXwp#kNwL8YuOayN6STvDq%i2(JIC z*@=!4JG=fBkJqg85x&aefk+PBh)bT>bk7ckEpSZ>T%U?s(I&1nwHzNiY>01vpfo1S z|GXmP*m9FI@8-AcQ~{Y-8~@m!8xpd_`5-}^k4I7XH@&IV~5JxgH=KO7h^U3;KajZ7uvxzA{7=9xR3cWyZ&Zl(@~|lUzOKIBmA8=cB07#pL3_IQfD4^?uZf$ z&0m@+xrEW^Tj2v{Hi}gwk=JRoSZqMx&r!?V6e-se@-B>;rl4BGsSE$L(8#{}fQ#vs zt1YHA1QABaoXg}Wi%N7=qe~U*;HaNbtRxZ`@;B04Q_nX@rsJh%SrpMN5E5XusV8_+ z;eInGFo^Il>PeqRyT(n!?~x#Md|58C=`$q1jP~64S<+*KI4+RGEWOiEFqA3ez1l!B z#Sp=IwN;_EM!=3WF+E@KKmsdyz5m+xkT=9jA$@3&&Hba00xq5_HOr)+t2f$=bm#pWl{b~iyYA^5%^YweYKtS4sflhJD{7eB=VUcS|QS!Thu&BKA zp{FArpx)B+fU`^uQMQBECM+&0b}cUCv2_>SyEITBLI0cQ1_>+O+Y+D02>p}Pz*rir zmR9(6o0+?$3asJkWCaGVYCJBejZ7}RsfI7^hQw*-CQi-%`ks0-NW%6~c>k;J4U4G# zJ&9SSr6iA4Ar;HL>axF)!sh9F=M)j6@!Y1RP?dz!U=_rnLFJ3@jKZXi6(p&w0H)_f z^Pim&Zqgh7rsevz`;Ystm)qEX*LnY4e>!6CiV%OCSnm5gyxyW8z&k&@F=G9ztsU|D zJxA4meB*{TOA+6jUUq47Yjn5*lfA^myPGjVRfu~yR#)I@^cO^9L~>E!Rcy|6FX?(= z>O=hoL}A|=Jy3@B=7#F?KoF6+lk^z!AW59_IMK`RBhM4dT$^>qJrDCohsq1_JD&UY zlmr_Wjd;ObnOr`1IDXxeXza)AY-%`Jc3NptS8%lHylO|wT*}{}dhWgGk$GCRf9B;s zn{2Y1Wm#~}))u;}l!;MfKG~q&jxL!};@{am#PEAg(?nTq13P{1zO=#a*{@6=)RK6X58d9^jtRj!<}gyzpMEVq&rg431dF8`EK)Q^Z65@ znXSpS4Q`nit94tcGfGHV;cR1f7$vVQN5j=eDdn6y`!&X2bY>0K9sZ;^ejd+`|Zo;=&Vb zHC4_%3bPNCjDF*Z?~l8Rid}3<8~Y|Q{+>(pxC*W}?dKhDq5(IB>T?S}wGjHTYsKSz zS6;C!tuBM0;<}dY zDCupTA!20dE$rr}Id|6M+jQY)kWs~1D?~eK-|POqt|URX+zT-+dv<)V7JvBm)1>m| z7vImeLdVUF$#f}DI~*q(fwm_ni+1i^>3AjB)yRc;HF)N%%VR45U!nBS>oQ&BDzoF0 z)Dd@&_xaeeE%IumX1hl9+iQ`8<~J1nM(RfIl+T{}I_G^$wQUiNEjD-cK_K^rQ&O+{ zdQ?TbSG||^B742ZC`2owZ4Rq(Jzs6=Y%npzKiRPUngJM|-9>I+3?FBPkMCwSe@XmA zCzcY)<8m^-m@L_(#m8wsWk}$+HJf%q95P=^JVUz;&JgvlA|3ou|Ax%Q81%vY*6qez zK9zqAAj;Qm>_*&NPal@F)pP<6o-Bd%h)4B4siNV%aL>f%S_A2olA5)4} zE#<$iC1I04&ZmsH8Zt9F9QiF{NW;zi9X$oT702v&>!RFCjI>{}@;o6?VOcwk;c1u8 zp4fwNLz%MPvq!V3-iNl1OhJlI>k!8?5)aGeAN~Re(H~klws_oI{j|^GnnYJY+Oj2< za`aW+z6|ZBl;n9DP33}@A)C>;QHnWzbQIl>!{oI+7hRqFy4m=SdjCn!T8&{NH&ef{ z4ND$Nw(erKCL6{v9l{^<@(&)3bF~FgKxMDb;*`Q4WFAGIyt>w1cwB1rjKa3+aIlSw z-g{?SdwFuklFmWz0d-CbBmIq$H`P84u(P6DXY8tGj`mGxM~fw4r}sU}U0p18;DZ#7 z!oc;F$Yg_C%Vf_`!?LcyMt6l~Q_aclEO-Ci6I;u*<$CY2vD(3DztHH_uWjP*N@8Kv zC;5Z>TH>NqR%vY8q5y(&9&vJ(mtH%z`ROFu*DBI)kCJHosj0vVVNZVjeTOp&Yu)qx zI^7=vA2!+GZBe!hoM4=gbQ za*}(z$0zXuNLPh@&gS!!B3g_)Lmo}H%{`z_4{aAIv>KzB98f84>R8_STJ61Vt>iTP zgM+<*VU|=tSZ86kSA6c=_u{JgPl5erk!8Wv`J(0Vq8?lHy^VDJtI);)!!&fdh9>S> zWcA9so0X*sGjmMaz`fICIK4^db;-_Gq5X=HRr`h_nj7B>n2a>mnlYfhNA%!fXeX|Q zPp>tccI%mq=#zq;`P6U~jO2yN{p0T8V(d;KC09j@)G-`l8U+X8W|#ARrsHe1sTtlD zWKXEtOV1SFq_3m<%gZ`Ov+4F?!@-u={qbJ9_3P_Vg3bNg1wm*)VbPDQv57B%ux7k~z!;j}PMi}2=tMPdxbD>2 z-rEa)dUBQGz3nD@4^2k*B}4owF2V_;AD^k_A0oBd$YpKek{EzcZ0s6NP99|;NcJ){Wf3H-ESs7%%7T5*rngo z@^>wc&hJw3pW6ox3cgdO}isQes?kQgUKiQbt-*}m zdTe|$Vg|$MPkIBNqxOlc3Z+$KK!9sf5x0ezH}R!AvJvz3Ll3r3jV$@U;uEtkY?F0q z^<*?&BuMO;b+q|#O?#1(uG+0Lx*^QzC$q;k0=(aPy+(3WlW5N>zrGA(-@~BNxDy3Q z_LO4nFcGkDTRt2Q@lNNN=^b5Oh_U}7^dy=gnLVhWTI6|bvfXCU%0WGqU9*A zj|%EY7ev={^Q%%2liAoo*%n>M(LB|C-AuNnk8ntcT$G06g||=oLM_X4yKCXUc5Riu zEstNkxEih@+@`oWx>mb<-Hx2!5*co3-qcICqBIG*_}$uGE7*&j(Xi#F;NTzFJCvm* z8uTg1sgau3<@Lf}$=CK?aRZtNW-?NxGJWKrV7*Ex#1Mk9%)%QTWp*ZlTeznX*NgZigv!z=SpW!8CdQ} zVJdaG@K8w8`W-&w4ZB}qSD546dJ?HaVo>9u6^Pg9{guj6T+~y2m7)9l=CP590>8t$ z2nGJ%ABjlsLplNOn%E8exm*|Q42$xuOM-v+qNfmWm=|M-4q2B39FS0NIqd_4qT6^CbT0iyL%bwMGN)*C6dCV zg9>9j)^qF6pO>bI`90YWV~g$kGxF)Z$qEzhl;~e!wULyhoWg)u^*a3P)5p^%g386Z zZ&i){!amZ5iGCkADiOjW{4g1LcIbSx=crTnWTM>$uKbuQdNnRw<<_s1k%9)M zcId#b2`ld7zB#08Vk6vD-&2Y=i`BcrEFAyD>s>NkLRm6hGyU@6j_0=7lZ+Xc1N%#1zmTKF#s1l{ z!3eySqlII~*MEl+b<>irJ3E#adhJ_kXy)_ak0Dt4h;bY}f zu63cAH@amb5H~yUBBhN)FEi* z=xJ*Vl2QFQLbH$fd?#)eo|*}QiqDDPpr@B%U1XK3gMpAxqm z2_n8f<}bQ+ zp$M9wx(gM)kF{R+a^~JFEoat-pP2%{I@M}mgSh+Qy&rbyQ{qO~!-V^fN~W^{0Hi`2w<=~}be+m_O4eNV$)+&hU(6N@TJ zD=NPK+sz<(`ex-ZVfwM?vO0jkP2=c!v8_AWSm*q=#gsqZr2E;1<2IF>2H*RBk12BB zxw&VPC0_JSYd22IgrOyT={>nC8jo|ROd%M*D0+5$te=m`%YP&O_EO}<=L+$w3BU8# z#NGipRNdS4eyLv59e4n9p%xD%U)H1EWEF+Z zJE}Pds?t^)hry2G=jVAGvbI= zVNd+~aVZISu0%1n;@Xy2=U07rqVc6Yg>vioOpv~=KP}R?dq1uMjk$oXJE$;6W+y~t z>XG`w!IzYJK>9skd_hqje5~pWNPU}i*l}N z%O^)dcm7)Uq)7r%%(vKh;`iyfPy!I}m7CWMCIGyBSIP5f%uIcWu^BiT~s zmOh3w+9Q|hYw8S_%a$VZ&74RA-iL!r>qB@?-qqL=qj}&i-<0!dR=YuO_v*JupvsIPXB!tcJn7=((oyw3eIjQQ=4Ky%F}eRFQaJjCxhUNd-6;;8p-Q~R*e zHF%=Cd}%ED%CNC+s9n}2yK7n0vS7f@D;trjwEuGKv6^%8%8~;%ppSK&IKzwu>=C7S zR*uS~b3ZC8{1wEU;~g98EzuU#ZrJ!vs+SS^()S!%`t0unQ9J^h-}xjRQ&Ac~7^Ppv z_D+d;5QGdp5BCfnc`8R(z~k1YxZG6vs$kd#s#vFG{?qu?veM+@J*&$d6LzQom(qAu`D5f&L8{XFfDB~*AqxSGKAN&2H~HhHfH}z zN-Jk0Mued0n=r*sDa_u%GxH^@ykV|1MiS#*6{M|5ly(XAP4BMFd_U_<|3U8*#xiNZ_naXRr>G8!x@#WGg|IPB-Tn5VEy%h@__7C1Tj)zOG ze15yWJd9=g9Kn`sSnKA7t2$q}l@CdG*}ULcr!+Wo@#Vw!3+P3-5OTRodv4lFPi&{R z#nk9bpO;hLMRXKxcbUkC*IpGR2c-;)FYWq&tQfb+`m!*^`dpQ4buijPu+!gX8Y5$7 z>q}3g|1yPNX`lI?%wKhnjL$^vVFsZqH@%1;x3cXBwnb!9=_U-!v+(M++zb@zVW_t4%_K6>Q!;e_H* z|BCitHom3-SCg1_XA6@;u2bNKa3^-}9U~m8qm!o>hat=jY9&ob+fjkT{UJfe4xyGo zVbK)BnTw+;k8=vmqLf-!)k;e0RqA^wqT=)}y~}GI-w*xyn%NIJ{fx%?SgyK+BG3Vo z#^Z#W_EhB@r_T7}`b}wqM%Rkyei?1%8V@7g90n0=E!8ovny(H)C+A)Zc1@p4n(E#x z-hGnoG3f1r%ZGW7ccHiVSN+9lGCA#b?ACJU>)v#FRiuiD9vp|Y_iKGbhJ+EeqA)Vq z9<6nw-@JNwheKQrA^E5R`|j`Nhb999!7Xc|{kt5jS99Nc`AZ$m$4@*p1lM}lkec}K zRW*Q?ORml+QaKa43JFY1Y}@qu8;8zq*PGKWi_uS;q*?ViS{YNhR2k$u0tSYE!&-#~ zFTI&#arz2PzC zWoN#e`IJ#yK!9BKI!f&cMh|6aw-}+aBO%Ydh0AFgtr)D9SYtIFS?lO=G$jV z2KyE5kfGmCwVmhAb56;QoDn!?OPG8R*S=-ps#c=qTQee!)>S$}u=O?Lv;F4!sH1ec zSDm3CATdLFzI}Ypub6DukJHoodp?V|QmRHoV>PAQX%36Jf1Yyl$_VZJyghzvWTI8Y z#~*xNwHn~}*Ds#ZVKv0SXWQIV3b3 zNwdee#xXlPyeJo0P$@CWKau$=R@Pp%iupal^Wd4lpo9MoE&18rmUh2L3k|o`F%zz7 z!;E38r2*~R0Q9Z|sJ%hckbl0LT6E|Jw`q4VL(f`uzwW5J4W<-EOQUdP-D%46MOQ*i>$Nh@DNY`<3;62@b474K|` zW-ugZ-b0)%=MR;r)p}??_J4=ZM;69y`ijYCZB_lCULV}2IAdomv8lB^ zqu&Sgy_ZFP>jXejeAeS0D^$>cj>`fS6?i=LNJ5wPtsFo8HxzcrR{H> zN6#Is$wU(7LKuoi6E=<#`7BFJ;Th+@)olN|-mRD+PUq>jRz9G8T?m0`MDaNS*SPvK zN4}{pW~6<*=@-4(WESlLj5XY*0;6|s;!J-_XGmS8XY(Gu$`64DYeyU6>SrON`TR{P zR_oFG@WbwU+2cP@OLTdc!gVkEUhkWZ2xU1kMdaPZ+KSM$;R#}D3k|dP1-Nr<$uf)! zv{U}d!Z!)l7Y!>(r4dGhLmrncVw#$qjcO6@<@FSB>}QR?uD57OaQ)6MI=9d0iJQZs z&+YEl*9X!v`R>2GJkgAFxj5`bTRcm{-jKQT-t(wFrci#v5d!=Sy?;<+kM1Nbp3)fF zQvEy6HRokW(T9)P@bDVSG^Y%>De0+6$tmRyc61w}e1cOAD~E#RB6v>}tVsnd#IDUJdE%c^?T^Uu}Or!*MBkMxJ?PamZj${0B+D zOG5gU3=sTdS=scX&0C%D)8#7DOdiEMQR5DI!w6Q#C35S z_O;AyO4M}iPx&>k#|q>PFwhHwSF^V~j&U^7E!r6B+vgDZAwdXNp6(CphoR};?)n{F zy=ttCM+_$z3xpX52-GuX2lpkuL&)Yr2&vGyNvekBlSeYAjwPV+~5e zAZb0EDTo@ap~t2EV71kCBy2gWBj|+mGIKCw;QX=aFYiV(?DS59iFuIpRA`7kb#cRD z^aVXZ{b;amlD>oD^^ECK5;du7ir}z3MnDi2Fgh?z!Tph@|KhY{V@Heyy8UH=%TelW z8bWgCLl4e3?n~aPwSq}9uR(lU!e*JJylNuisk2PkxRV9%fVC zA9%Q&*rc6t_f%R6lKh-~nU{RQ_IO^&kBG>3Q`&N?e8SYP7V0J9WNLf8`O?M)o?{*$ zn`Fv5`lC!-dmKm%4c{qDjWZBens&i8d`xG5q}D9S^E~jpdvYU%+5% zUf9b@^MrXGYb!P_)2)e}$&JmkY4TzAh@?vk zho0$mWVB@I36evXs`RIgCI40d@e|eC58R$DQb)c>jA4nvjr)PD*cLndR^?V>CtejD v{5i2R7Dinumued>?k~nsvKEtgVK#rnmcdrNOBsD-!joDs+#SbcWdA<^2 Date: Sun, 12 Jul 2015 03:22:45 -0400 Subject: [PATCH 31/52] Fixes pre-prefixes repeating twice whenever they were used (i.e Top-Secret Top-Secret Base Gamma) --- code/__HELPERS/names.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index e5976a5c460..ea2013dc7fd 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -68,6 +68,7 @@ var/religion_name = null if (prob(10)) name = pick("Imperium", "Heretical", "Cuban", "Psychic", "Elegant", "Common", "Uncommon", "Rare", "Unique", "Houseruled", "Religious", "Atheist", "Traditional", "Houseruled", "Mad", "Super", "Ultra", "Secret", "Top Secret", "Deep", "Death", "Zybourne", "Central", "Main", "Government", "Uoi", "Fat", "Automated", "Experimental", "Augmented") new_station_name = name + " " + name = "" // Prefix for(var/holiday_name in SSevent.holidays) From 72da5e749e8ef47d5dbb014e3b348c49e6e80e26 Mon Sep 17 00:00:00 2001 From: Ergovisavi Date: Sat, 11 Jul 2015 17:29:04 -0700 Subject: [PATCH 32/52] Inability to quickly select medicine as mediborg is super annoying, changes hypospray attack_self to be like the Borg Shaker, much easier. --- .../reagents/reagent_containers/borghydro.dm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index eed51ff2a81..f7425424367 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -100,11 +100,11 @@ Borg Hypospray return /obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user) - mode++ - if(mode > reagent_list.len) - mode = 1 + var/chosen_reagent = modes[input(user, "What reagent do you want to dispense?") as null|anything in reagent_ids] + if(!chosen_reagent) + return + mode = chosen_reagent playsound(loc, 'sound/effects/pop.ogg', 50, 0) - var/datum/reagent/R = chemical_reagents_list[reagent_ids[mode]] user << "[src] is now dispensing '[R.name]'." return @@ -153,15 +153,6 @@ Borg Shaker R.cell.use(charge_cost) RG.add_reagent(reagent_ids[valueofi], 5) -/obj/item/weapon/reagent_containers/borghypo/borgshaker/attack_self(mob/user) - mode = modes[input(user, "What reagent do you want to dispense?") as anything in reagent_ids] - - playsound(loc, 'sound/effects/pop.ogg', 50, 0) - - var/datum/reagent/R = chemical_reagents_list[reagent_ids[mode]] - user << "[src] is now dispensing '[R.name]'." - return - /obj/item/weapon/reagent_containers/borghypo/borgshaker/afterattack(obj/target, mob/user, proximity) if(!proximity) return From 66e2941531ff9ec8cc41e981fe4bd7acd9f04fdf Mon Sep 17 00:00:00 2001 From: xxalpha Date: Sun, 12 Jul 2015 01:55:25 +0100 Subject: [PATCH 33/52] Adds an empty hugbox for admins to give. Maintbox Re-added hugbox to boxstation perma. --- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 2 +- code/game/objects/effects/spawners/lootdrop.dm | 2 +- code/game/objects/items/weapons/storage/boxes.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 96db2ec9155..263e23502b4 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -4941,7 +4941,7 @@ "bRa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bRb" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/virology{name = "Break Room"; req_access_txt = "39"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bRc" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) -"bRd" = (/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/razor{pixel_x = -6},/obj/item/stack/medical/ointment{pixel_y = 4},/obj/item/stack/medical/bruise_pack{pixel_x = 10; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/epinephrine{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/security/prison) +"bRd" = (/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/razor{pixel_x = -6},/obj/item/weapon/storage/box/hug/medical,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/security/prison) "bRe" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bRf" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/firealarm{pixel_y = 25},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) "bRg" = (/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Virology APC"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "Virology Module"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index aec6f12fe03..7fd3cbf8d70 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -107,7 +107,7 @@ /obj/item/weapon/storage/box/cups = 1, /obj/item/weapon/storage/box/donkpockets = 1, /obj/item/weapon/storage/box/lights/mixed = 3, - /obj/item/weapon/storage/box/hug = 1, + /obj/item/weapon/storage/box/hug/medical = 1, /obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 1, /obj/item/weapon/storage/toolbox/mechanical = 1, /obj/item/weapon/screwdriver = 3, diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 182e0dbaebd..0f9b43ad313 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -632,8 +632,8 @@ user.visible_message("[user] hugs the [src].","You hug the [src].") return -/obj/item/weapon/storage/box/hug/New() +/obj/item/weapon/storage/box/hug/medical/New() ..() new /obj/item/stack/medical/bruise_pack(src) new /obj/item/stack/medical/ointment(src) - new /obj/item/weapon/reagent_containers/hypospray/medipen(src) \ No newline at end of file + new /obj/item/weapon/reagent_containers/hypospray/medipen(src) From 71ac607a6b1d888cd7d933396a12201499ad572a Mon Sep 17 00:00:00 2001 From: duncathan Date: Sun, 12 Jul 2015 12:52:32 -0600 Subject: [PATCH 34/52] Revert "merge conflicts?" I fucked this up --- TODO.txt | 2 + code/LINDA/LINDA_turf_tile.dm | 10 +-- code/_globalvars/lists/flavor_misc.dm | 2 +- code/controllers/master_controller.dm | 6 +- code/controllers/subsystem/air.dm | 1 + code/controllers/subsystem/garbage.dm | 4 +- code/controllers/subsystem/lighting.dm | 2 +- code/controllers/subsystems.dm | 9 +-- code/datums/supplypacks.dm | 4 +- code/datums/uplink_item.dm | 2 +- code/game/gamemodes/abduction/abduction.dm | 1 + .../objects/items/weapons/cigs_lighters.dm | 6 +- code/game/objects/items/weapons/defib.dm | 14 ++-- .../objects/items/weapons/implants/implant.dm | 23 ++++-- code/game/objects/items/weapons/tools.dm | 7 +- .../stool_bed_chair_nest/alien_nests.dm | 9 +-- code/game/turfs/turf.dm | 2 + code/modules/clothing/head/helmet.dm | 2 +- code/modules/events/vent_clog.dm | 6 -- code/modules/mob/living/carbon/carbon.dm | 14 +++- .../mob/living/carbon/carbon_defines.dm | 1 + code/modules/mob/living/carbon/human/death.dm | 1 - code/modules/mob/living/carbon/human/human.dm | 16 ++--- .../mob/living/carbon/human/human_defines.dm | 4 +- code/modules/mob/living/carbon/human/life.dm | 67 ++++++++++-------- .../mob/living/carbon/human/species.dm | 32 ++++++--- code/modules/mob/living/carbon/life.dm | 7 +- code/modules/mob/living/living.dm | 9 +-- code/modules/mob/living/living_defense.dm | 14 ++-- code/modules/power/cable.dm | 4 +- code/modules/power/cell.dm | 4 +- code/modules/power/lighting.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- .../projectiles/guns/projectile/revolver.dm | 1 + .../Chemistry-Reagents/Other-Reagents.dm | 3 + .../Pyrotechnic-Reagents.dm | 3 +- .../Chemistry-Reagents/Toxin-Reagents.dm | 16 ++--- .../surgery/organs/cybernetic_implants.dm | 12 ++-- html/changelogs/ikarrus-maint.yml | 36 ---------- sound/items/WEEOO1.ogg | Bin 8482 -> 13533 bytes 40 files changed, 162 insertions(+), 198 deletions(-) create mode 100644 TODO.txt delete mode 100644 html/changelogs/ikarrus-maint.yml diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 00000000000..1187050192d --- /dev/null +++ b/TODO.txt @@ -0,0 +1,2 @@ +make air flow + likely an issue with multiple devices' process_atmos procs; who knows \ No newline at end of file diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index 011b627dae9..8d6ba7d7802 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -232,13 +232,15 @@ archived_cycle = SSair.times_fired /turf/simulated/proc/update_visuals(datum/gas_mixture/model) - overlays -= SSair.plasma_overlay - overlays -= SSair.sleeptoxin_overlay + overlays.Cut() + var/siding_icon_state = return_siding_icon_state() + if(siding_icon_state) + overlays += image('icons/turf/floors.dmi',siding_icon_state) switch(model.graphic) if("plasma") - overlays += SSair.plasma_overlay + overlays.Add(SSair.plasma_overlay) if("sleeping_agent") - overlays += SSair.sleeptoxin_overlay + overlays.Add(SSair.sleeptoxin_overlay) /turf/simulated/proc/share_air(var/turf/simulated/T) if(T.current_cycle < current_cycle) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index df39c500d7f..752dc718e94 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -31,7 +31,7 @@ var/global/list/frills_list = list() var/global/list/spines_list = list() var/global/list/animated_spines_list = list() //Backpacks -var/global/list/backbaglist = list("Backpack", "Satchel") +var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel") //Female Uniforms var/global/list/female_clothing_icons = list() diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 3ad2acefb4c..838bcde4e26 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -103,9 +103,9 @@ calculate the longest number of ticks the MC can wait between each cycle without SS.cost = MC_AVERAGE(SS.cost, world.timeofday - timer) if (SS.dynamic_wait) var/oldwait = SS.wait - var/GlobalCostDelta = (SSCostPerSecond-(SS.cost/(SS.wait/10)))-1 - var/NewWait = MC_AVERAGE(oldwait,(SS.cost-SS.dwait_buffer+GlobalCostDelta)*SS.dwait_delta) - SS.wait = Clamp(round(NewWait,world.tick_lag),SS.dwait_lower,SS.dwait_upper) + var/GlobalCostDelta = (SSCostPerSecond-(SS.cost/SS.wait))/(SS.wait/10)-1 + var/NewWait = MC_AVERAGE(oldwait,(SS.cost-1.5+GlobalCostDelta)*SS.dwait_delta) + SS.wait = Clamp(round(NewWait,0.1),SS.dwait_lower,SS.dwait_upper) if (oldwait != SS.wait) calculateGCD() SS.next_fire += SS.wait diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 27f6a92016b..969e2fa6d97 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -5,6 +5,7 @@ var/datum/subsystem/air/SSair priority = 20 wait = 5 dynamic_wait = 1 + dwait_lower = 5 dwait_upper = 50 var/cost_turfs = 0 diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 4e617f76af9..c7cceb73f24 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -6,9 +6,7 @@ var/datum/subsystem/garbage_collector/SSgarbage wait = 5 priority = -1 dynamic_wait = 1 - dwait_upper = 50 - dwait_delta = 10 - dwait_buffer = 0 + dwait_delta = 5 var/collection_timeout = 300// deciseconds to wait to let running procs finish before we just say fuck it and force del() the object var/max_run_time = 1 // how long, in deciseconds, can we run before waiting for the next tick diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index 053241cd2e7..a039417c3a3 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -7,7 +7,7 @@ var/datum/subsystem/lighting/SSlighting wait = 5 priority = 1 dynamic_wait = 1 - dwait_delta = 3 + dwait_delta = 1 var/list/changed_lights = list() //list of all datum/light_source that need updating var/changed_lights_workload = 0 //stats on the largest number of lights (max changed_lights.len) diff --git a/code/controllers/subsystems.dm b/code/controllers/subsystems.dm index 3d36430f592..777bc2e5a1e 100644 --- a/code/controllers/subsystems.dm +++ b/code/controllers/subsystems.dm @@ -5,17 +5,10 @@ var/name //name of the subsystem var/priority = 0 //priority affects order of initialization. Higher priorities are initialized first, lower priorities later. Can be decimal and negative values. var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer. - - //Dynamic Wait - A system for scaling a subsystem's fire rate based on lag - //The algorithm is: (cost-dwait_buffer+AvgCostOfAllOtherSSPerSecond)*dwait_delta - //defaults are pretty sane for most use cases. - //you can change how quickly it starts scaling back with dwait_buffer, - //and you can change how much it scales back with dwait_delta var/dynamic_wait = 0 //changes the wait based on the amount of time it took to process var/dwait_upper = 20 //longest wait can be under dynamic_wait var/dwait_lower = 5 //shortest wait can be under dynamic_wait - var/dwait_delta = 7 //How much should processing time effect dwait. or basically: wait = cost*dwait_delta - var/dwait_buffer = 1.5 //This number is subtracted from the processing time before calculating its new wait + var/dwait_delta = 3 //How much should processing time effect dwait. or basically: wait = cost*dwait_delta //things you will probably want to leave alone var/can_fire = 0 //prevent fire() calls diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 5253e7dc68a..55cfeccf68c 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -382,7 +382,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine name = "Standard Justice Enforcer Crate" contains = list(/obj/item/clothing/head/helmet/justice, /obj/item/clothing/mask/gas/sechailer) - cost = 80 //justice comes at a price. An expensive, noisy price. + cost = 30 //justice comes at a price. An expensive, noisy price. containername = "justice enforcer crate" @@ -1279,4 +1279,4 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/ammo_box/magazine/toy/pistol) cost = 40 containername = "foam force pistols crate" - contraband = 1 + contraband = 1 \ No newline at end of file diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 4d7cb7b8469..418aebff054 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -735,7 +735,7 @@ var/list/uplink_items = list() /datum/uplink_item/badass/bundle name = "Syndicate Bundle" - desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 20 telecrystals, but you do not know which specialisation you will receive." + desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 10 telecrystals, but you do not know which specialisation you will receive." item = /obj/item/weapon/storage/box/syndicate cost = 20 excludefrom = list(/datum/game_mode/nuclear,/datum/game_mode/gang) diff --git a/code/game/gamemodes/abduction/abduction.dm b/code/game/gamemodes/abduction/abduction.dm index cd462b1fd87..790ee290f47 100644 --- a/code/game/gamemodes/abduction/abduction.dm +++ b/code/game/gamemodes/abduction/abduction.dm @@ -139,6 +139,7 @@ agent_landmarks.len = max_teams scientist_landmarks.len = max_teams for(var/obj/effect/landmark/abductor/A in landmarks_list) + world << "Found this [A]" if(istype(A,/obj/effect/landmark/abductor/agent)) agent_landmarks[text2num(A.team)] = A else if(istype(A,/obj/effect/landmark/abductor/scientist)) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index ba9b852999a..b8f023d7047 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -479,8 +479,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(prob(75)) user.visible_message("After a few attempts, [user] manages to light [src].", "After a few attempts, you manage to light [src].") else - var/hitzone = user.r_hand == src ? "r_hand" : "l_hand" - user.apply_damage(5, BURN, hitzone) + user.adjustFireLoss(5) user.visible_message("After a few attempts, [user] manages to light [src] - they however burn their finger in the process.", "You burn yourself while lighting the lighter!") user.AddLuminosity(1) @@ -504,8 +503,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!isliving(M)) return - if(lit) - M.IgniteMob() + M.IgniteMob() var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M,user) if(lit && cig) if(M == user) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 297075cf669..5404fa7eda1 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -325,6 +325,7 @@ /obj/item/weapon/twohanded/shockpaddles/attack(mob/M, mob/user) var/halfwaycritdeath = (config.health_threshold_crit + config.health_threshold_dead) / 2 + var/mob/living/carbon/human/H = M if(busy) return @@ -342,7 +343,6 @@ user << "The instructions on [defib] don't mention how to revive that..." return else - var/mob/living/carbon/human/H = M if(user.a_intent == "disarm" && !defib.safety) busy = 1 H.visible_message("[user] has touched [H.name] with [src]!", \ @@ -422,7 +422,11 @@ busy = 0 update_icon() return - if(H.stat == DEAD) + if(H.heart_attack) + H.heart_attack = 0 + user.visible_message("[defib] pings: Patient's heart is now beating again.") + playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) + if(H.stat == 2) M.visible_message("[M]'s body convulses a bit.") playsound(get_turf(src), "bodyfall", 50, 1) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) @@ -443,7 +447,7 @@ H.adjustBruteLoss((mobhealth - halfwaycritdeath) * (total_brute / overall_damage)) user.visible_message("[defib] pings: Resuscitation successful.") playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) - H.stat = UNCONSCIOUS + H.stat = 1 dead_mob_list -= H living_mob_list |= list(H) H.emote("gasp") @@ -465,10 +469,6 @@ update_icon() cooldown = 1 defib.cooldowncheck(user) - else if(H.heart_attack) - H.heart_attack = 0 - user.visible_message("[defib] pings: Patient's heart is now beating again.") - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) else user.visible_message("[defib] buzzes: Patient is not in a valid state. Operation aborted.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 10c9ab9737c..b8c72c0827b 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -123,10 +123,6 @@ imp_in.gib() explosion(src,heavy,medium,weak,weak, flame_range = weak) qdel(src) - return - timed_explosion() - -/obj/item/weapon/implant/explosive/proc/timed_explosion() imp_in.visible_message("[imp_in] starts beeping ominously!") playsound(loc, 'sound/items/timer.ogg', 30, 0) sleep(delay/4) @@ -160,7 +156,21 @@ if(E != src) qdel(E) imp_in << "You activate your macrobomb implant." - timed_explosion() + imp_in.visible_message("[imp_in] starts beeping ominously!") + playsound(loc, 'sound/items/timer.ogg', 30, 0) + sleep(delay/4) + if(imp_in.stat) + imp_in.visible_message("[imp_in] doubles over in pain!") + imp_in.Weaken(7) + playsound(loc, 'sound/items/timer.ogg', 30, 0) + sleep(delay/4) + playsound(loc, 'sound/items/timer.ogg', 30, 0) + sleep(delay/4) + playsound(loc, 'sound/items/timer.ogg', 30, 0) + sleep(delay/4) + imp_in.gib() + explosion(src,heavy,medium,weak,weak, flame_range = weak) + qdel(src) /obj/item/weapon/implant/chem name = "chem implant" @@ -244,8 +254,7 @@ return 1 /obj/item/weapon/implant/loyalty/Destroy() - if(imp_in.stat != DEAD) - imp_in << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away." + loc << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away." ..() /obj/item/weapon/implant/adrenalin diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 213faa834c0..27d36934ae6 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -209,11 +209,8 @@ var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) if(affecting.status == ORGAN_ROBOTIC && user.a_intent != "harm") - if(src.remove_fuel(1)) - playsound(loc, 'sound/items/Welder.ogg', 50, 1) - user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.getDisplayName()].", "You start fixing some of the dents on [H]'s [affecting.getDisplayName()].") - if(!do_mob(user, H, 50)) return - item_heal_robotic(H, user, 5, 0) + if(src.remove_fuel(0)) + item_heal_robotic(H, user, 30, 0) return else return diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 0a7112be964..ca90bd6e6d7 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -9,11 +9,6 @@ smooth = 1 can_be_unanchored = 0 canSmoothWith = null - var/image/nest_overlay - -/obj/structure/stool/bed/nest/New() - nest_overlay = image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2) - return ..() /obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user as mob) if(buckled_mob && buckled_mob.buckled == src) @@ -64,12 +59,12 @@ M.pixel_y = 0 M.pixel_x = initial(M.pixel_x) + 2 M.layer = MOB_LAYER - 0.3 - overlays += nest_overlay + overlays += image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2) else M.pixel_x = M.get_standard_pixel_x_offset(M.lying) M.pixel_y = M.get_standard_pixel_y_offset(M.lying) M.layer = initial(M.layer) - overlays -= nest_overlay + overlays.Cut() /obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob, params) var/aforce = W.force diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 6edae35f9e9..a2851a7c4c4 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -107,6 +107,8 @@ /turf/proc/is_plasteel_floor() return 0 +/turf/proc/return_siding_icon_state() //used for grass floors, which have siding. + return 0 /turf/proc/levelupdate() for(var/obj/O in src) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 6bfa9615112..0702f6b741d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -78,7 +78,7 @@ alt_toggle_message = "You turn on the lights on" action_button_name = "Toggle Justice Lights" can_toggle = 1 - toggle_cooldown = 20 + toggle_cooldown = 14 activation_sound = 'sound/items/WEEOO1.ogg' /obj/item/clothing/head/helmet/justice/escape diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 80673b4262f..6bb3a5abab4 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -16,16 +16,10 @@ /datum/round_event/vent_clog/setup() endWhen = rand(25, 100) -<<<<<<< HEAD for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in machines) if(temp_vent.loc.z == ZLEVEL_STATION) var/datum/pipeline/temp_vent_parent = temp_vent.parents["p1"] if(temp_vent_parent.other_atmosmch.len > 20) -======= - for(var/obj/machinery/atmospherics/unary/vent_scrubber/temp_vent in machines) - if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded) - if(temp_vent.parent.other_atmosmch.len > 20) ->>>>>>> remotes/upstream/master vents += temp_vent if(!vents.len) return kill() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index c3c789b3b9d..0f282ea5811 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -78,21 +78,23 @@ shock_damage *= siemens_coeff if (shock_damage<1) return 0 - take_overall_damage(0,shock_damage) + src.take_overall_damage(0,shock_damage) //src.burn_skin(shock_damage) //src.adjustFireLoss(shock_damage) //burn_skin will do this for us //src.updatehealth() - visible_message( + src.visible_message( "[src] was shocked by \the [source]!", \ "You feel a powerful shock coursing through your body!", \ "You hear a heavy electrical crack." \ ) + if(prob(25) && heart_attack) + heart_attack = 0 jitteriness += 1000 //High numbers for violent convulsions do_jitter_animation(jitteriness) stuttering += 2 Stun(2) spawn(20) - jitteriness = max(jitteriness - 990, 10) //Still jittery, but vastly less + src.jitteriness -= 990 //Still jittery, but vastly less Stun(3) Weaken(3) return shock_damage @@ -369,6 +371,12 @@ var/const/GALOSHES_DONT_HELP = 8 /mob/living/carbon/is_muzzled() return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle)) + +/mob/living/carbon/revive() + heart_attack = 0 + ..() + return + /mob/living/carbon/blob_act() if (stat == DEAD) return diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 95e6875e55d..50a9c2c47fe 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -19,6 +19,7 @@ var/obj/item/head = null var/datum/dna/dna = null//Carbon + var/heart_attack = 0 var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks. diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 2f84b03bd20..4326f45dad2 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -22,7 +22,6 @@ stat = DEAD dizziness = 0 jitteriness = 0 - heart_attack = 0 if(istype(loc, /obj/mecha)) var/obj/mecha/M = loc diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1f5f0b11935..8392a006fba 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -272,11 +272,6 @@ if(gloves) var/obj/item/clothing/gloves/G = gloves siemens_coeff = G.siemens_coefficient - if(heart_attack) - if(shock_damage * siemens_coeff >= 1 && prob(25)) - heart_attack = 0 - if(stat == CONSCIOUS) - src << "You feel your heart beating again!" return ..(shock_damage,source,siemens_coeff) /mob/living/carbon/human/Topic(href, href_list) @@ -285,13 +280,11 @@ if(href_list["embedded_object"]) var/obj/item/I = locate(href_list["embedded_object"]) var/obj/item/organ/limb/L = locate(href_list["embedded_limb"]) - if(!I || !L || I.loc != src || !(I in L.embedded_objects)) //no item, no limb, or item is not in limb or in the person anymore + if(!I || !L || I.loc != src) //no item, no limb, or item is not in limb (the person atleast) anymore return var/time_taken = I.embedded_unsafe_removal_time*I.w_class usr.visible_message("[usr] attempts to remove [I] from their [L.getDisplayName()].","You attempt to remove [I] from your [L.getDisplayName()]... (It will take [time_taken/10] seconds.)") if(do_after(usr, time_taken, needhand = 1, target = src)) - if(!I || !L || I.loc != src || !(I in L.embedded_objects)) - return L.embedded_objects -= I L.take_damage(I.embedded_unsafe_removal_pain_multiplier*I.w_class)//It hurts to rip it out, get surgery you dingus. I.loc = get_turf(src) @@ -311,9 +304,11 @@ if(href_list["pockets"]) var/pocket_side = href_list["pockets"] var/pocket_id = (pocket_side == "right" ? slot_r_store : slot_l_store) - var/obj/item/pocket_item = (pocket_id == slot_r_store ? r_store : l_store) + var/obj/item/pocket_item = (pocket_id == slot_r_store ? src.r_store : src.l_store) var/obj/item/place_item = usr.get_active_hand() // Item to place in the pocket, if it's empty + //visible_message("[usr] tries to empty [src]'s pockets.", \ + "[usr] tries to empty [src]'s pockets.") // Pickpocketing! var/delay_denominator = 1 if(pocket_item && !(pocket_item.flags&ABSTRACT)) if(pocket_item.flags & NODROP) @@ -327,8 +322,7 @@ if(do_mob(usr, src, POCKET_STRIP_DELAY/delay_denominator)) //placing an item into the pocket is 4 times faster if(pocket_item) - if(pocket_item == (pocket_id == slot_r_store ? r_store : l_store)) //item still in the pocket we search - unEquip(pocket_item) + unEquip(pocket_item) else if(place_item) usr.unEquip(place_item) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index a47ae39f009..9b373ba72f4 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -51,6 +51,4 @@ var/datum/martial_art/martial_art = null - var/name_override //For temporary visible name changes - - var/heart_attack = 0 \ No newline at end of file + var/name_override //For temporary visible name changes \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index bfa438e032f..c99b39e3995 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -42,9 +42,6 @@ for(var/datum/mutation/human/HM in dna.mutations) HM.on_life(src) - //heart attack stuff - handle_heart() - //Stuff jammed in your limbs hurts handle_embedded_objects() //Update our name based on whether our face is obscured/disfigured @@ -88,48 +85,55 @@ /mob/living/carbon/human/handle_mutations_and_radiation() - if(!dna || !dna.species.handle_mutations_and_radiation(src)) - ..() + if(dna) + if(dna.species.handle_mutations_and_radiation(src)) + ..() /mob/living/carbon/human/breathe() - if(!dna || !dna.species.breathe(src)) - ..() + if(dna) + dna.species.breathe(src) -/mob/living/carbon/human/check_breath(datum/gas_mixture/breath) - if(!dna || !dna.species.check_breath(breath, src)) - ..() + return /mob/living/carbon/human/handle_environment(datum/gas_mixture/environment) if(dna) dna.species.handle_environment(environment, src) + return + ///FIRE CODE /mob/living/carbon/human/handle_fire() - if(!dna || !dna.species.handle_fire(src)) - ..() - if(on_fire) - var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures - if(wear_suit) - if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT) - thermal_protection += (wear_suit.max_heat_protection_temperature*0.7) - if(head) - if(head.max_heat_protection_temperature >= FIRE_HELM_MAX_TEMP_PROTECT) - thermal_protection += (head.max_heat_protection_temperature*THERMAL_PROTECTION_HEAD) - thermal_protection = round(thermal_protection) - if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT) - return - if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT) - bodytemperature += 11 - else - bodytemperature += BODYTEMP_HEATING_MAX - + if(dna) + dna.species.handle_fire(src) + if(..()) + return + var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures + if(wear_suit) + if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT) + thermal_protection += (wear_suit.max_heat_protection_temperature*0.7) + if(head) + if(head.max_heat_protection_temperature >= FIRE_HELM_MAX_TEMP_PROTECT) + thermal_protection += (head.max_heat_protection_temperature*THERMAL_PROTECTION_HEAD) + thermal_protection = round(thermal_protection) + if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT) + return + if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT) + bodytemperature += 11 + return + else + bodytemperature += BODYTEMP_HEATING_MAX + return /mob/living/carbon/human/IgniteMob() - if(!dna || !dna.species.IgniteMob(src)) + if(dna) + dna.species.IgniteMob(src) + else ..() /mob/living/carbon/human/ExtinguishMob() - if(!dna || !dna.species.ExtinguishMob(src)) + if(dna) + dna.species.ExtinguishMob(src) + else ..() //END FIRE CODE @@ -334,12 +338,13 @@ if(!has_embedded_objects()) clear_alert("embeddedobject") -/mob/living/carbon/human/proc/handle_heart() +/mob/living/carbon/human/handle_heart() if(!heart_attack) return else losebreath += 5 adjustOxyLoss(5) adjustBruteLoss(1) + return #undef HUMAN_MAX_OXYLOSS diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index bfd11f1bc46..43772593e9e 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -782,8 +782,7 @@ randmutb(H) domutcheck(H,null) H.emote("gasp") - return 0 - return 1 + return 1 //////////////// // MOVE SPEED // @@ -1139,7 +1138,6 @@ ///////////// /datum/species/proc/breathe(var/mob/living/carbon/human/H) -<<<<<<< HEAD if(H.reagents.has_reagent("lexorin")) return if(istype(H.loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) return @@ -1194,9 +1192,6 @@ if(breath) H.loc.assume_air(breath) -======= - return ->>>>>>> remotes/upstream/master /datum/species/proc/check_breath(datum/gas_mixture/breath, var/mob/living/carbon/human/H) if((H.status_flags & GODMODE)) @@ -1462,14 +1457,31 @@ /datum/species/proc/handle_fire(var/mob/living/carbon/human/H) if((HEATRES in specflags) || (NOFIRE in specflags)) - return 1 + return + if(H.fire_stacks < 0) + H.fire_stacks++ //If we've doused ourselves in water to avoid fire, dry off slowly + H.fire_stacks = min(0, H.fire_stacks)//So we dry ourselves back to default, nonflammable. + if(!H.on_fire) + return + var/datum/gas_mixture/G = H.loc.return_air() // Check if we're standing in an oxygenless environment + if(G.oxygen < 1) + ExtinguishMob(H) //If there's no oxygen in the tile we're on, put out the fire + return + var/turf/location = get_turf(H) + location.hotspot_expose(700, 50, 1) /datum/species/proc/IgniteMob(var/mob/living/carbon/human/H) - if((HEATRES in specflags) || (NOFIRE in specflags)) - return 1 + if(H.fire_stacks > 0 && !H.on_fire && !(HEATRES in specflags) && !(NOFIRE in specflags)) + H.on_fire = 1 + H.AddLuminosity(3) + H.update_fire() /datum/species/proc/ExtinguishMob(var/mob/living/carbon/human/H) - return + if(H.on_fire) + H.on_fire = 0 + H.fire_stacks = 0 + H.AddLuminosity(-3) + H.update_fire() #undef HUMAN_MAX_OXYLOSS #undef HUMAN_CRIT_MAX_OXYLOSS diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 6573b1465cb..fc74ade712d 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -10,7 +10,10 @@ if(..()) //Updates the number of stored chemicals for powers handle_changeling() - return 1 + //Heart Attacks, etc. + handle_heart() + + . = 1 /////////////// // BREATHING // @@ -235,6 +238,8 @@ if(reagents) reagents.metabolize(src) +/mob/living/carbon/proc/handle_heart() + return /mob/living/carbon/handle_stomach() spawn(0) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index fed1558c693..74ecd2ffa6a 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -708,7 +708,7 @@ Sorry Giacom. Please don't be mad :( "[src] tries to remove [who]'s [what.name].") what.add_fingerprint(src) if(do_mob(src, who, what.strip_delay)) - if(what && what == who.get_item_by_slot(where) && Adjacent(who)) + if(what && Adjacent(who)) who.unEquip(what) add_logs(src, who, "stripped", addition="of [what]") @@ -719,14 +719,11 @@ Sorry Giacom. Please don't be mad :( if(what && (what.flags & NODROP)) src << "You can't put \the [what.name] on [who], it's stuck to your hand!" return - if(what) - if(!what.mob_can_equip(who, where, 1)) - src << "\The [what.name] doesn't fit in that place!" - return + if(what && what.mob_can_equip(who, where, 1)) visible_message("[src] tries to put [what] on [who].") if(do_mob(src, who, what.put_on_delay)) if(what && Adjacent(who)) - unEquip(what) + src.unEquip(what) who.equip_to_slot_if_possible(what, where, 0, 1) add_logs(src, who, "equipped", what) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 978df4d981d..e41881fa2f8 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -121,20 +121,14 @@ return /mob/living/proc/adjust_fire_stacks(add_fire_stacks) //Adjusting the amount of fire_stacks we have on person - fire_stacks = Clamp(fire_stacks + add_fire_stacks, min = -20, max = 20) - if(on_fire && fire_stacks <= 0) - ExtinguishMob() + fire_stacks = Clamp(fire_stacks + add_fire_stacks, min = -20, max = 20) /mob/living/proc/handle_fire() - if(fire_stacks < 0) //If we've doused ourselves in water to avoid fire, dry off slowly - fire_stacks = min(0, fire_stacks + 1)//So we dry ourselves back to default, nonflammable. + if(fire_stacks < 0) + fire_stacks++ //If we've doused ourselves in water to avoid fire, dry off slowly + fire_stacks = min(0, fire_stacks)//So we dry ourselves back to default, nonflammable. if(!on_fire) return 1 - if(fire_stacks > 0) - adjust_fire_stacks(-0.2) //the fire is slowly consumed - else - ExtinguishMob() - return var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment if(G.oxygen < 1) ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 8b2e9f5ae2e..b98482bb11e 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -514,9 +514,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \ var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) if(affecting.status == ORGAN_ROBOTIC) - user.visible_message("[user] starts to fix some of the wires in [H]'s [affecting.getDisplayName()].", "You start fixing some of the wires in [H]'s [affecting.getDisplayName()].") - if(!do_mob(user, H, 50)) return - item_heal_robotic(H, user, 0, 5) + item_heal_robotic(H, user, 0, 30) src.use(1) return else diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 63ac0410ec1..5f2b72bd833 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -9,7 +9,7 @@ throwforce = 5.0 throw_speed = 2 throw_range = 5 - w_class = 2 + w_class = 3.0 var/charge = 0 // note %age conveted to actual charge in New var/maxcharge = 1000 materials = list(MAT_METAL=700, MAT_GLASS=50) @@ -276,4 +276,4 @@ return /obj/item/weapon/stock_parts/cell/emproof/corrupt() - return + return \ No newline at end of file diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index e891aceb82c..6f442a439a6 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -471,7 +471,7 @@ // if hands aren't protected and the light is on, burn the player /obj/machinery/light/attack_hand(mob/living/carbon/human/user) - user.changeNext_move(CLICK_CD_MELEE) + add_fingerprint(user) if(status == LIGHT_EMPTY) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index c2aec9dd829..b688248a352 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -61,7 +61,7 @@ qdel(G.pin) G.pin = null visible_message("[G] can now fit a new pin, but old one was destroyed in the process.") - qdel(src) + qdel(src) /obj/item/weapon/gun/examine(mob/user) ..() diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 6e8d226b7e7..c31eedd7b5d 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -80,6 +80,7 @@ user << "[src] blows up in your face!" user.take_organ_damage(0,20) user.unEquip(src) + qdel(src) return 0 ..() diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm index 8a9ecf7173f..ee938882277 100644 --- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm @@ -171,6 +171,9 @@ return if(method == TOUCH) M.adjust_fire_stacks(-(volume / 10)) + if(M.fire_stacks <= 0) + M.ExtinguishMob() + return /datum/reagent/water/holywater name = "Holy Water" diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm index 545f4020afb..e8d4ebf6909 100644 --- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm @@ -44,8 +44,7 @@ /datum/reagent/clf3/on_mob_life(var/mob/living/M as mob) M.adjust_fire_stacks(2) - var/burndmg = max(0.3*M.fire_stacks, 0.3) - M.adjustFireLoss(burndmg) + M.adjustFireLoss(0.3*M.fire_stacks) ..() /datum/reagent/clf3/reaction_turf(var/turf/simulated/T, var/volume) diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm index 04b93d4c856..212414de446 100644 --- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -493,15 +493,13 @@ M.losebreath += 10 M.adjustOxyLoss(rand(5,25)) if(3) - if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(!H.heart_attack) - H.heart_attack = 1 // rip in pepperoni - if(H.stat == CONSCIOUS) - H.visible_message("[H] clutches at their chest as if their heart stopped!") - else - H.losebreath += 10 - H.adjustOxyLoss(rand(5,25)) + var/mob/living/carbon/human/H = M + if(!H.heart_attack) + H.visible_message("[H] clutches at their chest as if their heart stopped!") + H.heart_attack = 1 // rip in pepperoni + else + H.losebreath += 10 + H.adjustOxyLoss(rand(5,25)) ..() /datum/reagent/toxin/pancuronium diff --git a/code/modules/surgery/organs/cybernetic_implants.dm b/code/modules/surgery/organs/cybernetic_implants.dm index 61a58711ac8..7230c1d0572 100644 --- a/code/modules/surgery/organs/cybernetic_implants.dm +++ b/code/modules/surgery/organs/cybernetic_implants.dm @@ -366,14 +366,10 @@ else cooldown += 200 - if(istype(owner, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = owner - if(H.stat != DEAD && prob(50 / severity)) - H.heart_attack = 1 - spawn(600 / severity) - H.heart_attack = 0 - if(H.stat == CONSCIOUS) - H << "You feel your heart beating again!" + if(prob(50 / severity)) + owner.heart_attack = 1 + spawn(600 / severity) + owner.heart_attack = 0 //BOX O' IMPLANTS diff --git a/html/changelogs/ikarrus-maint.yml b/html/changelogs/ikarrus-maint.yml deleted file mode 100644 index 511a39906bc..00000000000 --- a/html/changelogs/ikarrus-maint.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# spellcheck (typo fixes) -# experiment -# tgs (TG-ported fixes?) -################################# - -# Your name. -author: Ikarrus - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. -changes: - - tweak: "Robotic augmentations have been made a bit more difficult to maintain." \ No newline at end of file diff --git a/sound/items/WEEOO1.ogg b/sound/items/WEEOO1.ogg index 1d9f9c7d772a7409e1ed23b46cc875b3b4c88ea8..71707a1d2dc1cec2784c00f2adf6189777686341 100644 GIT binary patch literal 13533 zcmch-byQWs7cYJ&2>~gQ4#}&4(%m2>0vD8!kZzEcMn$@$r2En#ap_P}TDmU^($a8g zc<18x``&uLKYr`2_11c4opabTduH#M{h7UIpW&)mT51C5z<(}X-hadcvm!DyIy84j zXA^4|R2AC8SN}Nb9sm9op{b#I{?7~56Adi&qU}%+ao+rI7e2;6L9`%W$NH@mmzuLB zgPpa>t6T95N(?+tp9($|;Nd|@L&N&lm{~^l6&fG~02DGrkFd&2qeOn(XN;iC$&%@V z^w7%uWXxrj4H4<)@1ZbNXfO+t>3#n*<|TmYkVm7f?ySVQmgbU6p*`TV&Hz#?43+~< zxGW$QCA=2v9L4>QOXv(iwR=yd5av`s0aAH1AXSK>?78b=ori=$YLy`v>Rir`;!;== zI^RV}=|;)hLP?I`uN(i@?zZvmD*`3{mU7@;BX=oBNdb#A|LPd{%_h0kOvl{Eb$%mg?Dx>zWS;(+ZGgYp!^U^-D2))}l`IqWGpk4mbn z`>HtltF{`sZo4Z2fVu`**IP2|+kR#Mfb)huELSM%k4`L1Hv>B`s1zLt002y|9lk;( znd(0C@PXLy;s5vkrEcp1pD|4@`=TC zRI^kXhtX$O`~=~>`ws#l05B#K3VGkdjKdgcLdGWNl+OTCE6h55p6kpw3m=JO>eIaY z8^9j7rU2*ojUkXo25bYqAbIgnMM!>tz8e$s3-A(boUQD-U04Gdzhtezt9AF^Xtx#uB9?idLflSo0 zr;&#;D>ySN#4`8Bawx@#^;e^A)p0r1`!6S6+D{?vjga<>6XuIZ^SKFggGBQMxV^!o zfx(p9|9;<2JpdC3i24Is9lRBz@)YrI!HGcwh=71xp|E8|5RWJp-B?!ZL`%=a0?(Af zP`cYDATXfSz$+l<7B*(x#C+?F0u2>{>%0Bw&Gje-+R zj}vNEw-#o=02ly3R)a>~nWHC`PX(OgnB4G@zJ`FCrndcmK>(Yet{xXL@a_do0TOXy zN@IMg|A#lqu;>7|_-Np-Ty|T6BZL(zk#xK;ikc+vAu=9i=ysXuGYVFCK@6h_*?5NX z4_!hMJFBN2BugBj7oZkj-R znLCW}B+9)EflwJGVi!UgY>=yrn{7rU17S=6Aw{PFAC5q9ESP{3I)EcH#MsRs7a@(q zl1C<^2rvMwrR zYtHylJ&-Z37s*+x#{>>zNU1k14hpp{iyzkmMG?v<(+0*vl{pjR^#;=7Mx_;CA7h|O zEVZ%F2*v~o6=m+kcoRF$?s>gZVNldR1|*;Ab%e0Of0e^fI*Q=ns6bI7*enV0CLApA zBw@B9P!u*JEEZ}9fuTnAk1=gBzz>_Yfk3)J9V{@4*AejAX`8>yHRRAx?)XuY@XEY(N^i{H+9+HX1evgwdCI|~>uabST&%IqvK5M5ZF78u{(V*pYC1Surp7-UpcBmfRBz!0Gk#=XW6 z9}86`mWdF?W(#s4aIQR9OiE*4c7TLX{yP1+}g0 zN`fjE!6(6X-FlkJ5Rd}vbZl+FwPXUuCp}wLkkX6bp471|1A{w_5Ezgtq}eE6k{jpZ zKA;P@U9uXWrMN@5J1IUyDg9uUBjjPHjK3qJSd<&D@rWgnidUH>pTrh3JC_XF$DTl? zQbGwMF%5+Qz*h`x@VT4)GbRC$q62{UG0+Hbj-VO3(_9D{yC_VDgbOH42f)2Z6Eq08 zA>A@$a410rXftqsLIq)Prvig;Hp=phfj@7JBm-hq_zewU`1b7cAnvmdcm%q*KpyC6 z-A_R=M9S9j&V({Ju$po9m0Oc?f=&s6)sVjitqxkL3=S4iri!2ifl)5%q7cQowJY5H z7843v0$3jT>r(h671+3o!nO>KvN{};4I%~>`Pa~aZ=^Ip0G^!=?e9D*j<2_KyaR4C z`2X277z5+Mor47c-rSBekVoC>hcdu$9{`>Pp&(aR&LsmU2d<-M5OA*QP?hA5;Lup$ zfe49jaUgqR0+|k(-usccWHR7nNxw z3yj>htYK151uTMtY#;{$e*OXg_ctAzIBfE!?>_~VVgd)?4g@Z35PT2~?(QTPMFUdyPS~upA`1)(4J)f9 zl(B&%j6!Y8EI?<2e14 z2sUj}3h&kf;~JdGwzLck1uA6|df;|U4!k)4&5-bB8UL}8<)_^5w{~#G0B`~+P>YHs z9_2!E%Ku!F9W*{P6y@>Q*&qyHOpXN^uAs-G7)mUlsjwO2L6<~SQ1c0Fs;D*Cn_&iSs9W*g3_S{I(C8<6ax9D zTuWJ*1r&pW5(Oy&xnRFr70$Vb7KY%)x9>;SnqjDdBPcqbBv%nc-mYylqnU zF<$vU6r5byrU;D4x5c}R|84wV?td8nC&m8@%Z1SdM#=m$Ju%OaFk3e03SjXE4j>ir z7EDjR22Q_hNX|19rzYw6!|WUO+XjCT9pE;Oz(r;6onSH*NYR}Hrlp`;-}-Ts^g077 z(xRN%vJ4eN!MFw*^^LZL^~5tLO*YRF?DuNxA%j0+REm;%L$efY3cHlQ%090De)rpd zvnwJn`3RHO#euA5v8*tfl6_2y4~~%T(^aRE>1MF#dKUo+j3;A~Sto<4M}%>^M@T>6 zp~#fM`Mz!v5miaf1dd7?2nYZ_Krk?|c!6)f0OLPWSxf=nvI&5vM2x)er5X8zeqaV* zhu{u7eEuAt5EUC8|M^QoLRv~fa#CV)bWH5$_|I{eaHn_Y#_#R1 z$PbuTV-Js95#CRD(25IRTpmRX-Za$3$8A>4J&~_dS$uA+-1vZh%4hsyfH$L(6Mbm; z9-@J50(n2d+U-H)Pjk95Z5jUh#QTa3@*s)y1lKe$M1*5?8Og(>W;geO}P!8kqqZzV`FRQ1`2MFI6 z5w%qqDKjPglbS8TEH6&(9-rK44tO(3W~|m!!T#Cec%Sucw)D4#)g@%FeR%MTn1~x?-1Xc<459$H_JB{a^{$!@T~_|!TxpgPn0+waiiD2qF`2z zuj9>m@?^Lq?xnj`Z9U`m-U#=~+TfbMMO)8QQ#!3=%@yD8;f1t|bGy;4FX?BvDzaLL znEphJ>-AjZR{i6N4{HhM%jgRk>K`Eaf+t)SPeeZwue3pbaT$6Cxt5p>rahhWQ$}uq zy8!t8`FGnyKu!BO+5@1|vC+7vv%0Ehr`q3J3YWXPFw@~9ci>XPrt*XDM8VuaF;;Dx zu67|!K~8T(2BW6@32#*AXoW62sK$(vv(vmf8XlRvl$cSC!FTuhn_1`S@gQU4?)7zl z=GNlNLOnf1zhOd*wMAdBFyg|U%lHfpBlG4@d*;|xO&^EH;gz1{!|<~e6EG12e9mSi zL#}2dMQ@Nk{ib@Y!;j23F%K40rLVM3)rRL_n zY~$gm7T%;qB5F5T!+M)hSet%d?QEX5nK z(|xg5e!6jBbWKAn*FCPV%RIK9iQ^ZCPhvJh_6^J}#x}*j=OC=HG(y$YOox143{HhO zNwg&k3HJ}#;-`>I9O7n|-Ob5Uq~P@1V7feZ_lpph#=^{=?b0&*f``j1)4Z=u?ZCry z|0b@W{w*@fTo~(;gKqOuxN`{Hp@5hPLGjjdBSagu9o~z41rM)G&yl#VMbhtIFJI3L zZCzhH-Wy>ChGblJ%kh7$J(!}4o3qf7XAnX z(<6|kgx@*RuP%xcY;<%x=$Dif#N~d;hN&|&$Xog zLAZ8Z>tXPh_WtBPAc@jAaIoNHHrK`F%s5p@WSy1IXs?|J#bxQ__oXwp#kNwL8YuOayN6STvDq%i2(JIC z*@=!4JG=fBkJqg85x&aefk+PBh)bT>bk7ckEpSZ>T%U?s(I&1nwHzNiY>01vpfo1S z|GXmP*m9FI@8-AcQ~{Y-8~@m!8xpd_`5-}^k4I7XH@&IV~5JxgH=KO7h^U3;KajZ7uvxzA{7=9xR3cWyZ&Zl(@~|lUzOKIBmA8=cB07#pL3_IQfD4^?uZf$ z&0m@+xrEW^Tj2v{Hi}gwk=JRoSZqMx&r!?V6e-se@-B>;rl4BGsSE$L(8#{}fQ#vs zt1YHA1QABaoXg}Wi%N7=qe~U*;HaNbtRxZ`@;B04Q_nX@rsJh%SrpMN5E5XusV8_+ z;eInGFo^Il>PeqRyT(n!?~x#Md|58C=`$q1jP~64S<+*KI4+RGEWOiEFqA3ez1l!B z#Sp=IwN;_EM!=3WF+E@KKmsdyz5m+xkT=9jA$@3&&Hba00xq5_HOr)+t2f$=bm#pWl{b~iyYA^5%^YweYKtS4sflhJD{7eB=VUcS|QS!Thu&BKA zp{FArpx)B+fU`^uQMQBECM+&0b}cUCv2_>SyEITBLI0cQ1_>+O+Y+D02>p}Pz*rir zmR9(6o0+?$3asJkWCaGVYCJBejZ7}RsfI7^hQw*-CQi-%`ks0-NW%6~c>k;J4U4G# zJ&9SSr6iA4Ar;HL>axF)!sh9F=M)j6@!Y1RP?dz!U=_rnLFJ3@jKZXi6(p&w0H)_f z^Pim&Zqgh7rsevz`;Ystm)qEX*LnY4e>!6CiV%OCSnm5gyxyW8z&k&@F=G9ztsU|D zJxA4meB*{TOA+6jUUq47Yjn5*lfA^myPGjVRfu~yR#)I@^cO^9L~>E!Rcy|6FX?(= z>O=hoL}A|=Jy3@B=7#F?KoF6+lk^z!AW59_IMK`RBhM4dT$^>qJrDCohsq1_JD&UY zlmr_Wjd;ObnOr`1IDXxeXza)AY-%`Jc3NptS8%lHylO|wT*}{}dhWgGk$GCRf9B;s zn{2Y1Wm#~}))u;}l!;MfKG~q&jxL!};@{am#PEAg(?nTq13P{1zO=#a*{@6=)RK6X58d9^jtRj!<}gyzpMEVq&rg431dF8`EK)Q^Z65@ znXSpS4Q`nit94tcGfGHV;cR1f7$vVQN5j=eDdn6y`!&X2bY>0K9sZ;^ejd+`|Zo;=&Vb zHC4_%3bPNCjDF*Z?~l8Rid}3<8~Y|Q{+>(pxC*W}?dKhDq5(IB>T?S}wGjHTYsKSz zS6;C!tuBM0;<}dY zDCupTA!20dE$rr}Id|6M+jQY)kWs~1D?~eK-|POqt|URX+zT-+dv<)V7JvBm)1>m| z7vImeLdVUF$#f}DI~*q(fwm_ni+1i^>3AjB)yRc;HF)N%%VR45U!nBS>oQ&BDzoF0 z)Dd@&_xaeeE%IumX1hl9+iQ`8<~J1nM(RfIl+T{}I_G^$wQUiNEjD-cK_K^rQ&O+{ zdQ?TbSG||^B742ZC`2owZ4Rq(Jzs6=Y%npzKiRPUngJM|-9>I+3?FBPkMCwSe@XmA zCzcY)<8m^-m@L_(#m8wsWk}$+HJf%q95P=^JVUz;&JgvlA|3ou|Ax%Q81%vY*6qez zK9zqAAj;Qm>_*&NPal@F)pP<6o-Bd%h)4B4siNV%aL>f%S_A2olA5)4} zE#<$iC1I04&ZmsH8Zt9F9QiF{NW;zi9X$oT702v&>!RFCjI>{}@;o6?VOcwk;c1u8 zp4fwNLz%MPvq!V3-iNl1OhJlI>k!8?5)aGeAN~Re(H~klws_oI{j|^GnnYJY+Oj2< za`aW+z6|ZBl;n9DP33}@A)C>;QHnWzbQIl>!{oI+7hRqFy4m=SdjCn!T8&{NH&ef{ z4ND$Nw(erKCL6{v9l{^<@(&)3bF~FgKxMDb;*`Q4WFAGIyt>w1cwB1rjKa3+aIlSw z-g{?SdwFuklFmWz0d-CbBmIq$H`P84u(P6DXY8tGj`mGxM~fw4r}sU}U0p18;DZ#7 z!oc;F$Yg_C%Vf_`!?LcyMt6l~Q_aclEO-Ci6I;u*<$CY2vD(3DztHH_uWjP*N@8Kv zC;5Z>TH>NqR%vY8q5y(&9&vJ(mtH%z`ROFu*DBI)kCJHosj0vVVNZVjeTOp&Yu)qx zI^7=vA2!+GZBe!hoM4=gbQ za*}(z$0zXuNLPh@&gS!!B3g_)Lmo}H%{`z_4{aAIv>KzB98f84>R8_STJ61Vt>iTP zgM+<*VU|=tSZ86kSA6c=_u{JgPl5erk!8Wv`J(0Vq8?lHy^VDJtI);)!!&fdh9>S> zWcA9so0X*sGjmMaz`fICIK4^db;-_Gq5X=HRr`h_nj7B>n2a>mnlYfhNA%!fXeX|Q zPp>tccI%mq=#zq;`P6U~jO2yN{p0T8V(d;KC09j@)G-`l8U+X8W|#ARrsHe1sTtlD zWKXEtOV1SFq_3m<%gZ`Ov+4F?!@-u={qbJ9_3P_Vg3bNg1wm*)VbPDQv57B%ux7k~z!;j}PMi}2=tMPdxbD>2 z-rEa)dUBQGz3nD@4^2k*B}4owF2V_;AD^k_A0oBd$YpKek{EzcZ0s6NP99|;NcJ){Wf3H-ESs7%%7T5*rngo z@^>wc&hJw3pW6ox3cgdO}isQes?kQgUKiQbt-*}m zdTe|$Vg|$MPkIBNqxOlc3Z+$KK!9sf5x0ezH}R!AvJvz3Ll3r3jV$@U;uEtkY?F0q z^<*?&BuMO;b+q|#O?#1(uG+0Lx*^QzC$q;k0=(aPy+(3WlW5N>zrGA(-@~BNxDy3Q z_LO4nFcGkDTRt2Q@lNNN=^b5Oh_U}7^dy=gnLVhWTI6|bvfXCU%0WGqU9*A zj|%EY7ev={^Q%%2liAoo*%n>M(LB|C-AuNnk8ntcT$G06g||=oLM_X4yKCXUc5Riu zEstNkxEih@+@`oWx>mb<-Hx2!5*co3-qcICqBIG*_}$uGE7*&j(Xi#F;NTzFJCvm* z8uTg1sgau3<@Lf}$=CK?aRZtNW-?NxGJWKrV7*Ex#1Mk9%)%QTWp*ZlTeznX*NgZigv!z=SpW!8CdQ} zVJdaG@K8w8`W-&w4ZB}qSD546dJ?HaVo>9u6^Pg9{guj6T+~y2m7)9l=CP590>8t$ z2nGJ%ABjlsLplNOn%E8exm*|Q42$xuOM-v+qNfmWm=|M-4q2B39FS0NIqd_4qT6^CbT0iyL%bwMGN)*C6dCV zg9>9j)^qF6pO>bI`90YWV~g$kGxF)Z$qEzhl;~e!wULyhoWg)u^*a3P)5p^%g386Z zZ&i){!amZ5iGCkADiOjW{4g1LcIbSx=crTnWTM>$uKbuQdNnRw<<_s1k%9)M zcId#b2`ld7zB#08Vk6vD-&2Y=i`BcrEFAyD>s>NkLRm6hGyU@6j_0=7lZ+Xc1N%#1zmTKF#s1l{ z!3eySqlII~*MEl+b<>irJ3E#adhJ_kXy)_ak0Dt4h;bY}f zu63cAH@amb5H~yUBBhN)FEi* z=xJ*Vl2QFQLbH$fd?#)eo|*}QiqDDPpr@B%U1XK3gMpAxqm z2_n8f<}bQ+ zp$M9wx(gM)kF{R+a^~JFEoat-pP2%{I@M}mgSh+Qy&rbyQ{qO~!-V^fN~W^{0Hi`2w<=~}be+m_O4eNV$)+&hU(6N@TJ zD=NPK+sz<(`ex-ZVfwM?vO0jkP2=c!v8_AWSm*q=#gsqZr2E;1<2IF>2H*RBk12BB zxw&VPC0_JSYd22IgrOyT={>nC8jo|ROd%M*D0+5$te=m`%YP&O_EO}<=L+$w3BU8# z#NGipRNdS4eyLv59e4n9p%xD%U)H1EWEF+Z zJE}Pds?t^)hry2G=jVAGvbI= zVNd+~aVZISu0%1n;@Xy2=U07rqVc6Yg>vioOpv~=KP}R?dq1uMjk$oXJE$;6W+y~t z>XG`w!IzYJK>9skd_hqje5~pWNPU}i*l}N z%O^)dcm7)Uq)7r%%(vKh;`iyfPy!I}m7CWMCIGyBSIP5f%uIcWu^BiT~s zmOh3w+9Q|hYw8S_%a$VZ&74RA-iL!r>qB@?-qqL=qj}&i-<0!dR=YuO_v*JupvsIPXB!tcJn7=((oyw3eIjQQ=4Ky%F}eRFQaJjCxhUNd-6;;8p-Q~R*e zHF%=Cd}%ED%CNC+s9n}2yK7n0vS7f@D;trjwEuGKv6^%8%8~;%ppSK&IKzwu>=C7S zR*uS~b3ZC8{1wEU;~g98EzuU#ZrJ!vs+SS^()S!%`t0unQ9J^h-}xjRQ&Ac~7^Ppv z_D+d;5QGdp5BCfnc`8R(z~k1YxZG6vs$kd#s#vFG{?qu?veM+@J*&$d6LzQom(qAu`D5f&L8{XFfDB~*AqxSGKAN&2H~HhHfH}z zN-Jk0Mued0n=r*sDa_u%GxH^@ykV|1MiS#*6{M|5ly(XAP4BMFd_U_<|3U8*#xiNZ_naXRr>G8!x@#WGg|IPB-Tn5VEy%h@__7C1Tj)zOG ze15yWJd9=g9Kn`sSnKA7t2$q}l@CdG*}ULcr!+Wo@#Vw!3+P3-5OTRodv4lFPi&{R z#nk9bpO;hLMRXKxcbUkC*IpGR2c-;)FYWq&tQfb+`m!*^`dpQ4buijPu+!gX8Y5$7 z>q}3g|1yPNX`lI?%wKhnjL$^vVFsZqH@%1;x3cXBwnb!9=_U-!v+(M++zb@zVW_t4%_K6>Q!;e_H* z|BCitHom3-SCg1_XA6@;u2bNKa3^-}9U~m8qm!o>hat=jY9&ob+fjkT{UJfe4xyGo zVbK)BnTw+;k8=vmqLf-!)k;e0RqA^wqT=)}y~}GI-w*xyn%NIJ{fx%?SgyK+BG3Vo z#^Z#W_EhB@r_T7}`b}wqM%Rkyei?1%8V@7g90n0=E!8ovny(H)C+A)Zc1@p4n(E#x z-hGnoG3f1r%ZGW7ccHiVSN+9lGCA#b?ACJU>)v#FRiuiD9vp|Y_iKGbhJ+EeqA)Vq z9<6nw-@JNwheKQrA^E5R`|j`Nhb999!7Xc|{kt5jS99Nc`AZ$m$4@*p1lM}lkec}K zRW*Q?ORml+QaKa43JFY1Y}@qu8;8zq*PGKWi_uS;q*?ViS{YNhR2k$u0tSYE!&-#~ zFTI&#arz2PzC zWoN#e`IJ#yK!9BKI!f&cMh|6aw-}+aBO%Ydh0AFgtr)D9SYtIFS?lO=G$jV z2KyE5kfGmCwVmhAb56;QoDn!?OPG8R*S=-ps#c=qTQee!)>S$}u=O?Lv;F4!sH1ec zSDm3CATdLFzI}Ypub6DukJHoodp?V|QmRHoV>PAQX%36Jf1Yyl$_VZJyghzvWTI8Y z#~*xNwHn~}*Ds#ZVKv0SXWQIV3b3 zNwdee#xXlPyeJo0P$@CWKau$=R@Pp%iupal^Wd4lpo9MoE&18rmUh2L3k|o`F%zz7 z!;E38r2*~R0Q9Z|sJ%hckbl0LT6E|Jw`q4VL(f`uzwW5J4W<-EOQUdP-D%46MOQ*i>$Nh@DNY`<3;62@b474K|` zW-ugZ-b0)%=MR;r)p}??_J4=ZM;69y`ijYCZB_lCULV}2IAdomv8lB^ zqu&Sgy_ZFP>jXejeAeS0D^$>cj>`fS6?i=LNJ5wPtsFo8HxzcrR{H> zN6#Is$wU(7LKuoi6E=<#`7BFJ;Th+@)olN|-mRD+PUq>jRz9G8T?m0`MDaNS*SPvK zN4}{pW~6<*=@-4(WESlLj5XY*0;6|s;!J-_XGmS8XY(Gu$`64DYeyU6>SrON`TR{P zR_oFG@WbwU+2cP@OLTdc!gVkEUhkWZ2xU1kMdaPZ+KSM$;R#}D3k|dP1-Nr<$uf)! zv{U}d!Z!)l7Y!>(r4dGhLmrncVw#$qjcO6@<@FSB>}QR?uD57OaQ)6MI=9d0iJQZs z&+YEl*9X!v`R>2GJkgAFxj5`bTRcm{-jKQT-t(wFrci#v5d!=Sy?;<+kM1Nbp3)fF zQvEy6HRokW(T9)P@bDVSG^Y%>De0+6$tmRyc61w}e1cOAD~E#RB6v>}tVsnd#IDUJdE%c^?T^Uu}Or!*MBkMxJ?PamZj${0B+D zOG5gU3=sTdS=scX&0C%D)8#7DOdiEMQR5DI!w6Q#C35S z_O;AyO4M}iPx&>k#|q>PFwhHwSF^V~j&U^7E!r6B+vgDZAwdXNp6(CphoR};?)n{F zy=ttCM+_$z3xpX52-GuX2lpkuL&)Yr2&vGyNvekBlSeYAjwPV+~5e zAZb0EDTo@ap~t2EV71kCBy2gWBj|+mGIKCw;QX=aFYiV(?DS59iFuIpRA`7kb#cRD z^aVXZ{b;amlD>oD^^ECK5;du7ir}z3MnDi2Fgh?z!Tph@|KhY{V@Heyy8UH=%TelW z8bWgCLl4e3?n~aPwSq}9uR(lU!e*JJylNuisk2PkxRV9%fVC zA9%Q&*rc6t_f%R6lKh-~nU{RQ_IO^&kBG>3Q`&N?e8SYP7V0J9WNLf8`O?M)o?{*$ zn`Fv5`lC!-dmKm%4c{qDjWZBens&i8d`xG5q}D9S^E~jpdvYU%+5% zUf9b@^MrXGYb!P_)2)e}$&JmkY4TzAh@?vk zho0$mWVB@I36evXs`RIgCI40d@e|eC58R$DQb)c>jA4nvjr)PD*cLndR^?V>CtejD v{5i2R7Dinumued>?k~nsvKEtgVK#rnmcdrNOBsD-!joDs+#SbcWdA<^2Sa4dH9w_f#m`*k_Ejv5!nlVhl+%)}%-pLbAlrj7UOR^R?B-QT_Ue_!|Yy7%?^e_rQv<~ip)=Q+=Lp7(j?IWzXBPon`G{QKj< z`G=4d%wd5^!XiS#eDTDcE||3QpOH4~pHDi>erM)?JUcUCPz!PI;A#FN+yCXsWBDUS z2^w|9p9@sA4?B$r#``+&3P)HWG}SdU)iu?%5c2kfv-opiI3n(BxWbNP7~7wz(xxYz zVE|fzjNm@dO&-p`03ZN>X^MHbLpg=@R(z6xMW@5%j8%s-9}wq}KD{|>fy`;tOl1UXR&A(mt(#Hrzxk80atdIq#>8-IwDa(b$&YRQ_H#} zC!ZS|fUKghy-54h0>dLnzYiJ>6*RwN=Dt0 zDqVu;;D#>Oph}(j*Fg?_qJGyjy8pA{+}#HPfJ77a1O7XblXivf$m{vDEd(I%?A+pp zVDAm_-WxJjH8R#CGDBaLp<=&Z#}RFYAz>!#VkU3JOh%F>9>+{Xklb$J+#(4cw@5DI zB<%lNcDIgzfuh3(>ANNKutFw0G5J0m`0toxRzCe7{mjD#*?v~prB-?G+zQ^|3*^q+ z<=AC`Jj%MG4JeXN{YO6iuvIn{pEpk{kWVe6)9>Qxbb4MH{(mXPfzK3yF&r58go^h# zibFNDE3RD&KLe0Y+Z+TfZix3klo=R-_Ne_r>!=IGc4`!J@Lx{&1Ie~8;zM7=?Y}~% zfCw4;5p7$>|FQfrEQE1HifOXOzra8ixO+omR6+J{s<%|{$;!P;iC{p`WqhSN3XPS z>^hkY0Pi2X|g~?ci$yjA7 z_hxGMJ~HZu3ge{hsFNcG%Zwn*e8)SS z>2tf~tz~K{D3+=K;K0st*H10cPk(Ef{?0X17M~dqm3=xYul!2h0&JJX_)kOtKtA=Z ze(IcMCJvwXK8pTV>RlS09+(HA=YIu{oPbyjH^=~B7y?hIAOxPBUBP!Pthswa1-l$& zdcu^g9%(~+v|Y0q62hVNNKE#BIpI%eJ7?5GH0rr&1epRNdT;(8k+Z`F8CG`Zq>vFk zwFxp@iAC{m4|IxmmL5ogC_{GHuD4Ry_RM7XD!87rb*EAMH{gXA=rHFPWJ>p4DiX0Lo2ULeBG2P@|QG%19MOK0X z%Hj@yA_xcc@)Qqe2*Hf=0of!|dtgL+=#lo&s*$4;#$FJ^+;^0*W`o8YWjJBbIye_6 zTeo_n7uq|`A#Dss8#AF}%OoAe)ZrKyl3O@tDuOWa80#i{)*gfNaKd`%VO+*AZuK!P z^#redW*8yN4l@bMB#|b=vDkGdOoZ)t7LGw8OptIME;zRh9n7C*ICdfe=kgfiHb!_s zios^#-ss^b)^Q%=F>a5ue8RDl5c9gNn{ezzb`k_gubh*Pn4_31EQH(faIA+5cD!DP zNx|+&cEY+jL(Ev0F_J9?H$lNo>SA58F>c>UF4-gxNDVz`T}V%o%i}aZNKa9$3nY0g z29r(l8YB7SkS51Bz=e!uEmUW9D2*lcE70dX0^CqOm^uXJ_>3^(x^c4_D7A-NkPECuuYHX!HlS ztAc)&DgSJ|KiPinXKUESs->TF<%3TZC)-1o8pD=b?SGsa7jbqIPG)8&`9KOyB>B)@ zHEK3DhKN6?ROUT3Ecy^2a~#;YcaYY}1zcr% zSC#wsnf2G4bkv5tVdjWYvDLD*U9~|ojG!oqCYdpuu+|J4^r|*v)M!B4mKly=Xyee@ zwvY)J5oVBcm{~YC5*90L%g8cghT|Z9sOjPiSyUDhH2{fPg+yT(S&%er|Ed#u^(5mP z2)SJw<5F)lsa3hZUYSl`%BxcBFQfO>EB805_SaWeR0U0zE%r4k^@qFFVQ0P*8W$Vu zAM{l{XsQWbs`|KCb9SeT~YC>etGhkhYJbH zZ`#N#z?jU1D;mzo0>**>c=P&QGYO=G4H|H!p#}{&q=@{coHYMI6VBq&=LVeAQi=gb zF@<6ZQKRmh5akYKTt#g#fM{d4z0w7P(82{u;XqW}f?>lT;U+|dA&P-zRwEUp>+}k z<1q_blA9W0=AWMZL{iP)T~U?Gc;&G zQ6+I0Wkt<$-Vs1S%0p_nE7G9+CXkvmg0zCBAr%#j7u=mBO z>k2iRr~aS)w}*un490v1~`v~96B3LDf@@arDXq0{v%`Xv>wlzUhtjY z56Nj02ad}W+EBWbQ~YvmlnWKEQ-w4TPo8h}06Bt^bs_Ju+}6u$O)PCCY_&BM6t}ON z>A2+S%Y)*B^BqZ`oRWxz&wloU+MJe1byeb4yscU8B1z1%{Rz^VIZJa38X1>e&@ zR`~m!vg%<~YTt#p`;iyS8*$hQUA%A6;Q6=m!lcYCoi;C|D)BF!K|3XfbEKhU;@rHQ z9)oCCe%(;TCTXxG>L_0pbPuCSUmwk6DZd?4dj);z?APm|vsX0?I!EtZKUPtu$J3G{ z?9Co$_UgAtVme$hbnv%=o}CCk$^RQOoYtrlq4HX|0yAykb-hYST&2ITrZr}p4kd!0 zua55lsUKsG8IJ^@b*gna?>Ybpn_&ThIS1R2I)_;3l`X?hylgX;R;$(@oJiBL-Hgwh z-@g4gh4oUkX#4hL?RT>g40x}^#rc3WjIen!Z1~ds@k7_U!-05FF%LUl`^NA=VPeX5 zv$g-{s@}L|$0CQUpM6J;)4PX0zAM(x?g$uuIk_#-Vk8W}%cZG6a5l;`H2x5e8XsqU zO9M3^;DwBAUrx8bqPVAs*lMi%unqm^OX`dtVY#<-3w(d9t0j2eAr)@|9=&~m6M25x^RG?QV~jTcxGw*^L{>$T z((Tym=TBb597ZY}$e}x;S1(tseAz~b{j=fn*bh`|J}(>^NF}E|wIgDtV4dx+(~g)I zl~}=8WoQc6o1DlOE$s3@GRk9V8uj`?>jS;wad9$C-Bu{&v^BY*bv5Qf0kN+M?GxwK zoGZ5f*d?b#u<|qR(50+6>)EC=G3Cy0TCVK>yEE5lVU)9tQlu>$>2YG_$sM(Z)Ar7c z=>Yma^@}g`3X?`0bXd=Aesl$|6Mod2gR`aV@(guyP*nec*9Bu%41-Pe(4qxOt+o4z zn66^u$Y5}u)xQ05q)F>bUWe?}qTS5{4+&!$<`?^VwDYA+X0~D8``3pWYGE61C$9$J zKjTDyg~^6m1X$kp9FH`P=rBw)u)Z8$%2hS2pv- zx;^~Ud#B={g*h**IM9v_uyvbl{d8ftH|qu{i9XFTKaNK{m0S`z_eLJvTm$C^mTkN* z{3?~vjBNR_kyfspGy~sSgo9VCfVYZHU(>(-JwYuNC4{AI_{TMkBU*%^Qyyj);W|LngPwCni-OH^>^iGeFuPy(P;rt75t%%&trCTof z4>;TWRzA!ndT$6f2|6u)<#|>e3bc(kaD_(g#VFa3wU&hh%xM+%R`kHFV@4I-b8@93eA@Eu?QWtZDqsRV! zur^Qb{jmzRnS-Q~Y-%(*uuDYNwQQdB=9jd2u`5Dr@wuCzm>BWqnzun#(2b4*u;G(= zdYHnJ%_?71o>#2raj$Un;|e9^@S_z!-%%eMKGsuh{L!uNS1H@A%f2SUVtA_guG7H6 zs^pViRdt<5`Q{D+m#>s*JU=oE_7U|eo5~p5I=R)W&ZM5Xg{$r7eoWVXn+T6uCiz%0 z)C)bGx_Ms~ExnWWlqPsh`p-xg(^XKq<)nZyGnz} zMYfEUTwhRm+P=tS0U`TNVTcMrZg-E`^BpxP)H}p@8Tt@2<;C)1YVeUBhDXp&G=$T* zIyc3hY!Ei!oC<(<$kQ_$X z-G1I-G{!9!8W-Dqw%78QPNvt^GZ;{!uY~OZ>P=DhD-Y-JDI004^W`~WYjr^v3nux< z#Pyg2FUf^I&hR|AnMrurTp-0b=RxFz_ZbecNM!6&ZTmyFW*L=(&1!=fiOKbEIM(k! zXXJ%7Up!oG_L`|sV*|4XUJn|+fps36s)B*mH=7D4cB)9^p_A>>;MnOtV@F?vSxAaK}81ed-5u zSevIDP6|^{a)HMh!iW{4;PGEF=W!gO%eQ3$x4IIGa?VvbazEGNi!AS`h6{&GVhfi( zZe@A6n|>t=gJgQ1S`bVS?QA6U`_$Eh1B>cI^FeBX!)qnCc)U}BHI6v@zTmGms^JLo zK4bM5v+0D)qa+XiT_SJl$FA)HREZUHU;ernt@Vp(Wgx%>itmZdN6CRA=HU|>XUSPd zOUQ0dw>uF|)Uj-TJbT?$Nu} z6cd3gx_724?ctLZ!{X~+r})9=YOgAJZg4?~yZlLLFDp3~uv}5ddXLYd1gy6xVg2kX z8%$T)8G+oyvk7oTLaR}M&no#To8WP8SffY+4LRWP@pk-$!QTk6j52=n;^1$iZU$yE zQf;$k@xE2C4!)jSNm7f?X-jF>Fl+oDi!>DyD8FC9^_t?)uM{k`fo6z6`iGlCGLkj= zu(rN+sWX@?>B8FD&)U&&rNc|Z+xcJiOp3FF(m1`VgGFv?EZeuRav#5T=dk4_kuRY9 zvRycTDen+38o$uXqDn9_7*Sa?%?y1M1suL&v@kkaU%v<6r{U|j+8dBW~rqB6gjd< zl_7=7N}3`|^gGT)4pa0W%h;^)Um57G{#@_H%ArBe1B&ykz(Fx}ZRvpP@qy{?>afk+ ziOyff8dHr++cZf=4vorQ)}H&N>`J|C!!=WTF+%+BGY38XF7B+?X0|FeUuB{vB&b6c z$4OqLQ>T71nNXtJ5iRE}{G=uqAf9wSu>E0d^I9(8*7;OM&ahY?(sb}-^>Y@n(7$7= z4)(wK;=6vVoOWRmuP9Rf=vH|`RQhC8O2#POpmqEG_&YXoiv_*S#0!^Ag6AI<(R00| zNKUj{p}pZ67kd_2Nj-SmeQ%g4&%O}x)?4*p&E)q2mOUd!KWP_;^8Mc=~ng?RsEc%>T$h_oiGojA}G$NpHixAwQR{?%*6GB;l zuzJ5?1-So_4ROLEC-ss>8N-Mor(;xvmv21zWv`uMkv1QcXf;ib<*R9rAB?%PTt;jB zZriX~?|dzl>zv2$Zc*?un#Pn6c%-YN=-pm+VSD4n-(A`n)_3T$GB%0(PZnrN(C{`O zw%$%qGi;BV_Wrh=iYat0BI^?)2Ihn^0 z)RBKQ*K)lL;2q-#w*k~S5+nS*;80L1iyU#%di#9L>*D*PVWt#uVNAd5&(`Cb@U;h? zEW>B!8Mh*gT&JnLjMngKOeG9u9l;{?WOUM(@8a>83+}I;-LQ6G0jGP98cL<4{{vJb z8SggGlV=rv4-B0-M1S?DeSq+eBoh!f_fxGBUi~DCl!Y-4kKOG0)Juka@+6tLb}MaoMtJXc;k|yE5%uKb(`#3G937{+In5eeDZ5r@b1=rOhSS`gdcx<% zA_0CRTJRsizik*d@)+V{K$FlZ!8|BrHR}Hb6n#43dn^bucZTnLcC9LTsYT5D+qZ>x z8p5T=(aFql$&9?@`7MctS#|N~I=A__Pc*;_%-BscO-ZF>4#?8Z8NvT3uxSS7+&=5X`bV>@FQ`R5}*0_ zg?O2rit?NL8Kd`}Y6&qi497!d@W;$ryQL6dUx#N8(~_&Am@|HjW5YohIcC zs!nN;(lobhhs3>KXFqy~aCCCzF?Y~Q51r+eoo)XWoN2K1m-n?o%c2hp{RK&!f=lc+ zw}(v^{7>dvQ-v|Emm5raB)e)2OEI}GMA+mE-NFTB;?#_B{otOZ2heG?0< zfFg0b_*Vt2bc)?a$;F1xL#Ru=YurmZx@Jz`{k6Y_o5NpbqprWVa^x2a5#3&Vc|`Ei zLA4hD!g>1H&S$43#cnkIey=p=7TBqs)EPw0%b%#DF(WEdozj8;~er4JJ72(48+ha4H z(!l$%Jn)?R$&Ln#1fjCy?^W*hh-4z}@FTUq77xhByS+aoMnYbCo)G!^4WV)LisV}u zKGf66!i=;oR2961lk$0ijrvql3;hvVU84+UPhEJV0xQyteW=W~UvOXg;ht5;*EcUX zhMSe|zj#b!M4GUlHpMDOLj78jPrEbEy?L&jGryvuHKq~$jk*|-mpmVN?b=^_kGGGA z!9*_+S%x?=3g)M?S-daptJ_!=qlIo?sE+3!mIW^K2Rci*7Ri%bHEN7@LU0z(@!C90!touzaLM^kL%YP8Ao zfIYpKx<2_W(L$8?_5P$5;zn9OjGSMnKIke)t{2YMae33XaS|5yGPc*>sIQL z+nPS!6R4z8XAw7VgJszlI_dX7@srxLvSt4a(`hRAQ)(pBM58JpdE(OizFD|1j%C|A zhy`|0VqY!a^<{T5rdi(Kc;)soBD`%c=i8vQszA$b2Ou0ec>+qqekk5{M}{2|uA*O# zUTyF?>Z=3Y%J0~d?>rE#s*$kcRSF8P+_${0`{+c-lsK6Et3KsE>=dF}?Cf*DCqP<< zBk&V)|GqpfRYJwmoc%(C(l6!<2R`L}z|@AhdFM17KT~;`jU?NdeQmh1S`NkiHs~@e|OLVS$naHmhvIX4|Jvx4!y?s=X{;3LoY~aB$ z9r2k@#mfXL%hjP1Lj#XnXkFZF6>tdHHSwj#p8W=}viO;IPvV1|9^ z!fW_1J{IzptepL+a2a2kuCYgRUD`YUZ6)S@z;^QoaW5yoWWcJHwU24s9xII#ftdUL zL`8zOc=AD2nFGRCwLr7ixHJ7sS<7=n#gY8^t#^T!A2?ONEHDp|@?L4?I$j16jYfQw z9GcEv(tMIM%IPVeXI^4!@XxhHCw-V9pTjvx{vf5f>Cf!lKF#B1n2w(HhN*m2m#%?{ zp{pVl$1Z5Sf99<&_+eVv{7h5l*YD`huLi#6`-C^N+!nnxr}_2ha|Np;e#g-D-1 From c3ae39a7e8ee3ef745208b227771c12a6621e432 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 12 Jul 2015 14:42:07 -0600 Subject: [PATCH 35/52] Clothing with bomb armor are less likely to be shredded Should have been this way from the start. --- code/modules/mob/living/carbon/human/inventory.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 66c011ba797..46a203afc1b 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -452,7 +452,7 @@ shredded = -1 //Heat protection = Fireproof else if(shock > 0) - if(prob(Clamp(shock,0,90))) + if(prob(max(shock-armor["bomb"],0))) shredded = armor["bomb"] + 10 //It gets shredded, but it also absorbs the shock the clothes underneath would recieve by this amount else shredded = -1 //It survives explosion From e3973aff821db701431afae1faa9dc8e23635f9b Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 12 Jul 2015 18:36:13 -0600 Subject: [PATCH 36/52] Adds Changeling Swap Forms Ability - Chemical Cost: 40 - DNA Cost: 2 - Requires at least an aggressive grab, and 2 seconds to work - Both subjects will slightly jitter during the brief process - After two seconds if the changeling hasn't been interrupted, they swap minds --- .../gamemodes/changeling/powers/absorb.dm | 58 +++++++++++++++++++ .../changelogs/ikarrus-changelingmindswap.yml | 6 ++ 2 files changed, 64 insertions(+) create mode 100644 html/changelogs/ikarrus-changelingmindswap.yml diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index 516a407cbef..708237e7d93 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -103,3 +103,61 @@ protected_dna |= new_dna return absorbed_dna |= new_dna + + + + +/obj/effect/proc_holder/changeling/swap_form + name = "Swap Forms" + desc = "We force ourselves into the body of another form, pushing their consciousness into the form we left behind." + helptext = "We will bring all our abilities with us, but we will lose our old form DNA in exchange for the new one. The process will seem suspicious to any observers." + chemical_cost = 40 + dna_cost = 2 + req_human = 1 //Monkeys can't grab + genetic_damage = 50 + +/obj/effect/proc_holder/changeling/swap_form/can_sting(var/mob/living/carbon/user) + if(!..()) + return + var/obj/item/weapon/grab/G = user.get_active_hand() + if(!istype(G) || (G.state < GRAB_AGGRESSIVE)) + user << "We must have an aggressive grab on creature in our active hand to do this!" + return + var/mob/living/carbon/target = G.affecting + if((target.disabilities & NOCLONE) || (target.disabilities & HUSK)) + user << "DNA of [target] is ruined beyond usability!" + return + if(!check_dna_integrity(target) || !ishuman(target)) + user << "[target] is not compatible with this ability." + return + return 1 + + +/obj/effect/proc_holder/changeling/swap_form/sting_action(var/mob/living/carbon/user) + var/obj/item/weapon/grab/G = user.get_active_hand() + var/mob/living/carbon/target = G.affecting + var/datum/changeling/changeling = user.mind.changeling + + user << "We tighen our grip. We must hold still...." + target.do_jitter_animation(500) + user.do_jitter_animation(500) + + if(!do_mob(user,target,20)) + user << "" + return + + target << "[user] tightens their grip as a painful sensation invades your body." + + if(!changeling.has_dna(target.dna)) + changeling.absorb_dna(target, user) + changeling.protected_dna -= user.dna + changeling.absorbed_dna -= user.dna + + var/mob/dead/observer/ghost = target.ghostize(0) + user.mind.transfer_to(target) + if(ghost && ghost.mind) + ghost.mind.transfer_to(user) + user.key = ghost.key + + user.Paralyse(2) + target << "Our genes cry out as we swap our [user] form for [target]." diff --git a/html/changelogs/ikarrus-changelingmindswap.yml b/html/changelogs/ikarrus-changelingmindswap.yml new file mode 100644 index 00000000000..fe3366f1643 --- /dev/null +++ b/html/changelogs/ikarrus-changelingmindswap.yml @@ -0,0 +1,6 @@ +author: Ikarrus + +delete-after: True + +changes: + - rscadd: "Changelings now have the ability to swap forms with another being." From c4c6f9a2537176317890971483ac4b8f65bd96c8 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 12 Jul 2015 18:48:58 -0600 Subject: [PATCH 37/52] Fucking spans --- code/game/gamemodes/changeling/powers/absorb.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index 708237e7d93..abe45f557f5 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -143,7 +143,7 @@ user.do_jitter_animation(500) if(!do_mob(user,target,20)) - user << "" + user << "The body swap has been interrupted!" return target << "[user] tightens their grip as a painful sensation invades your body." From 571d4f4fb9e05eb60e7a09f6ae3d21b4db03453d Mon Sep 17 00:00:00 2001 From: francinum Date: Mon, 13 Jul 2015 00:26:31 -0400 Subject: [PATCH 38/52] Fixes #10587 --- code/game/gamemodes/game_mode.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index eddb0216d76..fa24f0be0f7 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -258,7 +258,7 @@ /datum/game_mode/proc/send_intercept() - var/intercepttext = "Centcom Update Requested staus information:
" + var/intercepttext = "Centcom Update Requested status information:
" intercepttext += " Centcom has recently been contacted by the following syndicate affiliated organisations in your area, please investigate any information you may have:" var/list/possible_modes = list() From de699d3b5b09dc85e2dc9f85e74706e336bd8d1f Mon Sep 17 00:00:00 2001 From: bustygoku Date: Mon, 13 Jul 2015 04:09:39 -0700 Subject: [PATCH 39/52] Tanks Show Pressure When Examined --- code/game/objects/items/weapons/tanks/tanks.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 08e3c4ad173..11437945cb0 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -48,6 +48,8 @@ if (icon == src) user << "If you want any more information you'll need to get closer." return + user << "The pressure gauge reads [src.air_contents.return_pressure()]." + var/celsius_temperature = src.air_contents.temperature-T0C var/descriptive From 11ffb0a39053485beabd5af366d7510cfdf19b34 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 13 Jul 2015 09:24:01 -0600 Subject: [PATCH 40/52] Halves Domination Time Domination time will also be displayed in minutes on everything but the active countdown itself --- code/game/gamemodes/gang/dominator.dm | 8 +++--- code/game/gamemodes/gang/gang.dm | 2 ++ code/game/gamemodes/gang/gang_datum.dm | 2 +- code/game/gamemodes/gang/recaller.dm | 2 +- html/changelogs/ikarrus-gangtime.yml | 36 ++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/ikarrus-gangtime.yml diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index 2c0e0b413bb..206a1f7d230 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -167,8 +167,8 @@ user << "Error: Unable to breach station network. Firewall has logged our signature and is blocking all further attempts." return - var/time = max(300,900 - ((round((tempgang.territory.len/start_state.num_territories)*200, 1) - 60) * 15)) - if(alert(user,"With [round((tempgang.territory.len/start_state.num_territories)*100, 1)]% station control, a takeover will require [time] seconds.\nYour gang will be unable to gain influence while it is active.\nThe entire station will likely be alerted to it once it starts.\nYou have [tempgang.dom_attempts] attempt(s) remaining. Are you ready?","Confirm","Ready","Later") == "Ready") + var/time = round(get_domination_time(tempgang)/60,0.1) + if(alert(user,"With [round((tempgang.territory.len/start_state.num_territories)*100, 1)]% station control, a takeover will require [time] minutes.\nYour gang will be unable to gain influence while it is active.\nThe entire station will likely be alerted to it once it starts.\nYou have [tempgang.dom_attempts] attempt(s) remaining. Are you ready?","Confirm","Ready","Later") == "Ready") if (!tempgang.dom_attempts || !in_range(src, user) || !istype(src.loc, /turf)) return 0 @@ -182,10 +182,10 @@ var/area/A = get_area(loc) var/locname = initial(A.name) priority_announce("Network breach detected in [locname]. The [gang.name] Gang is attempting to seize control of the station!","Network Alert") - gang.message_gangtools("Hostile takeover in progress: Estimated [time] seconds until victory.[gang.dom_attempts ? "" : " This is your final attempt."]") + gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]") for(var/datum/gang/G in ticker.mode.gangs) if(G != gang) - G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] seconds until our defeat.",1,1) + G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1) /obj/machinery/dominator/attack_alien(mob/living/user) user.do_attack_animation(src) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index b8fe4eaa51a..d4d0d7eea00 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -231,6 +231,8 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" gang_bosses += G.bosses return gang_bosses +/proc/get_domination_time(var/datum/gang/G) + return max(300,900 - (round((G.territory.len/start_state.num_territories)*100, 1) * 12)) ////////////////////////////////////////////////////////////////////// //Announces the end of the game with all relavent information stated// diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm index 6a38e990196..b587cd4ee87 100644 --- a/code/game/gamemodes/gang/gang_datum.dm +++ b/code/game/gamemodes/gang/gang_datum.dm @@ -56,7 +56,7 @@ ticker.mode.set_antag_hud(defector_mind.current, null) /datum/gang/proc/domination(var/modifier=1) - dom_timer = max(300,900 - ((round((territory.len/start_state.num_territories)*200, 1) - 60) * 15)) * modifier + dom_timer = get_domination_time(src) * modifier set_security_level("delta") SSshuttle.emergencyNoEscape = 1 diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm index 296cb7958b9..6cfc0a742ad 100644 --- a/code/game/gamemodes/gang/recaller.dm +++ b/code/game/gamemodes/gang/recaller.dm @@ -174,7 +174,7 @@ dat += "Station Dominator
" else dat += "Station Dominator
" - dat += "(Estimated Takeover Time: [round(max(300,900 - ((round((gang.territory.len/start_state.num_territories)*200, 10) - 60) * 15))/60,1)] minutes)
" + dat += "(Estimated Takeover Time: [round(get_domination_time(gang)/60,0.1)] minutes)
" dat += "
" dat += "Refresh
" diff --git a/html/changelogs/ikarrus-gangtime.yml b/html/changelogs/ikarrus-gangtime.yml new file mode 100644 index 00000000000..ccaf6902d08 --- /dev/null +++ b/html/changelogs/ikarrus-gangtime.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Ikarrus + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Halved Domination Time." \ No newline at end of file From bde367b9b98a1a4bdfe8b3fe7425ca024f73129c Mon Sep 17 00:00:00 2001 From: bustygoku Date: Mon, 13 Jul 2015 15:30:21 -0700 Subject: [PATCH 41/52] KPa Added --- code/game/objects/items/weapons/tanks/tanks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 11437945cb0..ae935a557ec 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -48,7 +48,7 @@ if (icon == src) user << "If you want any more information you'll need to get closer." return - user << "The pressure gauge reads [src.air_contents.return_pressure()]." + user << "The pressure gauge reads [src.air_contents.return_pressure()] KPa." var/celsius_temperature = src.air_contents.temperature-T0C var/descriptive From 4d0739c387d58f734d3fb5591bd42ccde87e5dab Mon Sep 17 00:00:00 2001 From: bustygoku Date: Mon, 13 Jul 2015 17:31:50 -0700 Subject: [PATCH 42/52] LowerCase K --- code/game/objects/items/weapons/tanks/tanks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index ae935a557ec..a275f3bb36d 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -48,7 +48,7 @@ if (icon == src) user << "If you want any more information you'll need to get closer." return - user << "The pressure gauge reads [src.air_contents.return_pressure()] KPa." + user << "The pressure gauge reads [src.air_contents.return_pressure()] kPa." var/celsius_temperature = src.air_contents.temperature-T0C var/descriptive From 1c7639775c266cec926bd30b819c82df19059b26 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 13 Jul 2015 19:56:21 -0600 Subject: [PATCH 43/52] Minimum time reduced to 3 minutes Doubled uniform bonus for domination timer --- code/game/gamemodes/gang/gang.dm | 2 +- code/game/gamemodes/gang/gang_datum.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index d4d0d7eea00..254725f0ffe 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -232,7 +232,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" return gang_bosses /proc/get_domination_time(var/datum/gang/G) - return max(300,900 - (round((G.territory.len/start_state.num_territories)*100, 1) * 12)) + return max(180,900 - (round((G.territory.len/start_state.num_territories)*100, 1) * 12)) ////////////////////////////////////////////////////////////////////// //Announces the end of the game with all relavent information stated// diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm index b587cd4ee87..9fda51eb919 100644 --- a/code/game/gamemodes/gang/gang_datum.dm +++ b/code/game/gamemodes/gang/gang_datum.dm @@ -166,7 +166,7 @@ //Calculate and report influence growth var/message = "[src] Gang Status Report:
*---------*
" if(isnum(dom_timer)) - var/new_time = max(300,dom_timer - ((territory.len + uniformed) * 2)) + var/new_time = max(180,dom_timer - (uniformed * 4) - (territory.len * 2)) if(new_time < dom_timer) message += "Takeover shortened by [dom_timer - new_time] seconds for defending [territory.len] territories and [uniformed] uniformed gangsters.
" dom_timer = new_time From 1016e4e2b1a1b81e3d0feb327466a399a7626abc Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 13 Jul 2015 20:21:37 -0600 Subject: [PATCH 44/52] Fixes round-end report bug --- code/game/gamemodes/gang/gang.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 254725f0ffe..3b46ffd0330 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -239,11 +239,12 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" ////////////////////////////////////////////////////////////////////// /datum/game_mode/proc/auto_declare_completion_gang(datum/gang/winner) - if(!winner) - world << "The station was [station_was_nuked ? "destroyed!" : "evacuated before a gang could claim it! The station wins!"]
" - else - world << "The [winner.name] Gang successfully performed a hostile takeover of the station!
" - ..() + if(gangs.len) + if(!winner) + world << "The station was [station_was_nuked ? "destroyed!" : "evacuated before a gang could claim it! The station wins!"]
" + else + world << "The [winner.name] Gang successfully performed a hostile takeover of the station!
" + for(var/datum/gang/G in gangs) world << "
The [G.name] Gang was [winner==G ? "victorious" : "defeated"] with [round((G.territory.len/start_state.num_territories)*100, 1)]% control of the station!" world << "
The [G.name] Gang Bosses were:" From a11105df3491706f26b62b9847148b6946fe9fd8 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 13 Jul 2015 21:06:31 -0600 Subject: [PATCH 45/52] Adds access requirement to Virology The code for the new door buttons didn't check for access. --- .../embedded_controller/access_controller.dm | 6 +++ html/changelogs/Ikarrus-ayy.yml | 37 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 html/changelogs/Ikarrus-ayy.yml diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 0e54a939366..72302d9ba9a 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -48,6 +48,9 @@ return if(busy) return + if(!allowed(user)) + user << "Access denied." + return if(controller && !controller.busy && door) if(controller.stat & NOPOWER) return @@ -114,6 +117,9 @@ return if(busy) return + if(!allowed(usr)) + usr << "Access denied." + return switch(href_list["command"]) if("close_exterior") onlyClose(exteriorAirlock) diff --git a/html/changelogs/Ikarrus-ayy.yml b/html/changelogs/Ikarrus-ayy.yml new file mode 100644 index 00000000000..d75c6b46a69 --- /dev/null +++ b/html/changelogs/Ikarrus-ayy.yml @@ -0,0 +1,37 @@ + +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Ikarrus + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Virology is no longer all-access." \ No newline at end of file From 83a435273e930363875e51d4424a76dca43fc631 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 13 Jul 2015 22:48:01 -0600 Subject: [PATCH 46/52] Fixes grenade casings burning forever --- code/game/objects/items/weapons/grenades/grenade.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 51272bbd0a7..23e19c70f92 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -17,6 +17,7 @@ /obj/item/weapon/grenade/burn() prime() + ..() /obj/item/weapon/grenade/proc/clown_check(var/mob/living/carbon/human/user) if(user.disabilities & CLUMSY && prob(50)) From 2636211ca4b88d6a18a952decb37126d832e1da0 Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Tue, 14 Jul 2015 07:39:00 +0100 Subject: [PATCH 47/52] Fixes bots responding to greetings not mentioning them. --- bot/NanoTrasenBot.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bot/NanoTrasenBot.py b/bot/NanoTrasenBot.py index 2e0678bbd96..1e1aac5087d 100644 --- a/bot/NanoTrasenBot.py +++ b/bot/NanoTrasenBot.py @@ -1101,6 +1101,19 @@ while True: comboer = "" if "evening" in influx.lower() and "all" in influx.lower() and len(influx.lower().split(" ")) > 3: pass + + talking_about_me = False + if Name.lower() in influx.lower(): + talking_about_me = True + + for bot_name in SName: + if bot_name.lower() in influx.lower(): + talking_about_me = True + break + + if not talking_about_me: + continue #it got annoying REAL FAST when it'd interject any time a greeting was used, regardless of context + elif truesender not in operators: if debug: print truesender+"::"+influx From 8f34ebee2212822b70b1180a65b2e706eb144968 Mon Sep 17 00:00:00 2001 From: sybil-tgstation13 Date: Tue, 14 Jul 2015 03:04:04 -0400 Subject: [PATCH 48/52] Automatic changelog compile --- html/changelog.html | 10 ++++++++ html/changelogs/.all_changelog.yml | 5 ++++ html/changelogs/AnturK-Morph.yml | 37 ------------------------------ html/changelogs/jordie ln.yml | 6 ----- 4 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 html/changelogs/AnturK-Morph.yml delete mode 100644 html/changelogs/jordie ln.yml diff --git a/html/changelog.html b/html/changelog.html index 6c8064670fa..acf93207d5d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,16 @@ --> " return dat -/obj/machinery/autolathe/proc/category_win(mob/user,var/selected_category) +/obj/machinery/autolathe/proc/category_win(mob/user,selected_category) var/dat = "Return to main menu" dat += "

Browsing [selected_category]:


" dat += "Total amount: [materials.total_amount] / [materials.max_amount] cm3
" @@ -330,7 +330,7 @@ dat += "
" return dat -/obj/machinery/autolathe/proc/can_build(var/datum/design/D) +/obj/machinery/autolathe/proc/can_build(datum/design/D) var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff) if(D.materials[MAT_METAL] && (materials.amount(MAT_METAL) < (D.materials[MAT_METAL] / coeff))) @@ -339,7 +339,7 @@ return 0 return 1 -/obj/machinery/autolathe/proc/get_design_cost(var/datum/design/D) +/obj/machinery/autolathe/proc/get_design_cost(datum/design/D) var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff) var/dat if(D.materials[MAT_METAL]) @@ -361,7 +361,7 @@ else return 0 -/obj/machinery/autolathe/proc/adjust_hacked(var/hack) +/obj/machinery/autolathe/proc/adjust_hacked(hack) hacked = hack if(hack) diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index f9543249cfa..cb21aa88feb 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -125,7 +125,7 @@ if (health <= 0) explode() -/obj/machinery/bot/proc/Emag(mob/user as mob) //Master Emag proc. Ensure this is called in your bot before setting unique functions. +/obj/machinery/bot/proc/Emag(mob/user) //Master Emag proc. Ensure this is called in your bot before setting unique functions. if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again. locked = 0 emagged = 1 @@ -149,7 +149,7 @@ else user << "[src] is in pristine condition." -/obj/machinery/bot/attack_alien(var/mob/living/carbon/alien/user as mob) +/obj/machinery/bot/attack_alien(mob/living/carbon/alien/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) health -= rand(15,30)*brute_dam_coeff @@ -160,7 +160,7 @@ healthcheck() -/obj/machinery/bot/attack_animal(var/mob/living/simple_animal/M as mob) +/obj/machinery/bot/attack_animal(mob/living/simple_animal/M) M.do_attack_animation(src) if(M.melee_damage_upper == 0) return @@ -238,7 +238,7 @@ return 1 //Successful completion. Used to prevent child process() continuing if this one is ended early. -/obj/machinery/bot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/bot/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) if(!locked) open = !open @@ -274,11 +274,11 @@ ..() healthcheck() -/obj/machinery/bot/emag_act(mob/user as mob) +/obj/machinery/bot/emag_act(mob/user) if(emagged < 2) Emag(user) -/obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage if(prob(75) && Proj.damage > 0) @@ -349,7 +349,7 @@ /obj/machinery/bot/attack_ai(mob/user as mob) attack_hand(user) -/obj/machinery/bot/proc/speak(var/message, freq) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio. +/obj/machinery/bot/proc/speak(message, freq) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio. if((!on) || (!message)) return if(freq) @@ -371,7 +371,7 @@ Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1) The proc would return a human next to the bot to be set to the patient var. Pass the desired type path itself, declaring a temporary var beforehand is not required. */ -/obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range = DEFAULT_SCAN_RANGE) +/obj/machinery/bot/proc/scan(scan_type, old_target, scan_range = DEFAULT_SCAN_RANGE) var/final_result for (var/scan in view (scan_range, src) ) //Search for something in range! if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! @@ -386,11 +386,11 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r return final_result //When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. -/obj/machinery/bot/proc/process_scan(var/scan_target) +/obj/machinery/bot/proc/process_scan(scan_target) return scan_target -/obj/machinery/bot/proc/add_to_ignore(var/subject) +/obj/machinery/bot/proc/add_to_ignore(subject) if(ignore_list.len < 50) //This will help keep track of them, so the bot is always trying to reach a blocked spot. ignore_list |= subject else if (ignore_list.len >= subject) //If the list is full, insert newest, delete oldest. @@ -401,7 +401,7 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r Movement proc for stepping a bot through a path generated through A-star. Pass a positive integer as an argument to override a bot's default speed. */ -/obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) +/obj/machinery/bot/proc/bot_move(dest, move_speed) if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set. path = list() @@ -429,7 +429,7 @@ Pass a positive integer as an argument to override a bot's default speed. return 1 -/obj/machinery/bot/proc/bot_step(var/dest) +/obj/machinery/bot/proc/bot_step(dest) if(path && path.len > 1) step_towards(src, path[1]) if(get_turf(src) == path[1]) //Successful move @@ -446,7 +446,7 @@ Pass a positive integer as an argument to override a bot's default speed. if(mode != BOT_SUMMON && mode != BOT_RESPONDING) botcard.access = prev_access -/obj/machinery/bot/proc/call_bot(var/caller, var/turf/waypoint, var/message=TRUE) +/obj/machinery/bot/proc/call_bot(caller, turf/waypoint, message=TRUE) bot_reset() //Reset a bot before setting it to call mode. var/area/end_area = get_area(waypoint) @@ -620,7 +620,7 @@ obj/machinery/bot/proc/bot_reset() destination = nearest_beacon //PDA control. Some bots, especially MULEs, may have more parameters. -/obj/machinery/bot/proc/bot_control(var/command, mob/user, var/turf/user_turf, var/list/user_access = list()) +/obj/machinery/bot/proc/bot_control(command, mob/user, turf/user_turf, list/user_access = list()) if(!on || emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands. return 1 //ACCESS DENIED // process control input @@ -655,11 +655,11 @@ obj/machinery/bot/proc/bot_reset() // calculates a path to the current destination // given an optional turf to avoid -/obj/machinery/bot/proc/calc_path(var/turf/avoid) +/obj/machinery/bot/proc/calc_path(turf/avoid) check_bot_access() path = get_path_to(loc, patrol_target, src, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid) -/obj/machinery/bot/proc/calc_summon_path(var/turf/avoid) +/obj/machinery/bot/proc/calc_summon_path(turf/avoid) check_bot_access() spawn() path = get_path_to(loc, summon_target, src, /turf/proc/Distance_cardinal, 0, 150, id=botcard, exclude=avoid) diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index f73276842c3..ea5613108f7 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -71,14 +71,14 @@ text_dehack = "[name]'s software has been reset!" text_dehack_fail = "[name] does not seem to respond to your repair code!" -/obj/machinery/bot/cleanbot/attack_hand(mob/user as mob) +/obj/machinery/bot/cleanbot/attack_hand(mob/user) . = ..() if (.) return usr.set_machine(src) interact(user) -/obj/machinery/bot/cleanbot/interact(mob/user as mob) +/obj/machinery/bot/cleanbot/interact(mob/user) var/dat dat += hack(user) dat += text({" @@ -106,7 +106,7 @@ text("[on ? "On" : "Off"]")) updateUsrDialog() updateUsrDialog() -/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(allowed(user) && !open && !emagged) locked = !locked @@ -121,13 +121,13 @@ text("[on ? "On" : "Off"]")) else return ..() -/obj/machinery/bot/cleanbot/Emag(mob/user as mob) +/obj/machinery/bot/cleanbot/Emag(mob/user) ..() if(emagged == 2) if(user) user << "[src] buzzes and beeps." -/obj/machinery/bot/cleanbot/process_scan(var/obj/effect/decal/cleanable/D) +/obj/machinery/bot/cleanbot/process_scan(obj/effect/decal/cleanable/D) for(var/T in target_types) if(istype(D, T)) return D @@ -209,7 +209,7 @@ text("[on ? "On" : "Off"]")) target_types += /obj/effect/decal/cleanable/blood/drip/ target_types += /obj/effect/decal/cleanable/trail_holder -/obj/machinery/bot/cleanbot/proc/clean(var/obj/effect/decal/cleanable/target) +/obj/machinery/bot/cleanbot/proc/clean(obj/effect/decal/cleanable/target) anchored = 1 icon_state = "cleanbot-c" visible_message("[src] begins to clean up [target]") @@ -240,7 +240,7 @@ text("[on ? "On" : "Off"]")) qdel(src) return -/obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob, params) +/obj/item/weapon/bucket_sensor/attackby(obj/item/W, mob/user as mob, params) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) if(!user.unEquip(W)) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index c1869318560..8aaf4173d49 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -98,7 +98,7 @@ text_dehack = "You restore [name]'s combat inhibitor." text_dehack_fail = "[name] ignores your attempts to restrict him!" -/obj/machinery/bot/ed209/attack_hand(mob/user as mob) +/obj/machinery/bot/ed209/attack_hand(mob/user) . = ..() if (.) return @@ -159,7 +159,7 @@ Auto Patrol[]"}, declare_arrests = !declare_arrests updateUsrDialog() -/obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/bot/ed209/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (allowed(user) && !open && !emagged) locked = !locked @@ -185,7 +185,7 @@ Auto Patrol[]"}, shootAt(user) mode = BOT_HUNT -/obj/machinery/bot/ed209/Emag(mob/user as mob) +/obj/machinery/bot/ed209/Emag(mob/user) ..() if(emagged == 2) if(user) @@ -196,7 +196,7 @@ Auto Patrol[]"}, icon_state = "[lasercolor]ed209[on]" set_weapon() -/obj/machinery/bot/ed209/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/ed209/bullet_act(obj/item/projectile/Proj) if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet)) if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)) if (!Proj.nodamage && Proj.damage < src.health) @@ -467,7 +467,7 @@ Auto Patrol[]"}, else if(lasercolor == "r") projectile = /obj/item/projectile/lasertag/redtag -/obj/machinery/bot/ed209/proc/shootAt(var/mob/target) +/obj/machinery/bot/ed209/proc/shootAt(mob/target) if(lastfired && world.time - lastfired < shot_delay) return lastfired = world.time @@ -494,7 +494,7 @@ Auto Patrol[]"}, A.xo = U.x - T.x A.fire() -/obj/machinery/bot/ed209/attack_alien(var/mob/living/carbon/alien/user as mob) +/obj/machinery/bot/ed209/attack_alien(mob/living/carbon/alien/user) ..() if (!isalien(target)) target = user @@ -541,7 +541,7 @@ Auto Patrol[]"}, -/obj/item/weapon/ed209_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/ed209_assembly/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/pen)) @@ -689,7 +689,7 @@ Auto Patrol[]"}, qdel(src) -/obj/machinery/bot/ed209/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/ed209/bullet_act(obj/item/projectile/Proj) if(!disabled) var/lasertag_check = 0 if((lasercolor == "b")) diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 1a5899ee4df..75194d08fcd 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -90,14 +90,14 @@ text_dehack = "You detect errors in [name] and reset his programming." text_dehack_fail = "[name] is not responding to reset commands!" -/obj/machinery/bot/floorbot/attack_hand(mob/user as mob) +/obj/machinery/bot/floorbot/attack_hand(mob/user) . = ..() if (.) return usr.set_machine(src) interact(user) -/obj/machinery/bot/floorbot/interact(mob/user as mob) +/obj/machinery/bot/floorbot/interact(mob/user) var/dat dat += hack(user) dat += "Floor Repairer Controls v1.1

" @@ -127,7 +127,7 @@ return -/obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob, params) +/obj/machinery/bot/floorbot/attackby(obj/item/W , mob/user, params) if(istype(W, /obj/item/stack/tile/plasteel)) var/obj/item/stack/tile/plasteel/T = W if(amount >= 50) @@ -156,7 +156,7 @@ else ..() -/obj/machinery/bot/floorbot/Emag(mob/user as mob) +/obj/machinery/bot/floorbot/Emag(mob/user) ..() if(emagged == 2) if(user) @@ -305,7 +305,7 @@ speak("Requesting refill at [get_area(src)]!", radio_frequency) nagged = 1 -/obj/machinery/bot/floorbot/proc/is_hull_breach(var/turf/t) //Ignore space tiles not considered part of a structure, also ignores shuttle docking areas. +/obj/machinery/bot/floorbot/proc/is_hull_breach(turf/t) //Ignore space tiles not considered part of a structure, also ignores shuttle docking areas. var/area/t_area = get_area(t) if (t_area && (t_area.name == "Space" || findtext(t_area.name, "huttle"))) return 0 @@ -313,7 +313,7 @@ return 1 //Floorbots, having several functions, need sort out special conditions here. -obj/machinery/bot/floorbot/process_scan(var/scan_target) +obj/machinery/bot/floorbot/process_scan(scan_target) var/result var/turf/simulated/floor/F switch(process_type) @@ -341,7 +341,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) result = scan_target return result -/obj/machinery/bot/floorbot/proc/repair(var/turf/target_turf) +/obj/machinery/bot/floorbot/proc/repair(turf/target_turf) if(istype(target_turf, /turf/space/)) //Must be a hull breach or in bridge mode to continue. @@ -385,7 +385,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) anchored = 0 target = null -/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T) +/obj/machinery/bot/floorbot/proc/eattile(obj/item/stack/tile/plasteel/T) if(!istype(T, /obj/item/stack/tile/plasteel)) return visible_message("[src] begins to collect tiles.") @@ -406,7 +406,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) target = null mode = BOT_IDLE -/obj/machinery/bot/floorbot/proc/maketile(var/obj/item/stack/sheet/metal/M) +/obj/machinery/bot/floorbot/proc/maketile(obj/item/stack/sheet/metal/M) if(!istype(M, /obj/item/stack/sheet/metal)) return visible_message("[src] begins to create tiles.") @@ -462,7 +462,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) return -/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob, params) +/obj/item/weapon/storage/toolbox/mechanical/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) if(!istype(T, /obj/item/stack/tile/plasteel)) ..() return @@ -481,7 +481,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) user << "You need 10 floor tiles to start building a floorbot!" return -/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob, params) +/obj/item/weapon/toolbox_tiles/attackby(obj/item/W, mob/user, params) ..() if(isprox(W)) qdel(W) @@ -501,7 +501,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) created_name = t -/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob, params) +/obj/item/weapon/toolbox_tiles_sensor/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) qdel(W) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 0b60c45b1b7..e8a4b1ce2eb 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -133,10 +133,10 @@ text_dehack = "You reset [name]'s reagent processor circuits." text_dehack_fail = "[name] seems damaged and does not respond to reprogramming!" -/obj/machinery/bot/medbot/attack_paw(mob/user as mob) +/obj/machinery/bot/medbot/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/bot/medbot/attack_hand(mob/user as mob) +/obj/machinery/bot/medbot/attack_hand(mob/user) . = ..() if (.) return @@ -259,7 +259,7 @@ if (health < current_health) //if medbot took some damage step_to(src, (get_step_away(src,user))) -/obj/machinery/bot/medbot/Emag(mob/user as mob) +/obj/machinery/bot/medbot/Emag(mob/user) ..() if(emagged == 2) declare_crit = 0 @@ -271,7 +271,7 @@ if(user) oldpatient = user -/obj/machinery/bot/medbot/process_scan(var/mob/living/carbon/human/H) +/obj/machinery/bot/medbot/process_scan(mob/living/carbon/human/H) if (H.stat == 2) return @@ -362,7 +362,7 @@ return -/obj/machinery/bot/medbot/proc/assess_patient(mob/living/carbon/C as mob) +/obj/machinery/bot/medbot/proc/assess_patient(mob/living/carbon/C) //Time to see if they need medical help! if(C.stat == 2) return 0 //welp too late for them! @@ -409,7 +409,7 @@ return 0 -/obj/machinery/bot/medbot/proc/medicate_patient(mob/living/carbon/C as mob) +/obj/machinery/bot/medbot/proc/medicate_patient(mob/living/carbon/C) if(!on) return @@ -504,7 +504,7 @@ reagent_id = null return -/obj/machinery/bot/medbot/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/medbot/bullet_act(obj/item/projectile/Proj) if(Proj.flag == "taser") stunned = min(stunned+10,20) ..() @@ -533,7 +533,7 @@ qdel(src) return -/obj/machinery/bot/medbot/proc/declare(var/crit_patient) +/obj/machinery/bot/medbot/proc/declare(crit_patient) if(declare_cooldown) return var/area/location = get_area(src) @@ -546,7 +546,7 @@ * Medbot Assembly -- Can be made out of all three medkits. */ -/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob, params) +/obj/item/weapon/storage/firstaid/attackby(obj/item/robot_parts/S, mob/user, params) if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm))) ..() @@ -574,7 +574,7 @@ qdel(src) -/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/pen)) var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index f8845ab32b4..f7b2e0c8010 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -83,7 +83,7 @@ obj/machinery/bot/mulebot/bot_reset() // screwdriver: open/close hatch // cell: insert it // other: chance to knock rider off bot -/obj/machinery/bot/mulebot/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/bot/mulebot/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda)) if(toggle_lock(user)) user << "Controls [(locked ? "locked" : "unlocked")]." @@ -132,13 +132,13 @@ obj/machinery/bot/mulebot/bot_reset() ..() return -/obj/machinery/bot/mulebot/emag_act(mob/user as mob) +/obj/machinery/bot/mulebot/emag_act(mob/user) locked = !locked user << "You [locked ? "lock" : "unlock"] the mulebot's controls!" flick("mulebot-emagged", src) playsound(loc, 'sound/effects/sparks1.ogg', 100, 0) -/obj/machinery/bot/mulebot/ex_act(var/severity) +/obj/machinery/bot/mulebot/ex_act(severity) unload(0) switch(severity) if(1) @@ -150,7 +150,7 @@ obj/machinery/bot/mulebot/bot_reset() wires.RandomCut() return -/obj/machinery/bot/mulebot/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/mulebot/bullet_act(obj/item/projectile/Proj) if(..()) if(prob(50) && !isnull(load)) unload(0) @@ -159,18 +159,18 @@ obj/machinery/bot/mulebot/bot_reset() wires.RandomCut() -/obj/machinery/bot/mulebot/attack_ai(var/mob/user) +/obj/machinery/bot/mulebot/attack_ai(mob/user) user.set_machine(src) interact(user, 1) -/obj/machinery/bot/mulebot/attack_hand(var/mob/user) +/obj/machinery/bot/mulebot/attack_hand(mob/user) . = ..() if (.) return user.set_machine(src) interact(user, 0) -/obj/machinery/bot/mulebot/interact(var/mob/user, var/ai=0) +/obj/machinery/bot/mulebot/interact(mob/user, ai=0) var/dat dat += "

Multiple Utility Load Effector Mk. V

" dat += "ID: [suffix]
" @@ -308,7 +308,7 @@ obj/machinery/bot/mulebot/bot_reset() usr.unset_machine() return -/obj/machinery/bot/mulebot/bot_control(var/command, mob/user, pda= 0) +/obj/machinery/bot/mulebot/bot_control(command, mob/user, pda= 0) if(pda && !wires.RemoteRX()) //MULE wireless is controlled by wires. return @@ -385,7 +385,7 @@ obj/machinery/bot/mulebot/bot_reset() /obj/machinery/bot/mulebot/proc/has_power() return !open && cell && cell.charge > 0 && wires.HasPower() -/obj/machinery/bot/mulebot/proc/toggle_lock(var/mob/user) +/obj/machinery/bot/mulebot/proc/toggle_lock(mob/user) if(allowed(user)) locked = !locked updateDialog() @@ -397,7 +397,7 @@ obj/machinery/bot/mulebot/bot_reset() // mousedrop a crate to load the bot // can load anything if emagged -/obj/machinery/bot/mulebot/MouseDrop_T(var/atom/movable/C, mob/user) +/obj/machinery/bot/mulebot/MouseDrop_T(atom/movable/C, mob/user) if(user.stat) return @@ -412,7 +412,7 @@ obj/machinery/bot/mulebot/bot_reset() // called to load a crate -/obj/machinery/bot/mulebot/proc/load(var/atom/movable/C) +/obj/machinery/bot/mulebot/proc/load(atom/movable/C) if(wires.LoadCheck() && !istype(C,/obj/structure/closet/crate)) visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) @@ -457,7 +457,7 @@ obj/machinery/bot/mulebot/bot_reset() // called to unload the bot // argument is optional direction to unload // if zero, unload at bot's location -/obj/machinery/bot/mulebot/proc/unload(var/dirn) +/obj/machinery/bot/mulebot/proc/unload(dirn) if(!load) return @@ -660,14 +660,14 @@ obj/machinery/bot/mulebot/bot_reset() // calculates a path to the current destination // given an optional turf to avoid -/obj/machinery/bot/mulebot/calc_path(var/turf/avoid = null) +/obj/machinery/bot/mulebot/calc_path(turf/avoid = null) path = get_path_to(loc, target, src, /turf/proc/Distance_cardinal, 0, 250, id=botcard, exclude=avoid) // sets the current destination // signals all beacons matching the delivery code // beacons will return a signal giving their locations -/obj/machinery/bot/mulebot/proc/set_destination(var/new_dest) +/obj/machinery/bot/mulebot/proc/set_destination(new_dest) new_destination = new_dest get_nav() updateDialog() @@ -736,7 +736,7 @@ obj/machinery/bot/mulebot/bot_reset() return // called when bot bumps into anything -/obj/machinery/bot/mulebot/Bump(var/atom/obs) +/obj/machinery/bot/mulebot/Bump(atom/obs) if(!wires.MobAvoid()) //usually just bumps, but if avoidance disabled knock over mobs var/mob/M = obs if(ismob(M)) @@ -755,7 +755,7 @@ obj/machinery/bot/mulebot/bot_reset() // called from mob/living/carbon/human/Crossed() // when mulebot is in the same loc -/obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H) +/obj/machinery/bot/mulebot/proc/RunOver(mob/living/carbon/human/H) H.visible_message("[src] drives over [H]!", \ "[src] drives over you!") playsound(loc, 'sound/effects/splat.ogg', 50, 1) @@ -774,7 +774,7 @@ obj/machinery/bot/mulebot/bot_reset() bloodiness += 4 // player on mulebot attempted to move -/obj/machinery/bot/mulebot/relaymove(var/mob/user) +/obj/machinery/bot/mulebot/relaymove(mob/user) if(user.stat) return if(load == user) diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 9f7119b1eeb..ee609ef42cd 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -84,14 +84,14 @@ text_dehack = "You reboot [name] and restore the target identification." text_dehack_fail = "[name] refuses to accept your authority!" -/obj/machinery/bot/secbot/attack_hand(mob/user as mob) +/obj/machinery/bot/secbot/attack_hand(mob/user) . = ..() if(.) return usr.set_machine(src) interact(user) -/obj/machinery/bot/secbot/interact(mob/user as mob) +/obj/machinery/bot/secbot/interact(mob/user) var/dat dat += hack(user) dat += text({" @@ -145,7 +145,7 @@ Auto Patrol: []"}, updateUsrDialog() -/obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/bot/secbot/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(allowed(user) && !open && !emagged) locked = !locked @@ -168,7 +168,7 @@ Auto Patrol: []"}, target = user mode = BOT_HUNT -/obj/machinery/bot/secbot/Emag(mob/user as mob) +/obj/machinery/bot/secbot/Emag(mob/user) ..() if(emagged == 2) @@ -179,7 +179,7 @@ Auto Patrol: []"}, declare_arrests = 0 icon_state = "secbot[on]" -/obj/machinery/bot/secbot/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/secbot/bullet_act(obj/item/projectile/Proj) if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet)) if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)) if (!Proj.nodamage && Proj.damage < src.health) @@ -402,7 +402,7 @@ Auto Patrol: []"}, //Secbot Construction -/obj/item/clothing/head/helmet/attackby(var/obj/item/device/assembly/signaler/S, mob/user as mob, params) +/obj/item/clothing/head/helmet/attackby(obj/item/device/assembly/signaler/S, mob/user, params) ..() if(!issignaler(S)) ..() diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 2780745861d..33b4a99844c 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -102,16 +102,16 @@ qdel(src) return -/obj/machinery/camera/proc/setViewRange(var/num = 7) +/obj/machinery/camera/proc/setViewRange(num = 7) src.view_range = num cameranet.updateVisibility(src, 0) -/obj/machinery/camera/proc/shock(var/mob/living/user) +/obj/machinery/camera/proc/shock(mob/living/user) if(!istype(user)) return user.electrocute_act(10, src) -/obj/machinery/camera/attack_paw(mob/living/carbon/alien/humanoid/user as mob) +/obj/machinery/camera/attack_paw(mob/living/carbon/alien/humanoid/user) if(!istype(user)) return user.do_attack_animation(src) @@ -327,7 +327,7 @@ return null -/obj/machinery/camera/proc/weld(var/obj/item/weapon/weldingtool/WT, var/mob/living/user) +/obj/machinery/camera/proc/weld(obj/item/weapon/weldingtool/WT, mob/living/user) if(busy) return 0 if(!WT.remove_fuel(0, user)) @@ -344,7 +344,7 @@ busy = 0 return 0 -/obj/machinery/camera/bullet_act(var/obj/item/projectile/proj) +/obj/machinery/camera/bullet_act(obj/item/projectile/proj) if(proj.damage_type == BRUTE) health = max(0, health - proj.damage) if(!health && status) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index cf78392cecf..dce9196f8db 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -21,7 +21,7 @@ 4 = Screwdriver panel closed and is fully built (you cannot attach upgrades) */ -/obj/item/weapon/camera_assembly/attackby(obj/item/W as obj, mob/living/user as mob, params) +/obj/item/weapon/camera_assembly/attackby(obj/item/W, mob/living/user, params) switch(state) @@ -145,11 +145,11 @@ else icon_state = "cameracase" -/obj/item/weapon/camera_assembly/attack_hand(mob/user as mob) +/obj/item/weapon/camera_assembly/attack_hand(mob/user) if(!anchored) ..() -/obj/item/weapon/camera_assembly/proc/weld(var/obj/item/weapon/weldingtool/WT, var/mob/living/user) +/obj/item/weapon/camera_assembly/proc/weld(obj/item/weapon/weldingtool/WT, mob/living/user) if(busy) return 0 diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index 4454d5a89cb..b0b2b840af1 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -25,7 +25,7 @@ // If they aren't in range, lose the target. lostTarget(target) -/obj/machinery/camera/proc/newTarget(var/mob/target) +/obj/machinery/camera/proc/newTarget(mob/target) if (istype(target, /mob/living/silicon/ai)) return 0 if (detectTime == 0) detectTime = world.time // start the clock @@ -33,7 +33,7 @@ motionTargets += target return 1 -/obj/machinery/camera/proc/lostTarget(var/mob/target) +/obj/machinery/camera/proc/lostTarget(mob/target) if (target in motionTargets) motionTargets -= target if (motionTargets.len == 0) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 0dfc5d045d0..a7657017611 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -22,7 +22,7 @@ return T -/mob/living/silicon/ai/proc/ai_camera_list(var/camera) +/mob/living/silicon/ai/proc/ai_camera_list(camera) if (!camera) return 0 @@ -73,7 +73,7 @@ return targets -/mob/living/silicon/ai/verb/ai_camera_track(var/target_name in trackable_mobs()) +/mob/living/silicon/ai/verb/ai_camera_track(target_name in trackable_mobs()) set name = "track" set hidden = 1 //Don't display it on the verb lists. This verb exists purely so you can type "track Oldman Robustin" and follow his ass @@ -122,7 +122,7 @@ else sleep(10) continue - + else cameraticks = 0 U.tracking = 0 @@ -137,7 +137,7 @@ sleep(10) -/proc/near_camera(var/mob/living/M) +/proc/near_camera(mob/living/M) if (!isturf(M.loc)) return 0 if(isrobot(M)) @@ -148,7 +148,7 @@ return 0 return 1 -/obj/machinery/camera/attack_ai(var/mob/living/silicon/ai/user as mob) +/obj/machinery/camera/attack_ai(mob/living/silicon/ai/user) if (!istype(user)) return if (!src.can_use()) @@ -156,7 +156,7 @@ user.eyeobj.setLoc(get_turf(src)) -/mob/living/silicon/ai/attack_ai(var/mob/user as mob) +/mob/living/silicon/ai/attack_ai(mob/user) ai_camera_list() /proc/camera_sort(list/L) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index adb2c039ce8..6c76c19e864 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -60,7 +60,7 @@ //Find a dead mob with a brain and client. -/proc/find_dead_player(var/find_key) +/proc/find_dead_player(find_key) if (isnull(find_key)) return @@ -83,7 +83,7 @@ ..() icon_state = "datadisk[pick(0,1,2)]" -/obj/item/weapon/disk/data/attack_self(mob/user as mob) +/obj/item/weapon/disk/data/attack_self(mob/user) read_only = !read_only user << "You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"]." @@ -109,11 +109,11 @@ src.healthstring = "ERROR" return src.healthstring -/obj/machinery/clonepod/attack_ai(mob/user as mob) +/obj/machinery/clonepod/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/clonepod/attack_paw(mob/user as mob) +/obj/machinery/clonepod/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/clonepod/attack_hand(mob/user as mob) +/obj/machinery/clonepod/attack_hand(mob/user) if (isnull(src.occupant) || !is_operational()) return if ((!isnull(src.occupant)) && (src.occupant.stat != 2)) @@ -124,7 +124,7 @@ //Clonepod //Start growing a human clone in the pod! -/obj/machinery/clonepod/proc/growclone(var/ckey, var/clonename, var/ui, var/se, var/mindref, var/datum/species/mrace, var/list/features, var/factions) +/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions) if(panel_open) return 0 if(mess || attempting) @@ -244,7 +244,7 @@ return //Let's unlock this early I guess. Might be too early, needs tweaking. -/obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/clonepod/attackby(obj/item/weapon/W, mob/user, params) if(!(occupant || mess || locked)) if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]",W)) return @@ -269,7 +269,7 @@ else ..() -/obj/machinery/clonepod/emag_act(user as mob) +/obj/machinery/clonepod/emag_act(mob/user) if (isnull(src.occupant)) return user << "You force an emergency ejection." @@ -277,7 +277,7 @@ src.go_out() //Put messages in the connected computer's temp var for display. -/obj/machinery/clonepod/proc/connected_message(var/message) +/obj/machinery/clonepod/proc/connected_message(message) if ((isnull(src.connected)) || (!istype(src.connected, /obj/machinery/computer/cloning))) return 0 if (!message) @@ -343,7 +343,7 @@ qdel(src.occupant) return -/obj/machinery/clonepod/relaymove(mob/user as mob) +/obj/machinery/clonepod/relaymove(mob/user) if (user.stat) return src.go_out() diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 62427b807e5..ffaecb88a14 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -10,7 +10,7 @@ var/damaged = 0 var/last_change = 0 -/obj/machinery/computer/HolodeckControl/attack_hand(var/mob/user as mob) +/obj/machinery/computer/HolodeckControl/attack_hand(mob/user) if(..()) return @@ -115,7 +115,7 @@ -/obj/machinery/computer/HolodeckControl/emag_act(mob/user as mob) +/obj/machinery/computer/HolodeckControl/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 @@ -184,7 +184,7 @@ -/obj/machinery/computer/HolodeckControl/proc/derez(var/obj/obj , var/silent = 1) +/obj/machinery/computer/HolodeckControl/proc/derez(obj/obj , silent = 1) holographic_items.Remove(obj) if(obj == null) @@ -200,7 +200,7 @@ visible_message("The [oldobj.name] fades away!") qdel(obj) -/obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A) +/obj/machinery/computer/HolodeckControl/proc/checkInteg(area/A) for(var/turf/T in A) if(istype(T, /turf/space)) return 0 @@ -212,7 +212,7 @@ if(stat & NOPOWER) emergencyShutdown() -/obj/machinery/computer/HolodeckControl/proc/loadProgram(var/area/A) +/obj/machinery/computer/HolodeckControl/proc/loadProgram(area/A) if(world.time < (last_change + 25)) if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve @@ -276,7 +276,7 @@ icon_state = "floor" thermal_conductivity = 0 -/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W, mob/user, params) return // HOLOFLOOR DOES NOT GIVE A FUCK @@ -285,27 +285,27 @@ gender = PLURAL name = "lush grass" -/turf/simulated/floor/grass/holo/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/floor/grass/holo/attackby(obj/item/weapon/W, mob/user, params) return // HOLOGRASS DOES NOT GIVE A FUCK /obj/structure/table/holotable name = "table" -/obj/structure/table/holotable/attack_paw(mob/user as mob) +/obj/structure/table/holotable/attack_paw(mob/user) return attack_hand(user) -/obj/structure/table/holotable/attack_alien(mob/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N +/obj/structure/table/holotable/attack_alien(mob/user) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N return attack_hand(user) -/obj/structure/table/holotable/attack_animal(mob/living/simple_animal/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N +/obj/structure/table/holotable/attack_animal(mob/living/simple_animal/user) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N return attack_hand(user) -/obj/structure/table/holotable/attack_hand(mob/user as mob) +/obj/structure/table/holotable/attack_hand(mob/user) return // HOLOTABLE DOES NOT GIVE A FUCK -/obj/structure/table/holotable/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/table/holotable/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state < GRAB_AGGRESSIVE) @@ -365,13 +365,13 @@ return 1 return 0 -/obj/item/weapon/holo/esword/attack(target as mob, mob/user as mob) +/obj/item/weapon/holo/esword/attack(mob/target, mob/user) ..() /obj/item/weapon/holo/esword/New() item_color = pick("red","blue","green","purple") -/obj/item/weapon/holo/esword/attack_self(mob/living/user as mob) +/obj/item/weapon/holo/esword/attack_self(mob/living/user) active = !active if (active) force = 30 @@ -423,7 +423,7 @@ density = 1 throwpass = 1 -/obj/structure/holohoop/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/holohoop/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state < GRAB_AGGRESSIVE) @@ -469,11 +469,11 @@ active_power_usage = 6 power_channel = ENVIRON -/obj/machinery/readybutton/attack_ai(mob/user as mob) +/obj/machinery/readybutton/attack_ai(mob/user) user << "The station AI is not to interact with these devices" return -/obj/machinery/readybutton/attack_paw(mob/user as mob) +/obj/machinery/readybutton/attack_paw(mob/user) user << "You are too primitive to use this device!" return @@ -481,10 +481,10 @@ ..() -/obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/readybutton/attackby(obj/item/weapon/W, mob/user, params) user << "The device is a solid button, there's nothing you can do with it!" -/obj/machinery/readybutton/attack_hand(mob/user as mob) +/obj/machinery/readybutton/attack_hand(mob/user) if(user.stat || stat & (NOPOWER|BROKEN)) user << "This device is not powered!" return diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 528756c0c7e..fa5e5e563cf 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -8,7 +8,7 @@ icon_keyboard = "tech_key" icon_screen = "ai-fixer" -/obj/machinery/computer/aifixer/attackby(I as obj, user as mob, params) +/obj/machinery/computer/aifixer/attackby(obj/I, mob/user, params) if(occupier && istype(I, /obj/item/weapon/screwdriver)) if(stat & (NOPOWER|BROKEN)) user << "The screws on [name]'s screen won't budge." @@ -18,7 +18,7 @@ else ..() -/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob) +/obj/machinery/computer/aifixer/attack_hand(mob/user) if(..()) return interact(user) @@ -121,7 +121,7 @@ else overlays += "ai-fixer-empty" -/obj/machinery/computer/aifixer/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +/obj/machinery/computer/aifixer/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) return //Downloading AI from card to terminal. diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index d9a0b84f457..661a8d78fe5 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -109,7 +109,7 @@ src.enemy_name = replacetext((name_part1 + name_part2), "the ", "") src.name = (name_action + name_part1 + name_part2) -/obj/machinery/computer/arcade/battle/attack_hand(mob/user as mob) +/obj/machinery/computer/arcade/battle/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -273,7 +273,7 @@ return -/obj/machinery/computer/arcade/battle/emag_act(mob/user as mob) +/obj/machinery/computer/arcade/battle/emag_act(mob/user) if(!emagged) temp = "If you die in the game, you die for real!" player_hp = 30 @@ -361,7 +361,7 @@ playing = 1 gameover = 0 -/obj/machinery/computer/arcade/orion_trail/attack_hand(mob/user as mob) +/obj/machinery/computer/arcade/orion_trail/attack_hand(mob/user) if(..()) return if(fuel <= 0 || food <=0 || settlers.len == 0) @@ -676,7 +676,7 @@ name = "The Orion Trail" desc = "Learn how our ancestors got to Orion, and have fun in the process!" -/obj/machinery/computer/arcade/orion_trail/emag_act(mob/user as mob) +/obj/machinery/computer/arcade/orion_trail/emag_act(mob/user) if(!emagged) user << "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode." name = "The Orion Trail: Realism Edition" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index ed6360ff691..d49f0c1cee5 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -248,7 +248,7 @@ build_path = /obj/machinery/computer/libraryconsole origin_tech = "programming=1" -/obj/item/weapon/circuitboard/card/minor/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/card/minor/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/device/multitool)) var/list/dept_list = list("general","security","medical","science","engineering") var/choice = input("Currently set to [dept_list[target_dept]] personnel database. Changing to:","Multitool-Circuitboard interface") as null|anything in dept_list @@ -256,7 +256,7 @@ target_dept = dept_list.Find(choice) return -/obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/device/multitool)) var/catastasis = src.contraband_enabled var/opposite_catastasis @@ -278,7 +278,7 @@ user << "DERP! BUG! Report this (And what you were doing to cause it) to Agouri" return -/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/weapon/screwdriver)) if(build_path == /obj/machinery/computer/rdconsole/core) name = "circuit board (RD Console - Robotics)" @@ -290,7 +290,7 @@ user << "Defaulting access protocols." return -/obj/item/weapon/circuitboard/libraryconsole/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/libraryconsole/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/weapon/screwdriver)) if(build_path == /obj/machinery/computer/libraryconsole/bookmanagement) name = "circuit board (Library Visitor Console)" @@ -302,7 +302,7 @@ user << "Access protocols successfully updated." return -/obj/item/weapon/circuitboard/shuttle/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/shuttle/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/multitool)) var/chosen_id = round(input(usr, "Choose an ID number (-1 for reset):", "Input an Integer", null) as num|null) if(chosen_id >= 0) @@ -311,7 +311,7 @@ shuttleId = initial(shuttleId) return -/obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/structure/computerframe/attackby(obj/item/P, mob/user, params) add_fingerprint(user) switch(state) if(0) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 10f396874eb..84c32da87c0 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -9,7 +9,7 @@ var/list/network = list("SS13") var/mapping = 0//For the overview file, interesting bit of code. -/obj/machinery/computer/security/check_eye(var/mob/user as mob) +/obj/machinery/computer/security/check_eye(mob/user) if ((get_dist(user, src) > 1 || user.eye_blind || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon))) return null var/list/viewing = viewers(src) @@ -19,7 +19,7 @@ return 1 -/obj/machinery/computer/security/attack_hand(var/mob/user as mob) +/obj/machinery/computer/security/attack_hand(mob/user) if(!stat) if (!network) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 61a605ee6c6..d7b9be9aaac 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -13,19 +13,19 @@ eyeobj = new() eyeobj.origin = src -/obj/machinery/computer/camera_advanced/proc/GrantActions(var/mob/living/carbon/user) +/obj/machinery/computer/camera_advanced/proc/GrantActions(mob/living/carbon/user) off_action.target = user off_action.Grant(user) jump_action.target = user jump_action.Grant(user) -/obj/machinery/computer/camera_advanced/check_eye(var/mob/user as mob) +/obj/machinery/computer/camera_advanced/check_eye(mob/user) if (get_dist(user, src) > 1 || user.eye_blind) off_action.Activate() return 0 return 1 -/obj/machinery/computer/camera_advanced/attack_hand(var/mob/user as mob) +/obj/machinery/computer/camera_advanced/attack_hand(mob/user) if(..()) return if(!iscarbon(user)) @@ -71,7 +71,7 @@ return user.client return null -/mob/camera/aiEye/remote/setLoc(var/T) +/mob/camera/aiEye/remote/setLoc(T) if(user) if(!isturf(user.loc)) return diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 4fc88ee1d18..f220d02a177 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -44,7 +44,7 @@ var/time_last_changed_position = 0 //Assoc array: "JobName" = (int) var/list/opened_positions = list(); -/obj/machinery/computer/card/attackby(O as obj, user as mob, params)//TODO:SANITY +/obj/machinery/computer/card/attackby(obj/O, mob/user, params)//TODO:SANITY if(istype(O, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/idcard = O if(check_access(idcard)) @@ -73,7 +73,7 @@ var/time_last_changed_position = 0 //Logic check for Topic() if you can open the job -/obj/machinery/computer/card/proc/can_open_job(var/datum/job/job) +/obj/machinery/computer/card/proc/can_open_job(datum/job/job) if(job) if(!job_blacklisted(job.title)) if((job.total_positions <= player_list.len * (max_relative_positions / 100))) @@ -85,7 +85,7 @@ var/time_last_changed_position = 0 return 0 //Logic check for Topic() if you can close the job -/obj/machinery/computer/card/proc/can_close_job(var/datum/job/job) +/obj/machinery/computer/card/proc/can_close_job(datum/job/job) if(job) if(!job_blacklisted(job.title)) if(job.total_positions > job.current_positions) @@ -96,7 +96,7 @@ var/time_last_changed_position = 0 return -1 return 0 -/obj/machinery/computer/card/attack_hand(var/mob/user as mob) +/obj/machinery/computer/card/attack_hand(mob/user) if(..()) return @@ -475,7 +475,7 @@ var/time_last_changed_position = 0 updateUsrDialog() return -/obj/machinery/computer/card/proc/get_subordinates(var/rank) +/obj/machinery/computer/card/proc/get_subordinates(rank) for(var/datum/job/job in SSjob.occupations) if(rank in job.department_head) head_subordinates += job.title diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index e2078720d8c..a75a603344b 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -73,7 +73,7 @@ return null -/obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params) if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) if(!user.drop_item()) @@ -349,7 +349,7 @@ src.updateUsrDialog() return -/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob) +/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject) if (!check_dna_integrity(subject) || !istype(subject)) scantemp = "Unable to locate valid genetic data." return diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 21dfa6b0585..ead497ab43d 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -322,21 +322,21 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 src.updateUsrDialog() -/obj/machinery/computer/communications/attackby(var/obj/I as obj, var/mob/user as mob, params) +/obj/machinery/computer/communications/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) attack_hand(user) else ..() return -/obj/machinery/computer/communications/emag_act(mob/user as mob) +/obj/machinery/computer/communications/emag_act(mob/user) if(!emagged) src.emagged = 1 if(authenticated == 1) authenticated = 2 user << "You scramble the communication routing circuits." -/obj/machinery/computer/communications/attack_hand(var/mob/user as mob) +/obj/machinery/computer/communications/attack_hand(mob/user) if(..()) return if (src.z > 6) @@ -456,7 +456,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 popup.set_content(dat) popup.open() -/obj/machinery/computer/communications/proc/get_javascript_header(var/form_id) +/obj/machinery/computer/communications/proc/get_javascript_header(form_id) var/dat = {""} return dat -/obj/machinery/computer/communications/proc/get_call_shuttle_form(var/ai_interface = 0) +/obj/machinery/computer/communications/proc/get_call_shuttle_form(ai_interface = 0) var/form_id = "callshuttle" var/dat = get_javascript_header(form_id) dat += "
" @@ -493,7 +493,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "
Are you sure you want to cancel the shuttle? \[ Cancel \]" return dat -/obj/machinery/computer/communications/proc/interact_ai(var/mob/living/silicon/ai/user as mob) +/obj/machinery/computer/communications/proc/interact_ai(mob/living/silicon/ai/user) var/dat = "" switch(src.aistate) if(STATE_DEFAULT) @@ -567,7 +567,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "

\[ [(src.aistate != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" return dat -/obj/machinery/computer/communications/proc/make_announcement(var/mob/living/user, var/is_silicon) +/obj/machinery/computer/communications/proc/make_announcement(mob/living/user, is_silicon) var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?") if(!input || !user.canUseTopic(src)) return @@ -586,7 +586,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 -/obj/machinery/computer/communications/proc/post_status(var/command, var/data1, var/data2) +/obj/machinery/computer/communications/proc/post_status(command, data1, data2) var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 4e2613a72f0..e21322eaf7f 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -58,7 +58,7 @@ else return -/obj/machinery/computer/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/computer/bullet_act(obj/item/projectile/Proj) if(prob(Proj.damage)) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) set_broken() @@ -97,7 +97,7 @@ update_icon() return -/obj/machinery/computer/attackby(I as obj, user as mob, params) +/obj/machinery/computer/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << " You start to disconnect the monitor..." diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 875cb4403ae..adb2eff7d34 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -4,7 +4,7 @@ var/mob/living/silicon/current = null //The target of future law uploads icon_screen = "command" -/obj/machinery/computer/upload/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/aiModule)) var/obj/item/weapon/aiModule/M = O if(src.stat & (NOPOWER|BROKEN|MAINT)) @@ -25,7 +25,7 @@ else ..() -/obj/machinery/computer/upload/proc/can_upload_to(var/mob/living/silicon/S as mob) +/obj/machinery/computer/upload/proc/can_upload_to(mob/living/silicon/S) if(S.stat == DEAD || S.syndicate) return 0 return 1 @@ -35,7 +35,7 @@ desc = "Used to upload laws to the AI." circuit = /obj/item/weapon/circuitboard/aiupload -/obj/machinery/computer/upload/ai/attack_hand(var/mob/user as mob) +/obj/machinery/computer/upload/ai/attack_hand(mob/user) if(..()) return @@ -46,7 +46,7 @@ else user << "[src.current.name] selected for law changes." -/obj/machinery/computer/upload/ai/can_upload_to(var/mob/living/silicon/ai/A as mob) +/obj/machinery/computer/upload/ai/can_upload_to(mob/living/silicon/ai/A) if(!A || !isAI(A)) return 0 if(A.control_disabled) @@ -59,7 +59,7 @@ desc = "Used to upload laws to Cyborgs." circuit = /obj/item/weapon/circuitboard/borgupload -/obj/machinery/computer/upload/borg/attack_hand(var/mob/user as mob) +/obj/machinery/computer/upload/borg/attack_hand(mob/user) if(..()) return @@ -70,7 +70,7 @@ else user << "[src.current.name] selected for law changes." -/obj/machinery/computer/upload/borg/can_upload_to(var/mob/living/silicon/robot/B as mob) +/obj/machinery/computer/upload/borg/can_upload_to(mob/living/silicon/robot/B) if(!B || !isrobot(B)) return 0 if(B.scrambledcodes || B.emagged) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 29f1493a9bc..1eaaa0b7fd5 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -20,7 +20,7 @@ var/sortBy = "name" var/order = 1 // -1 = Descending - 1 = Ascending -/obj/machinery/computer/med_data/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/machinery/computer/med_data/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id) && !scan) if(!user.drop_item()) return @@ -30,7 +30,7 @@ else ..() -/obj/machinery/computer/med_data/attack_hand(mob/user as mob) +/obj/machinery/computer/med_data/attack_hand(mob/user) if(..()) return var/dat diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 7d31061f0ba..c575e09025f 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -30,14 +30,14 @@ var/customjob = "Admin" var/custommessage = "This is a test, please ignore." -/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O as obj, mob/living/user as mob, params) +/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O, mob/living/user, params) if(istype(O, /obj/item/weapon/screwdriver) && emagged) //Stops people from just unscrewing the monitor and putting it back to get the console working again. user << "It is too hot to mess with!" return ..() -/obj/machinery/computer/message_monitor/emag_act(user as mob) +/obj/machinery/computer/message_monitor/emag_act(mob/user) if(!emagged) if(!isnull(src.linkedServer)) emagged = 1 @@ -60,7 +60,7 @@ linkedServer = message_servers[1] return -/obj/machinery/computer/message_monitor/attack_hand(var/mob/living/user as mob) +/obj/machinery/computer/message_monitor/attack_hand(mob/living/user) if(..()) return //If the computer is being hacked or is emagged, display the reboot message. @@ -244,7 +244,7 @@ popup.open() return -/obj/machinery/computer/message_monitor/proc/BruteForce(mob/user as mob) +/obj/machinery/computer/message_monitor/proc/BruteForce(mob/user) if(isnull(linkedServer)) user << "Could not complete brute-force: Linked Server Disconnected!" else diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index faba05e021f..85b3b5f4802 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -14,7 +14,7 @@ var/obj/item/weapon/card/id/prisoner/inserted_id circuit = /obj/item/weapon/circuitboard/prisoner -/obj/machinery/computer/prisoner/attack_hand(var/mob/user as mob) +/obj/machinery/computer/prisoner/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -71,7 +71,7 @@ popup.open() return -/obj/machinery/computer/prisoner/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/computer/prisoner/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) return attack_hand(user) ..() diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index e358e3b9107..ea95319ca2c 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -10,7 +10,7 @@ circuit = /obj/item/weapon/circuitboard/robotics var/temp = null -/obj/machinery/computer/robotics/proc/can_control(var/mob/user, var/mob/living/silicon/robot/R) +/obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R) if(!istype(R)) return 0 if(istype(user, /mob/living/silicon/ai)) @@ -23,12 +23,12 @@ return 0 return 1 -/obj/machinery/computer/robotics/attack_hand(var/mob/user as mob) +/obj/machinery/computer/robotics/attack_hand(mob/user) if(..()) return interact(user) -/obj/machinery/computer/robotics/interact(var/mob/user as mob) +/obj/machinery/computer/robotics/interact(mob/user) if (src.z > 6) user << "Unable to establish a connection: \black You're too far away from the station!" return diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 64795c7684e..c87a35f2486 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -24,7 +24,7 @@ var/order = 1 // -1 = Descending - 1 = Ascending -/obj/machinery/computer/secure_data/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id) && !scan) if(!user.drop_item()) return @@ -35,7 +35,7 @@ ..() //Someone needs to break down the dat += into chunks instead of long ass lines. -/obj/machinery/computer/secure_data/attack_hand(mob/user as mob) +/obj/machinery/computer/secure_data/attack_hand(mob/user) if(..()) return if(src.z > 6) @@ -690,7 +690,7 @@ What a mess.*/ updateUsrDialog() return -/obj/machinery/computer/secure_data/proc/get_photo(var/mob/user) +/obj/machinery/computer/secure_data/proc/get_photo(mob/user) var/obj/item/weapon/photo/P = null if(istype(user, /mob/living/silicon)) var/mob/living/silicon/tempAI = user diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 09f0ce71324..2ea4b0b285e 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -7,7 +7,7 @@ var/list/authorized = list() -/obj/machinery/computer/emergency_shuttle/attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob, params) +/obj/machinery/computer/emergency_shuttle/attackby(obj/item/weapon/card/W, mob/user, params) if(stat & (BROKEN|NOPOWER)) return if(!istype(W, /obj/item/weapon/card)) return @@ -65,7 +65,7 @@ minor_announce("All authorizations to launch the shuttle early have been revoked.") authorized.Cut() -/obj/machinery/computer/emergency_shuttle/emag_act(mob/user as mob) +/obj/machinery/computer/emergency_shuttle/emag_act(mob/user) if(!emagged && SSshuttle.emergency.mode == SHUTTLE_DOCKED) var/time = SSshuttle.emergency.timeLeft() message_admins("[key_name_admin(user.client)](?) (FLW) has emagged the emergency shuttle [time] seconds before launch.",0,1) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 02c39d11f54..39df18e81c5 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -49,7 +49,7 @@ return -/obj/machinery/computer/station_alert/proc/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) +/obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/A, O, obj/alarmsource) if(alarmsource.z != z) return if(stat & (BROKEN)) @@ -74,7 +74,7 @@ return 1 -/obj/machinery/computer/station_alert/proc/cancelAlarm(var/class, area/A as area, obj/origin) +/obj/machinery/computer/station_alert/proc/cancelAlarm(class, area/A, obj/origin) if(stat & (BROKEN)) return var/list/L = src.alarms[class] diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 29b07601e4f..2bd44d2f137 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -30,7 +30,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F name = "[name] [rand(1,999)]" -/obj/machinery/computer/telecrystals/uplinker/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/computer/telecrystals/uplinker/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item)) if(uplinkholder) @@ -63,7 +63,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F uplinkholder = null update_icon() -/obj/machinery/computer/telecrystals/uplinker/proc/donateTC(var/amt, var/addLog = 1) +/obj/machinery/computer/telecrystals/uplinker/proc/donateTC(amt, addLog = 1) if(uplinkholder && linkedboss) if(amt <= uplinkholder.hidden_uplink.uses) uplinkholder.hidden_uplink.uses -= amt @@ -71,7 +71,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F if(addLog) linkedboss.logTransfer("[src] donated [amt] telecrystals to [linkedboss].") -/obj/machinery/computer/telecrystals/uplinker/proc/giveTC(var/amt, var/addLog = 1) +/obj/machinery/computer/telecrystals/uplinker/proc/giveTC(amt, addLog = 1) if(uplinkholder && linkedboss) if(amt <= linkedboss.storedcrystals) uplinkholder.hidden_uplink.uses += amt @@ -81,7 +81,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F /////// -/obj/machinery/computer/telecrystals/uplinker/attack_hand(mob/user as mob) +/obj/machinery/computer/telecrystals/uplinker/attack_hand(mob/user) if(..()) return src.add_fingerprint(user) @@ -137,7 +137,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F var/list/TCstations = list() var/list/transferlog = list() -/obj/machinery/computer/telecrystals/boss/proc/logTransfer(var/logmessage) +/obj/machinery/computer/telecrystals/boss/proc/logTransfer(logmessage) transferlog += ("[worldtime2text()] [logmessage]") /obj/machinery/computer/telecrystals/boss/proc/scanUplinkers() @@ -156,12 +156,12 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F while(!IsMultiple(++danger,10))//Just round up to the nearest multiple of ten. scaleTC(danger) -/obj/machinery/computer/telecrystals/boss/proc/scaleTC(var/amt)//Its own proc, since it'll probably need a lot of tweaks for balance, use a fancier algorhithm, etc. +/obj/machinery/computer/telecrystals/boss/proc/scaleTC(amt)//Its own proc, since it'll probably need a lot of tweaks for balance, use a fancier algorhithm, etc. storedcrystals += amt * NUKESCALINGMODIFIER ///////// -/obj/machinery/computer/telecrystals/boss/attack_hand(var/mob/user as mob) +/obj/machinery/computer/telecrystals/boss/attack_hand(mob/user) if(..()) return src.add_fingerprint(user) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 6d83a84185d..61a2136b3d2 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -53,7 +53,7 @@ else desc += "." -/obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P, mob/user, params) if(P.crit_fail) user << "This part is faulty, you cannot add this to the machine!" return diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index a0c17f6a556..791f42c27c4 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -80,7 +80,7 @@ return close_machine(target) -/obj/machinery/atmospherics/unary/cryo_cell/relaymove(var/mob/user) +/obj/machinery/atmospherics/unary/cryo_cell/relaymove(mob/user) open_machine() /obj/machinery/atmospherics/unary/cryo_cell/container_resist() @@ -135,7 +135,7 @@ * * @return nothing */ -/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(user == occupant || user.stat || panel_open) return diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 8a0cc63b0e4..1feb4e3b5e3 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -63,7 +63,7 @@ for reference: var/health = 100.0 var/maxhealth = 100.0 -/obj/structure/barricade/wooden/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/barricade/wooden/attackby(obj/item/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) if (istype(W, /obj/item/stack/sheet/mineral/wood)) if (src.health < src.maxhealth) @@ -148,7 +148,7 @@ for reference: src.icon_state = "barrier[src.locked]" -/obj/machinery/deployable/barrier/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/deployable/barrier/attackby(obj/item/weapon/W, mob/user, params) if (W.GetID()) if (src.allowed(user)) if (src.emagged < 2.0) @@ -192,7 +192,7 @@ for reference: src.explode() ..() -/obj/machinery/deployable/emag_act(user as mob) +/obj/machinery/deployable/emag_act(mob/user) if (src.emagged == 0) src.emagged = 1 src.req_access = null diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 21e5a276091..c235aadf40b 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -29,16 +29,16 @@ idle_power_usage = 2 active_power_usage = 4 -/obj/machinery/door_control/attack_ai(mob/user as mob) +/obj/machinery/door_control/attack_ai(mob/user) if(wires & 2) return src.attack_hand(user) else user << "Error, no route to host." -/obj/machinery/door_control/attack_paw(mob/user as mob) +/obj/machinery/door_control/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user, params) /* For later implementation if (istype(W, /obj/item/weapon/screwdriver)) { @@ -57,12 +57,12 @@ return return src.attack_hand(user) -/obj/machinery/door_control/emag_act(user as mob) +/obj/machinery/door_control/emag_act(mob/user) req_access = list() req_one_access = list() playsound(src.loc, "sparks", 100, 1) -/obj/machinery/door_control/attack_hand(mob/user as mob) +/obj/machinery/door_control/attack_hand(mob/user) src.add_fingerprint(usr) if(stat & (NOPOWER|BROKEN)) return @@ -118,19 +118,19 @@ else icon_state = "doorctrl0" -/obj/machinery/driver_button/attack_ai(mob/user as mob) +/obj/machinery/driver_button/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/driver_button/attack_paw(mob/user as mob) +/obj/machinery/driver_button/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/detective_scanner)) return return src.attack_hand(user) -/obj/machinery/driver_button/attack_hand(mob/user as mob) +/obj/machinery/driver_button/attack_hand(mob/user) src.add_fingerprint(usr) if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index b1a3acba501..53c8a341d23 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -329,7 +329,7 @@ About the new airlock wires panel: D.removeMe(src) ..() -/obj/machinery/door/airlock/bumpopen(mob/living/user as mob) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite +/obj/machinery/door/airlock/bumpopen(mob/living/user) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) if(src.isElectrified()) if(!src.justzap) @@ -347,7 +347,7 @@ About the new airlock wires panel: return ..(user) -/obj/machinery/door/airlock/bumpopen(mob/living/simple_animal/user as mob) +/obj/machinery/door/airlock/bumpopen(mob/living/simple_animal/user) ..(user) /obj/machinery/door/airlock/proc/isElectrified() @@ -355,7 +355,7 @@ About the new airlock wires panel: return 1 return 0 -/obj/machinery/door/airlock/proc/isWireCut(var/wireIndex) +/obj/machinery/door/airlock/proc/isWireCut(wireIndex) // You can find the wires in the datum folder. return wires.IsIndexCut(wireIndex) @@ -484,7 +484,7 @@ About the new airlock wires panel: if(charge && !p_open && in_range(user, src)) user << "The maintenance panel is bulging slightly." -/obj/machinery/door/airlock/attack_ai(mob/user as mob) +/obj/machinery/door/airlock/attack_ai(mob/user) if(!src.canAIControl()) if(src.canAIHack()) src.hack(user) @@ -606,7 +606,7 @@ About the new airlock wires panel: //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 11 enable access override -/obj/machinery/door/airlock/proc/hack(mob/user as mob) +/obj/machinery/door/airlock/proc/hack(mob/user) if(src.aiHacking==0) src.aiHacking=1 spawn(20) @@ -655,10 +655,10 @@ About the new airlock wires panel: src.attack_ai(user) -/obj/machinery/door/airlock/attack_paw(mob/user as mob) +/obj/machinery/door/airlock/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/door/airlock/attack_hand(mob/user as mob) +/obj/machinery/door/airlock/attack_hand(mob/user) if(!istype(user, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 100)) @@ -907,7 +907,7 @@ About the new airlock wires panel: updateUsrDialog() return -/obj/machinery/door/airlock/attackby(C as obj, mob/user as mob, params) +/obj/machinery/door/airlock/attackby(obj/C, mob/user, params) if(!istype(usr, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 75)) @@ -1051,7 +1051,7 @@ About the new airlock wires panel: ..() return -/obj/machinery/door/airlock/plasma/attackby(C as obj, mob/user as mob, params) +/obj/machinery/door/airlock/plasma/attackby(obj/C, mob/user, params) if(is_hot(C) > 300)//If the temperature of the object is over 300, then ignite message_admins("Plasma airlock ignited by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)") log_game("Plasma wall ignited by [key_name(user)] in ([x],[y],[z])") @@ -1059,7 +1059,7 @@ About the new airlock wires panel: return ..() -/obj/machinery/door/airlock/open(var/forced=0) +/obj/machinery/door/airlock/open(forced=0) if( operating || welded || locked ) return 0 if(!forced) @@ -1102,7 +1102,7 @@ About the new airlock wires panel: return ..() -/obj/machinery/door/airlock/close(var/forced=0) +/obj/machinery/door/airlock/close(forced=0) if(operating || welded || locked) return if(!forced) @@ -1175,7 +1175,7 @@ About the new airlock wires panel: if(!density && !operating && !locked && !welded && autoclose) close() -/obj/machinery/door/airlock/proc/change_paintjob(obj/item/C as obj, mob/user as mob) +/obj/machinery/door/airlock/proc/change_paintjob(obj/item/C, mob/user) var/obj/item/weapon/airlock_painter/W if(istype(C, /obj/item/weapon/airlock_painter)) W = C @@ -1257,7 +1257,7 @@ About the new airlock wires panel: doortype = /obj/structure/door_assembly/door_assembly_highsecurity update_icon() -/obj/machinery/door/airlock/CanAStarPass(var/obj/item/weapon/card/id/ID) +/obj/machinery/door/airlock/CanAStarPass(obj/item/weapon/card/id/ID) //Airlock is passable if it is open (!density), bot has access, and is not bolted shut) return !density || (check_access(ID) && !locked) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 8ee0cfff1c1..0b1761281a2 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -14,7 +14,7 @@ var/last_configurator = null var/locked = 1 -/obj/item/weapon/airlock_electronics/attack_self(mob/user as mob) +/obj/item/weapon/airlock_electronics/attack_self(mob/user) if (!ishuman(user)) return ..(user) @@ -95,7 +95,7 @@ attack_self(usr) -/obj/item/weapon/airlock_electronics/proc/toggle_access(var/acc) +/obj/item/weapon/airlock_electronics/proc/toggle_access(acc) if (acc == "all") conf_access = null else if(acc == "one") diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 21a4ba0fff2..d6d5f886095 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -128,7 +128,7 @@ . = 0 -/obj/machinery/door_timer/proc/timeset(var/seconds) +/obj/machinery/door_timer/proc/timeset(seconds) if(timing) releasetime=world.time+seconds*10 else @@ -136,7 +136,7 @@ return //Allows AIs to use door_timer, see human attack_hand function below -/obj/machinery/door_timer/attack_ai(var/mob/user as mob) +/obj/machinery/door_timer/attack_ai(mob/user) return src.attack_hand(user) @@ -144,7 +144,7 @@ //Opens dialog window when someone clicks on door timer // Allows altering timer and the timing boolean. // Flasher activation limited to 150 seconds -/obj/machinery/door_timer/attack_hand(var/mob/user as mob) +/obj/machinery/door_timer/attack_hand(mob/user) if(..()) return var/second = round(timeleft() % 60) @@ -237,7 +237,7 @@ // Adds an icon in case the screen is broken/off, stolen from status_display.dm -/obj/machinery/door_timer/proc/set_picture(var/state) +/obj/machinery/door_timer/proc/set_picture(state) if(maptext) maptext = "" picture_state = state overlays.Cut() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index abfb8ff9253..87ad6c9728c 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -87,7 +87,7 @@ /obj/machinery/door/proc/CanAStarPass(var/obj/item/weapon/card/id/ID) return !density -/obj/machinery/door/proc/bumpopen(mob/user as mob) +/obj/machinery/door/proc/bumpopen(mob/user) if(operating) return src.add_fingerprint(user) @@ -102,24 +102,24 @@ return -/obj/machinery/door/attack_ai(mob/user as mob) +/obj/machinery/door/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/door/attack_paw(mob/user as mob) +/obj/machinery/door/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/door/attack_hand(mob/user as mob) +/obj/machinery/door/attack_hand(mob/user) return src.attackby(user, user) -/obj/machinery/door/attack_tk(mob/user as mob) +/obj/machinery/door/attack_tk(mob/user) if(requiresID() && !allowed(null)) return ..() -/obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/door/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/detective_scanner)) return if(isrobot(user)) return //borgs can't attack doors open because it conflicts with their AI-like interaction with them. @@ -139,7 +139,7 @@ flick("door_deny", src) return -/obj/machinery/door/emag_act(mob/user as mob) +/obj/machinery/door/emag_act(mob/user) if(density && hasPower() && !emagged) flick("door_spark", src) sleep(6) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 85f6dac25e8..d60c8bf9e9b 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -30,7 +30,7 @@ return -/obj/machinery/door/firedoor/attackby(obj/item/weapon/C as obj, mob/user as mob, params) +/obj/machinery/door/firedoor/attackby(obj/item/weapon/C, mob/user, params) add_fingerprint(user) if(operating) return//Already doing something. if(istype(C, /obj/item/weapon/weldingtool)) @@ -51,7 +51,7 @@ return return -/obj/machinery/door/firedoor/attack_ai(mob/user as mob) +/obj/machinery/door/firedoor/attack_ai(mob/user) add_fingerprint(user) if(blocked || operating || stat & NOPOWER) return @@ -120,7 +120,7 @@ else return 1 -/obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target as turf) +/obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) @@ -128,7 +128,7 @@ else return 1 -/obj/machinery/door/firedoor/border_only/CanAtmosPass(var/turf/T) +/obj/machinery/door/firedoor/border_only/CanAtmosPass(turf/T) if(get_dir(loc, T) == dir) return !density else diff --git a/code/game/machinery/doors/unpowered.dm b/code/game/machinery/doors/unpowered.dm index f8c634f9724..e57408e06f5 100644 --- a/code/game/machinery/doors/unpowered.dm +++ b/code/game/machinery/doors/unpowered.dm @@ -8,7 +8,7 @@ return -/obj/machinery/door/unpowered/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/door/unpowered/attackby(obj/item/I, mob/user, params) if(src.locked) return ..() return diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 5ea017c481b..77867600333 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -59,7 +59,7 @@ bumpopen(M) return -/obj/machinery/door/window/bumpopen(mob/user as mob) +/obj/machinery/door/window/bumpopen(mob/user) if( operating || !src.density ) return src.add_fingerprint(user) @@ -80,17 +80,17 @@ else return 1 -/obj/machinery/door/window/CanAtmosPass(var/turf/T) +/obj/machinery/door/window/CanAtmosPass(turf/T) if(get_dir(loc, T) == dir) return !density else return 1 //used in the AStar algorithm to determinate if the turf the door is on is passable -/obj/machinery/door/window/CanAStarPass(var/obj/item/weapon/card/id/ID, var/to_dir) +/obj/machinery/door/window/CanAStarPass(obj/item/weapon/card/id/ID, to_dir) return !density || (dir != to_dir) || check_access(ID) -/obj/machinery/door/window/CheckExit(atom/movable/mover as mob|obj, turf/target as turf) +/obj/machinery/door/window/CheckExit(atom/movable/mover as mob|obj, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) @@ -98,7 +98,7 @@ else return 1 -/obj/machinery/door/window/open(var/forced=0) +/obj/machinery/door/window/open(forced=0) if (src.operating == 1) //doors can still open when emag-disabled return 0 if (!ticker) @@ -125,7 +125,7 @@ src.operating = 0 return 1 -/obj/machinery/door/window/close(var/forced=0) +/obj/machinery/door/window/close(forced=0) if (src.operating) return 0 if(!forced) @@ -149,7 +149,7 @@ src.operating = 0 return 1 -/obj/machinery/door/window/proc/take_damage(var/damage) +/obj/machinery/door/window/proc/take_damage(damage) src.health = max(0, src.health - damage) if (src.health <= 0) var/debris = list( @@ -177,7 +177,7 @@ take_damage(60) -/obj/machinery/door/window/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/door/window/bullet_act(obj/item/projectile/Proj) if(Proj.damage) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) take_damage(round(Proj.damage / 2)) @@ -211,10 +211,10 @@ return -/obj/machinery/door/window/attack_ai(mob/user as mob) +/obj/machinery/door/window/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/door/window/proc/attack_generic(mob/user as mob, damage = 0) +/obj/machinery/door/window/proc/attack_generic(mob/user, damage = 0) if(src.operating) return user.changeNext_move(CLICK_CD_MELEE) @@ -223,13 +223,13 @@ "You smash against the [src.name]!") take_damage(damage) -/obj/machinery/door/window/attack_alien(mob/living/user as mob) +/obj/machinery/door/window/attack_alien(mob/living/user) user.do_attack_animation(src) if(islarva(user)) return attack_generic(user, 25) -/obj/machinery/door/window/attack_animal(mob/living/user as mob) +/obj/machinery/door/window/attack_animal(mob/living/user) if(!isanimal(user)) return var/mob/living/simple_animal/M = user @@ -239,19 +239,19 @@ attack_generic(M, M.melee_damage_upper) -/obj/machinery/door/window/attack_slime(mob/living/simple_animal/slime/user as mob) +/obj/machinery/door/window/attack_slime(mob/living/simple_animal/slime/user) user.do_attack_animation(src) if(!user.is_adult) return attack_generic(user, 25) -/obj/machinery/door/window/attack_paw(mob/user as mob) +/obj/machinery/door/window/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/door/window/attack_hand(mob/user as mob) +/obj/machinery/door/window/attack_hand(mob/user) return src.attackby(user, user) -/obj/machinery/door/window/emag_act(mob/user as mob) +/obj/machinery/door/window/emag_act(mob/user) if(density && !emagged) operating = 0 flick("[src.base_state]spark", src) @@ -260,7 +260,7 @@ open() emagged = 1 -/obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/living/user as mob, params) +/obj/machinery/door/window/attackby(obj/item/weapon/I, mob/living/user, params) //If it's in the process of opening/closing, ignore the click if (src.operating) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 83f986aaf19..4d4e84cb3b2 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -20,7 +20,7 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/process() return PROCESS_KILL -/obj/machinery/doppler_array/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/doppler_array/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/wrench)) if(!anchored && !isinspace()) anchored = 1 @@ -44,8 +44,8 @@ var/list/doppler_arrays = list() src.dir = turn(src.dir, 90) return -/obj/machinery/doppler_array/proc/sense_explosion(var/x0,var/y0,var/z0,var/devastation_range,var/heavy_impact_range,var/light_impact_range, - var/took,var/orig_dev_range,var/orig_heavy_range,var/orig_light_range) +/obj/machinery/doppler_array/proc/sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range, + took,orig_dev_range,orig_heavy_range,orig_light_range) if(stat & NOPOWER) return if(z != z0) return diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 0e54a939366..c6d0edb22a8 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -197,7 +197,7 @@ A.bolt() goIdle(1) -/obj/machinery/doorButtons/airlock_controller/proc/goIdle(var/update) +/obj/machinery/doorButtons/airlock_controller/proc/goIdle(update) lostPower = 0 busy = 0 if(update) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index ac2b9b6ff7d..e528bf28b69 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -26,7 +26,7 @@ var/on = 1 -/obj/machinery/embedded_controller/interact(mob/user as mob) +/obj/machinery/embedded_controller/interact(mob/user) //user << browse(return_text(), "window=computer") //onclose(user, "computer") user.set_machine(src) @@ -35,7 +35,7 @@ popup.set_content(return_text()) popup.open() -/obj/machinery/embedded_controller/attack_hand(mob/user as mob) +/obj/machinery/embedded_controller/attack_hand(mob/user) interact(user) /obj/machinery/embedded_controller/update_icon() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 299a8c01b38..39f3f01ee08 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -55,7 +55,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED holograph_range += 1 * B.rating holo_range = holograph_range -/obj/machinery/hologram/holopad/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/hologram/holopad/attackby(obj/item/P, mob/user, params) if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P)) return @@ -71,7 +71,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED default_deconstruction_crowbar(P) -/obj/machinery/hologram/holopad/attack_hand(var/mob/living/carbon/human/user) //Carn: Hologram requests. +/obj/machinery/hologram/holopad/attack_hand(mob/living/carbon/human/user) //Carn: Hologram requests. if(!istype(user)) return if(user.stat || stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 0354e94eac4..6a275734570 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -10,13 +10,13 @@ idle_power_usage = 2 active_power_usage = 4 -/obj/machinery/igniter/attack_ai(mob/user as mob) +/obj/machinery/igniter/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/igniter/attack_paw(mob/user as mob) +/obj/machinery/igniter/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/igniter/attack_hand(mob/user as mob) +/obj/machinery/igniter/attack_hand(mob/user) if(..()) return add_fingerprint(user) @@ -69,7 +69,7 @@ icon_state = "[base_state]-p" // src.sd_SetLuminosity(0) -/obj/machinery/sparker/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/sparker/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/detective_scanner)) return if (istype(W, /obj/item/weapon/screwdriver)) @@ -117,16 +117,16 @@ ignite() ..(severity) -/obj/machinery/ignition_switch/attack_ai(mob/user as mob) +/obj/machinery/ignition_switch/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/ignition_switch/attack_paw(mob/user as mob) +/obj/machinery/ignition_switch/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/ignition_switch/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/machinery/ignition_switch/attackby(obj/item/weapon/W, mob/user, params) return src.attack_hand(user) -/obj/machinery/ignition_switch/attack_hand(mob/user as mob) +/obj/machinery/ignition_switch/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 73bd48b5df5..0ca76f39213 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -72,7 +72,7 @@ usr << "There's nothing attached to the IV drip!" -/obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/iv_drip/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/reagent_containers)) if(!isnull(beaker)) user << "There is already a reagent container loaded!" diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index a675977b8a6..4952544aeb7 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -268,7 +268,7 @@ Class Procs: return return 1 -/obj/machinery/attack_ai(mob/user as mob) +/obj/machinery/attack_ai(mob/user) if(isrobot(user)) // For some reason attack_robot doesn't work // This is to stop robots from using cameras to remotely control machines. @@ -277,11 +277,11 @@ Class Procs: else return src.attack_hand(user) -/obj/machinery/attack_paw(mob/user as mob) +/obj/machinery/attack_paw(mob/user) return src.attack_hand(user) //set_machine must be 0 if clicking the machinery doesn't bring up a dialog -/obj/machinery/attack_hand(mob/user as mob, var/check_power = 1, var/set_machine = 1) +/obj/machinery/attack_hand(mob/user, check_power = 1, set_machine = 1) if(user.lying || user.stat) return 1 if(!user.IsAdvancedToolUser()) @@ -320,7 +320,7 @@ Class Procs: uid = gl_uid gl_uid++ -/obj/machinery/proc/default_pry_open(var/obj/item/weapon/crowbar/C) +/obj/machinery/proc/default_pry_open(obj/item/weapon/crowbar/C) . = !(state_open || panel_open || is_operational()) && istype(C) if(.) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) @@ -328,7 +328,7 @@ Class Procs: open_machine() return 1 -/obj/machinery/proc/default_deconstruction_crowbar(var/obj/item/weapon/crowbar/C, var/ignore_panel = 0) +/obj/machinery/proc/default_deconstruction_crowbar(obj/item/weapon/crowbar/C, ignore_panel = 0) . = istype(C) && (panel_open || ignore_panel) if(.) deconstruction() @@ -342,7 +342,7 @@ Class Procs: I.loc = src.loc qdel(src) -/obj/machinery/proc/default_deconstruction_screwdriver(var/mob/user, var/icon_state_open, var/icon_state_closed, var/obj/item/weapon/screwdriver/S) +/obj/machinery/proc/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/weapon/screwdriver/S) if(istype(S)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(!panel_open) @@ -356,7 +356,7 @@ Class Procs: return 1 return 0 -/obj/machinery/proc/default_change_direction_wrench(var/mob/user, var/obj/item/weapon/wrench/W) +/obj/machinery/proc/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W) if(panel_open && istype(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) dir = turn(dir,-90) diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 41ebba50ddb..43b767934ee 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -49,7 +49,7 @@ center = null // update the invisibility and icon -/obj/machinery/magnetic_module/hide(var/intact) +/obj/machinery/magnetic_module/hide(intact) invisibility = intact ? 101 : 0 updateicon() @@ -77,7 +77,7 @@ -/obj/machinery/magnetic_module/proc/Cmd(var/command, var/modifier) +/obj/machinery/magnetic_module/proc/Cmd(command, modifier) if(command) switch(command) @@ -255,10 +255,10 @@ magnets.Add(M) -/obj/machinery/magnetic_controller/attack_ai(mob/user as mob) +/obj/machinery/magnetic_controller/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/magnetic_controller/attack_hand(mob/user as mob) +/obj/machinery/magnetic_controller/attack_hand(mob/user) if(stat & (BROKEN|NOPOWER)) return user.set_machine(src) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index fed05fe9ce7..a49787b25c4 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -59,7 +59,7 @@ // called when turf state changes // hide the object if turf is intact -/obj/machinery/navbeacon/hide(var/intact) +/obj/machinery/navbeacon/hide(intact) invisibility = intact ? 101 : 0 updateicon() @@ -73,7 +73,7 @@ else icon_state = "[state]" -/obj/machinery/navbeacon/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/navbeacon/attackby(obj/item/I, mob/user, params) var/turf/T = loc if(T.intact) return // prevent intraction when T-scanner revealed @@ -97,16 +97,16 @@ user << "You must open the cover first!" return -/obj/machinery/navbeacon/attack_ai(var/mob/user) +/obj/machinery/navbeacon/attack_ai(mob/user) interact(user, 1) /obj/machinery/navbeacon/attack_paw() return -/obj/machinery/navbeacon/attack_hand(var/mob/user) +/obj/machinery/navbeacon/attack_hand(mob/user) interact(user, 0) -/obj/machinery/navbeacon/interact(var/mob/user, var/ai = 0) +/obj/machinery/navbeacon/interact(mob/user, ai = 0) var/turf/T = loc if(T.intact) return // prevent intraction when T-scanner revealed diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 2491f33c543..873a51797d2 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -11,7 +11,7 @@ src.drawmap(usr) -/obj/machinery/computer/security/proc/drawmap(var/mob/user as mob) +/obj/machinery/computer/security/proc/drawmap(mob/user) var/icx = round(world.maxx/16) + 1 var/icy = round(world.maxy/16) + 1 diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 7fb0d411b64..bed510a177c 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -270,7 +270,7 @@ var/global/list/pipeID2State = list( else return 0 -/obj/item/pipe/proc/unflip(var/direction) +/obj/item/pipe/proc/unflip(direction) if(!(direction in cardinal)) return turn(direction, 45) @@ -284,10 +284,10 @@ var/global/list/pipeID2State = list( else if(dir==8) dir = 4 -/obj/item/pipe/attack_self(mob/user as mob) +/obj/item/pipe/attack_self(mob/user) return rotate() -/obj/item/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/item/pipe/attackby(obj/item/weapon/W, mob/user, params) //* if (!istype(W, /obj/item/weapon/wrench)) @@ -412,7 +412,7 @@ var/global/list/pipeID2State = list( item_state = "buildpipe" w_class = 4 -/obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/item/pipe_meter/attackby(obj/item/weapon/W, mob/user, params) ..() if (!istype(W, /obj/item/weapon/wrench)) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index ff9a8dd287f..7861d46e552 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -6,10 +6,10 @@ anchored = 1 var/wait = 0 -/obj/machinery/pipedispenser/attack_paw(user as mob) +/obj/machinery/pipedispenser/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/pipedispenser/attack_hand(user as mob) +/obj/machinery/pipedispenser/attack_hand(mob/user) if(..()) return 1 var/dat = {" @@ -68,7 +68,7 @@ wait = 0 return -/obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob, params) +/obj/machinery/pipedispenser/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter)) usr << "You put [W] back into [src]." @@ -123,7 +123,7 @@ Nah */ //Allow you to drag-drop disposal pipes and transit tubes into it -/obj/machinery/pipedispenser/disposal/MouseDrop_T(var/obj/structure/pipe as obj, mob/usr as mob) +/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/usr) if(!usr.canmove || usr.stat || usr.restrained()) return @@ -138,7 +138,7 @@ Nah qdel(pipe) -/obj/machinery/pipedispenser/disposal/attack_hand(user as mob) +/obj/machinery/pipedispenser/disposal/attack_hand(mob/user) if(..()) return 1 @@ -189,7 +189,7 @@ Nah density = 1 anchored = 1.0 -/obj/machinery/pipedispenser/disposal/transit_tube/attack_hand(user as mob) +/obj/machinery/pipedispenser/disposal/transit_tube/attack_hand(mob/user) if(..()) return 1 diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 68c7098d581..707abc57f65 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -308,7 +308,7 @@ attacked = 0 ..() -/obj/machinery/porta_turret/attack_animal(mob/living/simple_animal/M as mob) +/obj/machinery/porta_turret/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(M.melee_damage_upper == 0) @@ -321,7 +321,7 @@ M << "That object is useless to you." return -/obj/machinery/porta_turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/obj/machinery/porta_turret/attack_alien(mob/living/carbon/alien/humanoid/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(!(stat & BROKEN)) @@ -334,7 +334,7 @@ return -/obj/machinery/porta_turret/emag_act(user as mob) +/obj/machinery/porta_turret/emag_act(mob/user) if(!emagged) user << "You short out [src]'s threat assessment circuits." visible_message("[src] hums oddly...") @@ -484,7 +484,7 @@ popDown() // no valid targets, close the cover -/obj/machinery/porta_turret/proc/tryToShootAt(var/list/atom/movable/targets) +/obj/machinery/porta_turret/proc/tryToShootAt(list/atom/movable/targets) while(targets.len > 0) var/atom/movable/M = pick(targets) targets -= M @@ -579,7 +579,7 @@ return threatcount -/obj/machinery/porta_turret/proc/target(var/atom/movable/target) +/obj/machinery/porta_turret/proc/target(atom/movable/target) if(disabled) return if(target) @@ -591,7 +591,7 @@ return 1 return -/obj/machinery/porta_turret/proc/shootAt(var/atom/movable/target) +/obj/machinery/porta_turret/proc/shootAt(atom/movable/target) if(!emagged) //if it hasn't been emagged, it has to obey a cooldown rate if(last_fired || !raised) //prevents rapid-fire shooting, unless it's been emagged return @@ -631,7 +631,7 @@ A.xo = U.x - T.x A.fire() -/obj/machinery/porta_turret/proc/setState(var/on, var/emagged) +/obj/machinery/porta_turret/proc/setState(on, emagged) if(controllock) return src.on = on @@ -1013,7 +1013,7 @@ Status: []
"}, Parent_Turret.attacked = 0 ..() -/obj/machinery/porta_turret_cover/emag_act(user as mob) +/obj/machinery/porta_turret_cover/emag_act(mob/user) if(!emagged) user << "You short out [Parent_Turret]'s threat assessment circuits." visible_message("[Parent_Turret] hums oddly...") @@ -1087,7 +1087,7 @@ Status: []
"}, else user << "Access denied." -/obj/machinery/turretid/emag_act(mob/user as mob) +/obj/machinery/turretid/emag_act(mob/user) if(!emagged) user << "You short out the turret controls' access analysis module." emagged = 1 @@ -1095,7 +1095,7 @@ Status: []
"}, if(user.machine==src) src.attack_hand(user) -/obj/machinery/turretid/attack_ai(mob/user as mob) +/obj/machinery/turretid/attack_ai(mob/user) if(!ailock) return attack_hand(user) else diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 30472a439a5..49245b20148 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -43,7 +43,7 @@ process_occupant() return 1 -/obj/machinery/recharge_station/relaymove(mob/user as mob) +/obj/machinery/recharge_station/relaymove(mob/user) if(user.stat) return open_machine() @@ -62,13 +62,13 @@ open_machine() ..() -/obj/machinery/recharge_station/attack_paw(user as mob) +/obj/machinery/recharge_station/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/recharge_station/attack_ai(user as mob) +/obj/machinery/recharge_station/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/recharge_station/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/recharge_station/attackby(obj/item/P, mob/user, params) if(state_open) if(default_deconstruction_screwdriver(user, "borgdecon2", "borgcharger0", P)) return @@ -81,7 +81,7 @@ default_deconstruction_crowbar(P) -/obj/machinery/recharge_station/attack_hand(user as mob) +/obj/machinery/recharge_station/attack_hand(mob/user) if(..(user,1,set_machine = 0)) return diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 613bb80c863..38fe78bd912 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -56,7 +56,7 @@ var/const/SAFETY_COOLDOWN = 100 update_icon() -/obj/machinery/recycler/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/recycler/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I)) return @@ -74,7 +74,7 @@ var/const/SAFETY_COOLDOWN = 100 add_fingerprint(user) return -/obj/machinery/recycler/emag_act(user as mob) +/obj/machinery/recycler/emag_act(mob/user) if(!emagged) emagged = 1 if(safety_mode) @@ -91,13 +91,13 @@ var/const/SAFETY_COOLDOWN = 100 icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end // This is purely for admin possession !FUN!. -/obj/machinery/recycler/Bump(var/atom/movable/AM) +/obj/machinery/recycler/Bump(atom/movable/AM) ..() if(AM) Bumped(AM) -/obj/machinery/recycler/Bumped(var/atom/movable/AM) +/obj/machinery/recycler/Bumped(atom/movable/AM) if(stat & (BROKEN|NOPOWER)) return @@ -117,7 +117,7 @@ var/const/SAFETY_COOLDOWN = 100 playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) AM.loc = src.loc -/obj/machinery/recycler/proc/recycle(var/obj/item/I, var/sound = 1) +/obj/machinery/recycler/proc/recycle(obj/item/I, sound = 1) I.loc = src.loc if(is_type_in_list(I, blacklist)) qdel(I) @@ -151,7 +151,7 @@ var/const/SAFETY_COOLDOWN = 100 playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) -/obj/machinery/recycler/proc/stop(var/mob/living/L) +/obj/machinery/recycler/proc/stop(mob/living/L) playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) safety_mode = 1 update_icon() @@ -162,7 +162,7 @@ var/const/SAFETY_COOLDOWN = 100 safety_mode = 0 update_icon() -/obj/machinery/recycler/proc/eat(var/mob/living/L) +/obj/machinery/recycler/proc/eat(mob/living/L) L.loc = src.loc diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 572c0029d1d..7029c01bfbe 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -121,7 +121,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() Radio = new /obj/item/device/radio(src) Radio.listening = 0 -/obj/machinery/requests_console/attack_hand(var/mob/user) +/obj/machinery/requests_console/attack_hand(mob/user) if(..(user)) return var/dat = "" @@ -428,7 +428,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() updateUsrDialog() return -/obj/machinery/say_quote(var/input, list/spans) +/obj/machinery/say_quote(input, list/spans) var/ending = copytext(input, length(input) - 2) if (ending == "!!!") return "blares, \"attach_spans(input, spans)\"" @@ -473,7 +473,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() src.messages += "From: [linkedsender]
[message]" SetLuminosity(2) -/obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params) +/obj/machinery/requests_console/attackby(obj/item/weapon/O, mob/user, params) if (istype(O, /obj/item/weapon/crowbar)) if(open) user << "You close the maintenance panel." diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 16ec50d713b..ad5c467857b 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -11,7 +11,7 @@ idle_power_usage = 20 active_power_usage = 5000 -/obj/machinery/robotic_fabricator/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/robotic_fabricator/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/stack/sheet/metal)) if (src.metal_amount < 150000.0) var/count = 0 @@ -40,10 +40,10 @@ else stat |= NOPOWER -/obj/machinery/robotic_fabricator/attack_paw(user as mob) +/obj/machinery/robotic_fabricator/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/robotic_fabricator/attack_hand(user as mob) +/obj/machinery/robotic_fabricator/attack_hand(mob/user) var/dat if (..()) return diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 9de401f9388..ca1fe863e3b 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -30,10 +30,10 @@ if(!height) return 0 else return ..() -/obj/machinery/shield/CanAtmosPass(var/turf/T) +/obj/machinery/shield/CanAtmosPass(turf/T) return !density -/obj/machinery/shield/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/shield/attackby(obj/item/weapon/W, mob/user, params) if(!istype(W)) return //Calculate damage @@ -54,7 +54,7 @@ spawn(20) if(src) opacity = 0 ..() -/obj/machinery/shield/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/shield/bullet_act(obj/item/projectile/Proj) health -= Proj.damage ..() if(health <=0) @@ -207,7 +207,7 @@ malfunction = 1 checkhp() -/obj/machinery/shieldgen/attack_hand(mob/user as mob) +/obj/machinery/shieldgen/attack_hand(mob/user) if(locked) user << "The machine is locked, you are unable to use it!" return @@ -230,7 +230,7 @@ user << "The device must first be secured to the floor!" return -/obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/shieldgen/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) if(is_open) @@ -345,7 +345,7 @@ // message_admins("[PN.load]") // use_power(250) //uses APC power -/obj/machinery/shieldwallgen/attack_hand(mob/user as mob) +/obj/machinery/shieldwallgen/attack_hand(mob/user) if(!anchored) user << "The shield generator needs to be firmly secured to the floor first!" return 1 @@ -403,7 +403,7 @@ src.cleanup(4) src.cleanup(8) -/obj/machinery/shieldwallgen/proc/setup_field(var/NSEW = 0) +/obj/machinery/shieldwallgen/proc/setup_field(NSEW = 0) var/turf/T = src.loc var/turf/T2 = src.loc var/obj/machinery/shieldwallgen/G @@ -477,7 +477,7 @@ add_fingerprint(user) ..() -/obj/machinery/shieldwallgen/proc/cleanup(var/NSEW) +/obj/machinery/shieldwallgen/proc/cleanup(NSEW) var/obj/machinery/shieldwall/F var/obj/machinery/shieldwallgen/G var/turf/T = src.loc @@ -502,7 +502,7 @@ src.cleanup(8) ..() -/obj/machinery/shieldwallgen/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/shieldwallgen/bullet_act(obj/item/projectile/Proj) storedpower -= Proj.damage ..() return @@ -534,7 +534,7 @@ if(A && B) needs_power = 1 -/obj/machinery/shieldwall/attack_hand(mob/user as mob) +/obj/machinery/shieldwall/attack_hand(mob/user) return @@ -554,7 +554,7 @@ gen_secondary.storedpower -=10 -/obj/machinery/shieldwall/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/shieldwall/bullet_act(obj/item/projectile/Proj) if(needs_power) var/obj/machinery/shieldwallgen/G if(prob(50)) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index b1891f80539..96cc0cbec1b 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -75,7 +75,7 @@ ..() return -/obj/machinery/space_heater/attack_hand(mob/user as mob) +/obj/machinery/space_heater/attack_hand(mob/user) src.add_fingerprint(user) if(open) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index ff3f0fc4f5f..a0110d2f25a 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -287,7 +287,7 @@ return -/obj/machinery/ai_status_display/proc/set_picture(var/state) +/obj/machinery/ai_status_display/proc/set_picture(state) picture_state = state if(overlays.len) overlays.Cut() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index bee339ff68b..67b8c167772 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -158,7 +158,7 @@ return -/obj/machinery/suit_storage_unit/attack_hand(mob/user as mob) +/obj/machinery/suit_storage_unit/attack_hand(mob/user) var/dat if(..()) return @@ -259,7 +259,7 @@ return -/obj/machinery/suit_storage_unit/proc/toggleUV(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/toggleUV(mob/user) // var/protected = 0 // var/mob/living/carbon/human/H = user if(!src.panelopen) @@ -285,7 +285,7 @@ return -/obj/machinery/suit_storage_unit/proc/togglesafeties(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/togglesafeties(mob/user) // var/protected = 0 // var/mob/living/carbon/human/H = user if(!src.panelopen) //Needed check due to bugs @@ -337,7 +337,7 @@ return -/obj/machinery/suit_storage_unit/proc/toggle_open(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/toggle_open(mob/user) if(src.islocked || src.isUV) user << "You're unable to open unit!" return 0 @@ -348,7 +348,7 @@ return 1 -/obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user) if(src.OCCUPANT && src.safetieson) user << "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments." return @@ -358,7 +358,7 @@ return -/obj/machinery/suit_storage_unit/proc/start_UV(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/start_UV(mob/user) if(src.isUV || src.isopen) //I'm bored of all these sanity checks return if(src.OCCUPANT && src.safetieson) @@ -415,7 +415,7 @@ return src.cycletime_left -/obj/machinery/suit_storage_unit/proc/eject_occupant(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/eject_occupant(mob/user) if (src.islocked) return @@ -466,10 +466,10 @@ return -/obj/machinery/suit_storage_unit/MouseDrop_T(mob/M as mob, mob/user as mob) +/obj/machinery/suit_storage_unit/MouseDrop_T(mob/M, mob/user) store_mob(M, user) -/obj/machinery/suit_storage_unit/proc/store_mob(mob/living/M as mob, mob/user as mob) +/obj/machinery/suit_storage_unit/proc/store_mob(mob/living/M, mob/user) if(!istype(M)) return if (user.stat != 0) @@ -503,7 +503,7 @@ return -/obj/machinery/suit_storage_unit/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params) if(!src.ispowered) if(istype(I, /obj/item/weapon/crowbar) && !isopen) if(toggle_open(user)) @@ -587,11 +587,11 @@ return -/obj/machinery/suit_storage_unit/attack_ai(mob/user as mob) +/obj/machinery/suit_storage_unit/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/suit_storage_unit/attack_paw(mob/user as mob) +/obj/machinery/suit_storage_unit/attack_paw(mob/user) user << "The console controls are far too complicated for your tiny brain!" return diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index d8ed227bb51..2c102e8695b 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -19,7 +19,7 @@ var/selfdestructing = 0 var/charges = 1 -/obj/machinery/syndicate_beacon/attack_hand(var/mob/user as mob) +/obj/machinery/syndicate_beacon/attack_hand(mob/user) usr.set_machine(src) var/dat = "Scanning [pick("retina pattern", "voice print", "fingerprints", "dna sequence")]...
Identity confirmed,
" if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai)) @@ -142,11 +142,11 @@ user << "You deactivate the beacon." -/obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob) +/obj/machinery/power/singularity_beacon/attack_ai(mob/user) return -/obj/machinery/power/singularity_beacon/attack_hand(var/mob/user as mob) +/obj/machinery/power/singularity_beacon/attack_hand(mob/user) if(anchored) return active ? Deactivate(user) : Activate(user) else @@ -154,7 +154,7 @@ return -/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/screwdriver)) if(active) user << "You need to deactivate the beacon first!" @@ -207,7 +207,7 @@ var/droptype = /obj/machinery/power/singularity_beacon/syndicate -/obj/item/device/sbeacondrop/attack_self(mob/user as mob) +/obj/item/device/sbeacondrop/attack_self(mob/user) if(user) user << "Locked In." new droptype( user.loc ) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 87b89bcd926..659fa906fc9 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -48,7 +48,7 @@ /obj/machinery/syndicatebomb/update_icon() icon_state = "[initial(icon_state)][active ? "-active" : "-inactive"][open_panel ? "-wires" : ""]" -/obj/machinery/syndicatebomb/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/syndicatebomb/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench)) if(!anchored) if(!isturf(src.loc) || istype(src.loc, /turf/space)) @@ -100,13 +100,13 @@ else ..() -/obj/machinery/syndicatebomb/attack_hand(var/mob/user) +/obj/machinery/syndicatebomb/attack_hand(mob/user) interact(user) /obj/machinery/syndicatebomb/attack_ai() return -/obj/machinery/syndicatebomb/interact(var/mob/user) +/obj/machinery/syndicatebomb/interact(mob/user) if(wires) wires.Interact(user) if(!open_panel) @@ -118,7 +118,7 @@ user << "The bomb is bolted to the floor!" return -/obj/machinery/syndicatebomb/proc/settings(var/mob/user) +/obj/machinery/syndicatebomb/proc/settings(mob/user) var/newtime = input(user, "Please set the timer.", "Timer", "[timer]") as num newtime = Clamp(newtime, 60, 60000) if(in_range(src, user) && isliving(user)) //No running off and setting bombs from across the station @@ -143,7 +143,7 @@ log_game("[key_name(user)] has primed a [name] ([payload]) for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])") payload.adminlog = "The [src.name] that [key_name(user)] had primed detonated!" -/obj/machinery/syndicatebomb/proc/isWireCut(var/index) +/obj/machinery/syndicatebomb/proc/isWireCut(index) return wires.IsIndexCut(index) ///Bomb Subtypes/// @@ -299,7 +299,7 @@ var/detonated = 0 var/existant = 0 -/obj/item/device/syndicatedetonator/attack_self(mob/user as mob) +/obj/item/device/syndicatedetonator/attack_self(mob/user) if(!cooldown) for(var/obj/machinery/syndicatebomb/B in machines) if(B.active) diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index defe129fca2..b53510bda31 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -171,7 +171,7 @@ spawn(50) PlaceInPool(virt) -/proc/Broadcast_SimpleMessage(var/source, var/frequency, var/text, var/data, var/mob/M, var/compression, var/level) +/proc/Broadcast_SimpleMessage(source, frequency, text, data, mob/M, compression, level) /* ###### Prepare the radio connection ###### */ diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 8be4d941146..eca9a206429 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -16,7 +16,7 @@ req_access = list(access_tcomsat) circuit = "/obj/item/weapon/circuitboard/comm_server" -/obj/machinery/computer/telecomms/server/attack_hand(mob/user as mob) +/obj/machinery/computer/telecomms/server/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -225,7 +225,7 @@ src.updateUsrDialog() return -/obj/machinery/computer/telecomms/server/emag_act(mob/user as mob) +/obj/machinery/computer/telecomms/server/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index c6c3ab75a64..34833a6bcdc 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -18,7 +18,7 @@ var/temp = "" // temporary feedback messages circuit = "/obj/item/weapon/circuitboard/comm_monitor" -/obj/machinery/computer/telecomms/monitor/attack_hand(mob/user as mob) +/obj/machinery/computer/telecomms/monitor/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -127,7 +127,7 @@ src.updateUsrDialog() return -/obj/machinery/computer/telecomms/monitor/emag_act(mob/user as mob) +/obj/machinery/computer/telecomms/monitor/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 diff --git a/code/game/machinery/telecomms/computers/traffic_control.dm b/code/game/machinery/telecomms/computers/traffic_control.dm index 9d520a5a7d8..3186b0c2960 100644 --- a/code/game/machinery/telecomms/computers/traffic_control.dm +++ b/code/game/machinery/telecomms/computers/traffic_control.dm @@ -81,7 +81,7 @@ winshow(M, "Telecomms IDE", 0) // hide the windows -/obj/machinery/computer/telecomms/traffic/attack_hand(mob/user as mob) +/obj/machinery/computer/telecomms/traffic/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -135,7 +135,7 @@ temp = "" return -/obj/machinery/computer/telecomms/traffic/proc/create_log(var/entry, var/mob/user) +/obj/machinery/computer/telecomms/traffic/proc/create_log(entry, mob/user) var/id = null if(issilicon(user)) id = "System Administrator" @@ -274,13 +274,13 @@ src.updateUsrDialog() return -/obj/machinery/computer/telecomms/traffic/emag_act(mob/user as mob) +/obj/machinery/computer/telecomms/traffic/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 user << "You you disable the security protocols." -/obj/machinery/computer/telecomms/traffic/proc/canAccess(var/mob/user) +/obj/machinery/computer/telecomms/traffic/proc/canAccess(mob/user) if(issilicon(user) || in_range(user, src)) return 1 return 0 \ No newline at end of file diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 4884051a16c..4dd96c01c8c 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -12,7 +12,7 @@ var/temp = "" // output message -/obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/telecomms/attackby(obj/item/P, mob/user, params) var/icon_closed = initial(icon_state) var/icon_open = "[initial(icon_state)]_o" @@ -34,10 +34,10 @@ default_deconstruction_crowbar(P) -/obj/machinery/telecomms/attack_ai(var/mob/user as mob) +/obj/machinery/telecomms/attack_ai(mob/user) attack_hand(user) -/obj/machinery/telecomms/attack_hand(var/mob/user as mob) +/obj/machinery/telecomms/attack_hand(mob/user) // You need a multitool to use this, or be silicon if(!issilicon(user)) @@ -126,7 +126,7 @@ // Returns a multitool from a user depending on their mobtype. -/obj/machinery/telecomms/proc/get_multitool(mob/user as mob) +/obj/machinery/telecomms/proc/get_multitool(mob/user) var/obj/item/device/multitool/P = null // Let's double check @@ -313,7 +313,7 @@ updateUsrDialog() -/obj/machinery/telecomms/proc/canAccess(var/mob/user) +/obj/machinery/telecomms/proc/canAccess(mob/user) if(issilicon(user) || in_range(user, src)) return 1 return 0 diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index b592d1bf720..1e04ee649f6 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -41,7 +41,7 @@ signal.data["realname"],, signal.data["compression"], list(0, z), signal.frequency, signal.data["spans"], signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"]) -/obj/machinery/telecomms/allinone/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/telecomms/allinone/attackby(obj/item/P, mob/user, params) if(istype(P, /obj/item/device/multitool)) attack_hand(user) diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index f78fdd13897..8613a7bdad4 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -111,12 +111,12 @@ relay_information(signal, "/obj/machinery/telecomms/broadcaster") -/obj/machinery/telecomms/server/proc/setcode(var/t) +/obj/machinery/telecomms/server/proc/setcode(t) if(t) if(istext(t)) rawcode = t -/obj/machinery/telecomms/server/proc/admin_log(var/mob/mob) +/obj/machinery/telecomms/server/proc/admin_log(mob/mob) var/msg="[key_name(mob)] has compiled a script to server [src]:" diary << msg @@ -125,7 +125,7 @@ if(length(rawcode)) // Let's not bother the admins for empty code. message_admins("[key_name_admin(mob)] (FLW) has compiled and uploaded a NTSL script to [src.id]",0,1) -/obj/machinery/telecomms/server/proc/compile(var/mob/user) +/obj/machinery/telecomms/server/proc/compile(mob/user) if(Compiler) admin_log(user) @@ -141,7 +141,7 @@ logs-- break -/obj/machinery/telecomms/server/proc/add_entry(var/content, var/input) +/obj/machinery/telecomms/server/proc/add_entry(content, input) var/datum/comm_log_entry/log = new var/identifier = num2text( rand(-1000,1000) + world.time ) log.name = "[input] ([md5(identifier)])" diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 71a042441d8..361097145bb 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -161,7 +161,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() ..() // Used in auto linking -/obj/machinery/telecomms/proc/add_link(var/obj/machinery/telecomms/T) +/obj/machinery/telecomms/proc/add_link(obj/machinery/telecomms/T) var/turf/position = get_turf(src) var/turf/T_position = get_turf(T) if((position.z == T_position.z) || (src.long_range_link && T.long_range_link)) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 2c5c4d19c4a..e341ca965b6 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -35,7 +35,7 @@ break return power_station -/obj/machinery/computer/teleporter/attackby(I as obj, mob/living/user as mob, params) +/obj/machinery/computer/teleporter/attackby(obj/I, mob/living/user, params) if(istype(I, /obj/item/device/gps)) var/obj/item/device/gps/L = I if(L.locked_location && !(stat & (NOPOWER|BROKEN))) @@ -391,7 +391,7 @@ teleporter_console = null ..() -/obj/machinery/teleport/station/attackby(var/obj/item/weapon/W, mob/user, params) +/obj/machinery/teleport/station/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/multitool) && !panel_open) var/obj/item/device/multitool/M = W if(M.buffer && istype(M.buffer, /obj/machinery/teleport/station) && M.buffer != src) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index a4c672dc38a..f85e470fcf1 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -28,7 +28,7 @@ else icon_state = initial(icon_state) -/obj/machinery/transformer/Bumped(var/atom/movable/AM) +/obj/machinery/transformer/Bumped(atom/movable/AM) if(cooldown == 1) return @@ -49,7 +49,7 @@ return ..() return 0 -/obj/machinery/transformer/proc/do_transform(var/mob/living/carbon/human/H) +/obj/machinery/transformer/proc/do_transform(mob/living/carbon/human/H) if(stat & (BROKEN|NOPOWER)) return if(cooldown == 1) diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 35c4bb5a968..70e783b5416 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -112,7 +112,7 @@ src.icon_state = "grey_target_prism" stat |= NOPOWER -/obj/machinery/turret/proc/setState(var/enabled, var/lethal) +/obj/machinery/turret/proc/setState(enabled, lethal) src.enabled = enabled src.lasers = lethal src.power_change() @@ -126,7 +126,7 @@ return TP return -/obj/machinery/turret/proc/check_target(var/atom/movable/T as mob|obj) +/obj/machinery/turret/proc/check_target(atom/movable/T as mob|obj) if( T && T in protected_area.turretTargets ) var/area/area_T = get_area(T) if( !area_T || (area_T.type != protected_area.type) ) @@ -207,7 +207,7 @@ sleep(shot_delay) return -/obj/machinery/turret/proc/shootAt(var/atom/movable/target) +/obj/machinery/turret/proc/shootAt(atom/movable/target) var/turf/T = get_turf(src) var/turf/U = get_turf(target) if (!T || !U) @@ -263,7 +263,7 @@ invisibility = INVISIBILITY_LEVEL_TWO popping = 0 -/obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/turret/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) src.health -= Proj.damage ..() @@ -308,7 +308,7 @@ qdel(src) -/obj/machinery/turret/attack_animal(mob/living/simple_animal/M as mob) +/obj/machinery/turret/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(M.melee_damage_upper == 0) return @@ -326,7 +326,7 @@ -/obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(!(stat & BROKEN)) @@ -401,7 +401,7 @@ return -/obj/machinery/gun_turret/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/gun_turret/bullet_act(obj/item/projectile/Proj) take_damage(Proj.damage) return @@ -416,7 +416,7 @@ return attack_hand(user) -/obj/machinery/gun_turret/attack_alien(mob/living/user as mob) +/obj/machinery/gun_turret/attack_alien(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) user.visible_message("[user] slashes at [src]!", "You slash at [src]!") @@ -550,7 +550,7 @@ else user << "Access denied." -/obj/machinery/areaturretid/emag_act(mob/user as mob) +/obj/machinery/areaturretid/emag_act(mob/user) if(!emagged) user << "You short out the turret controls' access analysis module." emagged = 1 @@ -558,13 +558,13 @@ if(user.machine==src) src.attack_hand(user) -/obj/machinery/areaturretid/attack_ai(mob/user as mob) +/obj/machinery/areaturretid/attack_ai(mob/user) if(!ailock) return attack_hand(user) else user << "There seems to be a firewall preventing you from accessing this device." -/obj/machinery/areaturretid/attack_hand(mob/user as mob) +/obj/machinery/areaturretid/attack_hand(mob/user) if ( get_dist(src, user) > 0 ) if ( !issilicon(user) ) user << "You are too far away." diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 0f478bacaf0..ba110550f4e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -278,7 +278,7 @@ ..() -/obj/machinery/vending/default_deconstruction_crowbar(var/obj/item/O) +/obj/machinery/vending/default_deconstruction_crowbar(obj/item/O) var/list/all_products = product_records + hidden_records + coin_records for(var/datum/data/vending_product/machine_content in all_products) while(machine_content.amount !=0) @@ -296,7 +296,7 @@ break ..() -/obj/machinery/vending/emag_act(user as mob) +/obj/machinery/vending/emag_act(mob/user) if(!emagged) emagged = 1 user << "You short out the product lock on [src]." diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 05c3b10c069..dae9bac8c5e 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -181,7 +181,7 @@ /obj/machinery/washing_machine/update_icon() icon_state = "wm_[state][panel]" -/obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/washing_machine/attackby(obj/item/weapon/W, mob/user, params) /*if(istype(W,/obj/item/weapon/screwdriver)) panel = !panel user << "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel"*/ @@ -269,7 +269,7 @@ ..() update_icon() -/obj/machinery/washing_machine/attack_hand(mob/user as mob) +/obj/machinery/washing_machine/attack_hand(mob/user) switch(state) if(1) state = 2 diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index 161fc416135..ef9962cf0b4 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -11,7 +11,7 @@ var/charges = 1 var/insisting = 0 -/obj/machinery/wish_granter/attack_hand(var/mob/living/carbon/user) +/obj/machinery/wish_granter/attack_hand(mob/living/carbon/user) if(istype(user)) return usr.set_machine(src) diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 843ff80a7c9..62d63d2e6ce 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -4,7 +4,7 @@ damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8) var/am = "d3c2fbcadca903a41161ccc9df9cf948" -/obj/mecha/combat/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/combat/moved_inside(mob/living/carbon/human/H) if(..()) if(H.client) H.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") @@ -12,7 +12,7 @@ else return 0 -/obj/mecha/combat/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/combat/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc,mob/user) if(..()) if(occupant.client) occupant.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 722b576f134..a668159412b 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -41,7 +41,7 @@ ME.attach(src) return -/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/weapon/stock_parts/cell/C=null) +/obj/mecha/combat/gygax/dark/add_cell(obj/item/weapon/stock_parts/cell/C=null) if(C) C.forceMove(src) cell = C diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 89580944e01..de184e263a1 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -103,7 +103,7 @@ return ..() -/obj/mecha/combat/marauder/Process_Spacemove(var/movement_dir = 0) +/obj/mecha/combat/marauder/Process_Spacemove(movement_dir = 0) if(..()) return 1 if(thrusters && movement_dir && use_power(step_energy_drain)) diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index 4260976a41a..905341c2194 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -18,7 +18,7 @@ var/phasing_energy_drain = 200 max_equip = 3 -/obj/mecha/combat/phazon/Bump(var/atom/obstacle) +/obj/mecha/combat/phazon/Bump(atom/obstacle) if(phasing && get_charge()>=phasing_energy_drain) spawn() if(can_move) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index af4b08e73c2..2a035db1e27 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -90,13 +90,13 @@ /obj/item/mecha_parts/mecha_equipment/proc/action(atom/target) return -/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M) if(istype(M)) if(M.equipment.len[chassis] drills [target] with [src].", \ "[chassis] drills [target] with [src].") if(ishuman(target)) @@ -172,7 +172,7 @@ force = 15 -/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill/can_attach(obj/mecha/M) if(..()) if(istype(M, /obj/mecha/working) || istype(M, /obj/mecha/combat)) return 1 @@ -270,7 +270,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/extinguisher/on_reagent_change() return -/obj/item/mecha_parts/mecha_equipment/tool/extinguisher/can_attach(obj/mecha/working/M as obj) +/obj/item/mecha_parts/mecha_equipment/tool/extinguisher/can_attach(obj/mecha/working/M) if(..()) if(istype(M)) return 1 @@ -416,7 +416,7 @@ chassis.events.clearEvent("onMove",event) return ..() -/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/action(var/obj/item/stack/cable_coil/target) +/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/action(obj/item/stack/cable_coil/target) if(!action_checks(target)) return var/result = load_cable(target) @@ -456,7 +456,7 @@ return "[output] \[Cable: [cable ? cable.amount : 0] m\][(cable && cable.amount) ? "- [!equip_ready?"Dea":"A"]ctivate|Cut" : null]" return -/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/load_cable(var/obj/item/stack/cable_coil/CC) +/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/load_cable(obj/item/stack/cable_coil/CC) if(istype(CC) && CC.amount) var/cur_amount = cable? cable.amount : 0 var/to_load = max(max_cable - cur_amount,0) @@ -488,7 +488,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/reset() last_piece = null -/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/dismantleFloor(var/turf/new_turf) +/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/dismantleFloor(turf/new_turf) if(istype(new_turf, /turf/simulated/floor)) var/turf/simulated/floor/T = new_turf if(!istype(T, /turf/simulated/floor/plating)) @@ -497,7 +497,7 @@ T.make_plating() return !new_turf.intact -/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/layCable(var/turf/new_turf) +/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/layCable(turf/new_turf) if(equip_ready || !istype(new_turf) || !dismantleFloor(new_turf)) return reset() var/fdirn = turn(chassis.dir,180) @@ -682,14 +682,14 @@ var/deflect_coeff = 1.15 var/damage_coeff = 0.8 -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/can_attach(obj/mecha/M) if(..()) if(!istype(M, /obj/mecha/combat/honker)) if(!M.proc_res["dynattackby"]) return 1 return 0 -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/attach(obj/mecha/M) ..() chassis.proc_res["dynattackby"] = src return @@ -703,7 +703,7 @@ if(!chassis) return return "* [src.name]" -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/proc/dynattackby(obj/item/weapon/W, mob/user) if(!action_checks(user)) return chassis.dynattackby(W,user) chassis.log_message("Attacked by [W]. Attacker - [user]") @@ -732,14 +732,14 @@ var/deflect_coeff = 1.15 var/damage_coeff = 0.8 -/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/can_attach(obj/mecha/M) if(..()) if(!istype(M, /obj/mecha/combat/honker)) if(!M.proc_res["dynbulletdamage"] && !M.proc_res["dynhitby"]) return 1 return 0 -/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/attach(obj/mecha/M) ..() chassis.proc_res["dynbulletdamage"] = src chassis.proc_res["dynhitby"] = src @@ -755,7 +755,7 @@ if(!chassis) return return "* [src.name]" -/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/proc/dynbulletdamage(var/obj/item/projectile/Proj) +/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/proc/dynbulletdamage(obj/item/projectile/Proj) if(!action_checks(src)) return chassis.dynbulletdamage(Proj) if(prob(chassis.deflect_chance*deflect_coeff)) @@ -854,7 +854,7 @@ /datum/global_iterator/mecha_repair_droid -/datum/global_iterator/mecha_repair_droid/process(var/obj/item/mecha_parts/mecha_equipment/repair_droid/RD as obj) +/datum/global_iterator/mecha_repair_droid/process(obj/item/mecha_parts/mecha_equipment/repair_droid/RD) if(!RD.chassis) stop() RD.set_ready_state(1) @@ -938,7 +938,7 @@ return chassis.dyngetcharge() return charge -/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_power_channel(var/area/A) +/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_power_channel(area/A) var/pow_chan if(A) for(var/c in use_channels) @@ -1071,7 +1071,7 @@ occupant_message(message) return -/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(var/obj/item/stack/sheet/P) +/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(obj/item/stack/sheet/P) if(P.type == fuel.type && P.amount) var/to_load = max(max_fuel - fuel.amount*fuel.perunit,0) if(to_load) @@ -1168,7 +1168,7 @@ /datum/global_iterator/mecha_generator/nuclear -/datum/global_iterator/mecha_generator/nuclear/process(var/obj/item/mecha_parts/mecha_equipment/generator/nuclear/EG) +/datum/global_iterator/mecha_generator/nuclear/process(obj/item/mecha_parts/mecha_equipment/generator/nuclear/EG) if(..()) for(var/mob/living/carbon/M in view(EG.chassis)) if(istype(M,/mob/living/carbon/human)) @@ -1189,13 +1189,13 @@ var/dam_force = 0 var/obj/mecha/working/ripley/cargo_holder -/obj/item/mecha_parts/mecha_equipment/tool/safety_clamp/can_attach(obj/mecha/working/ripley/M as obj) +/obj/item/mecha_parts/mecha_equipment/tool/safety_clamp/can_attach(obj/mecha/working/ripley/M) if(..()) if(istype(M)) return 1 return 0 -/obj/item/mecha_parts/mecha_equipment/tool/safety_clamp/attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/tool/safety_clamp/attach(obj/mecha/M) ..() cargo_holder = M return diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 70e92ebede8..e6cd8b6af73 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -8,7 +8,7 @@ var/deviation = 0 var/shot_delay = 0 -/obj/item/mecha_parts/mecha_equipment/weapon/can_attach(var/obj/mecha/combat/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/can_attach(obj/mecha/combat/M) if(..()) if(istype(M)) return 1 @@ -112,7 +112,7 @@ projectile = /obj/item/projectile/plasma/adv/mech fire_sound = 'sound/weapons/Laser.ogg' -/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M) if(istype(M, /obj/mecha/working)) if(M.equipment.len < M.max_equip) return 1 @@ -151,7 +151,7 @@ equip_cooldown = 150 range = MELEE|RANGED -/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M) if(..()) if(istype(M)) return 1 @@ -374,7 +374,7 @@ projectile_energy_cost = 100 equip_cooldown = 20 -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/can_attach(obj/mecha/combat/honker/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/can_attach(obj/mecha/combat/honker/M) if(..()) if(istype(M)) return 1 @@ -403,7 +403,7 @@ projectile_energy_cost = 100 equip_cooldown = 10 -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar/can_attach(obj/mecha/combat/honker/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar/can_attach(obj/mecha/combat/honker/M) if(..()) if(istype(M)) return 1 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 767fb81a6e7..c8f2b1980fe 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -446,7 +446,7 @@ updateUsrDialog() return -/obj/machinery/mecha_part_fabricator/proc/remove_material(var/mat_string, var/amount) +/obj/machinery/mecha_part_fabricator/proc/remove_material(mat_string, amount) if(resources[mat_string] < MINERAL_MATERIAL_AMOUNT) //not enough mineral for a sheet return -1 var/type @@ -486,7 +486,7 @@ return result -/obj/machinery/mecha_part_fabricator/attackby(obj/W as obj, mob/user as mob, params) +/obj/machinery/mecha_part_fabricator/attackby(obj/W, mob/user, params) if(default_deconstruction_screwdriver(user, "fab-o", "fab-idle", W)) return @@ -547,7 +547,7 @@ user << "\The [src] cannot hold any more [sname] sheet\s!" return -/obj/machinery/mecha_part_fabricator/proc/material2name(var/ID) +/obj/machinery/mecha_part_fabricator/proc/material2name(ID) return copytext(ID,2) /obj/machinery/mecha_part_fabricator/emag_act() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 8814dc6c64e..512678aac5c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -195,7 +195,7 @@ return 1 return 0 -/obj/mecha/proc/enter_after(delay as num, var/mob/user as mob, var/numticks = 5) +/obj/mecha/proc/enter_after(delay as num, mob/user, numticks = 5) var/delayfraction = delay/numticks var/turf/T = user.loc @@ -427,7 +427,7 @@ //////// Internal damage //////// /////////////////////////////////// -/obj/mecha/proc/check_for_internal_damage(var/list/possible_int_damage,var/ignore_threshold=null) +/obj/mecha/proc/check_for_internal_damage(list/possible_int_damage,ignore_threshold=null) if(!islist(possible_int_damage) || isemptylist(possible_int_damage)) return if(prob(20)) if(ignore_threshold || src.health*100/initial(src.health)ASSUME DIRECT CONTROL?
" -/obj/mecha/transfer_ai(var/interaction, mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +/obj/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) return @@ -855,7 +855,7 @@ ai_enter_mech(AI, interaction) //Hack and From Card interactions share some code, so leave that here for both to use. -/obj/mecha/proc/ai_enter_mech(var/mob/living/silicon/ai/AI, var/interaction) +/obj/mecha/proc/ai_enter_mech(mob/living/silicon/ai/AI, interaction) AI.aiRestorePowerRoutine = 0 AI.loc = src occupant = AI @@ -1005,7 +1005,7 @@ return -/obj/mecha/MouseDrop_T(mob/M as mob, mob/user as mob) +/obj/mecha/MouseDrop_T(mob/M, mob/user) if (!user.canUseTopic(src) || (user != M)) return if(!ishuman(user)) // no silicons or drones in mechas. @@ -1045,7 +1045,7 @@ user << "You stop entering the exosuit!" return -/obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/proc/moved_inside(mob/living/carbon/human/H) if(H && H.client && H in range(1)) H.reset_view(src) /* @@ -1071,7 +1071,7 @@ else return 0 -/obj/mecha/proc/mmi_move_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/proc/mmi_move_inside(obj/item/device/mmi/mmi_as_oc,mob/user) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) user << "Consciousness matrix not detected!" return 0 @@ -1098,7 +1098,7 @@ user << "You stop inserting the MMI." return 0 -/obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/proc/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc,mob/user) if(mmi_as_oc && user in range(1)) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) user << "Consciousness matrix not detected!" @@ -1168,7 +1168,7 @@ go_out() -/obj/mecha/proc/go_out(var/forced) +/obj/mecha/proc/go_out(forced) if(!src.occupant) return var/atom/movable/mob_container if(ishuman(occupant)) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 12977e75648..8df632882a3 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -34,7 +34,7 @@ S.use(5) return 1 -/datum/construction/reversible/mecha/custom_action(index as num, diff as num, atom/used_atom, mob/user as mob) +/datum/construction/reversible/mecha/custom_action(index as num, diff as num, atom/used_atom, mob/user) if(istype(used_atom, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = used_atom if (W.remove_fuel(0, user)) @@ -81,7 +81,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/ripley_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/ripley_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/ripley_chassis/spawn_result() @@ -155,7 +155,7 @@ "desc"="The hydraulic systems are disconnected.") ) -/datum/construction/reversible/mecha/ripley/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/ripley/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/ripley/custom_action(index, diff, atom/used_atom, mob/user) @@ -291,7 +291,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/gygax_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/gygax_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/gygax_chassis/spawn_result() @@ -388,7 +388,7 @@ "desc"="The hydraulic systems are disconnected.") ) -/datum/construction/reversible/mecha/gygax/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/gygax/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/gygax/custom_action(index, diff, atom/used_atom, mob/user) @@ -570,7 +570,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/firefighter_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/firefighter_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/firefighter_chassis/spawn_result() @@ -648,7 +648,7 @@ "desc"="The hydraulic systems are disconnected.") ) -/datum/construction/reversible/mecha/firefighter/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/firefighter/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/firefighter/custom_action(index, diff, atom/used_atom, mob/user) @@ -788,7 +788,7 @@ list("key"=/obj/item/mecha_parts/part/honker_head) ) -/datum/construction/mecha/honker_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/honker_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/honker_chassis/custom_action(step, atom/used_atom, mob/user) @@ -820,7 +820,7 @@ list("key"=/obj/item/weapon/bikehorn),//11 ) -/datum/construction/mecha/honker/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/honker/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/mecha/honker/custom_action(step, atom/used_atom, mob/user) @@ -870,7 +870,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/durand_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/durand_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/durand_chassis/spawn_result() @@ -967,7 +967,7 @@ ) -/datum/construction/reversible/mecha/durand/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/durand/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/durand/custom_action(index, diff, atom/used_atom, mob/user) @@ -1152,7 +1152,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/phazon_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/phazon_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/phazon_chassis/spawn_result() @@ -1266,7 +1266,7 @@ ) -/datum/construction/reversible/mecha/phazon/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/phazon/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/phazon/custom_action(index, diff, atom/used_atom, mob/user) @@ -1477,7 +1477,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/odysseus_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/odysseus_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/odysseus_chassis/spawn_result() @@ -1550,7 +1550,7 @@ "desc"="The hydraulic systems are disconnected.") ) -/datum/construction/reversible/mecha/odysseus/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/odysseus/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/odysseus/custom_action(index, diff, atom/used_atom, mob/user) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index adc83c8da0d..cbd9075f608 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -9,7 +9,7 @@ var/screen = 0 var/stored_data -/obj/machinery/computer/mecha/attack_hand(var/mob/user as mob) +/obj/machinery/computer/mecha/attack_hand(mob/user) if(..()) return user.set_machine(src) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 0e6d689b85f..fe430840e98 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -15,7 +15,7 @@ icon_state = "backbone" var/datum/construction/construct -/obj/item/mecha_parts/chassis/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/mecha_parts/chassis/attackby(obj/item/W, mob/user, params) if(!construct || !construct.action(W, user)) ..() return diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index fa7d79e6113..6e72db4a2f8 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -11,7 +11,7 @@ step_energy_drain = 6 var/builtin_hud_user = 0 -/obj/mecha/medical/odysseus/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/medical/odysseus/moved_inside(mob/living/carbon/human/H) if(..()) if(H.glasses && istype(H.glasses, /obj/item/clothing/glasses/hud)) occupant_message("Your [H.glasses] prevent you from using the built-in medical hud.") diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 78fcf6d541a..d9cbecc0159 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -47,7 +47,7 @@ src.overlays = null src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full-open") -/obj/mecha/working/ripley/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/working/ripley/moved_inside(mob/living/carbon/human/H) ..() if (src.damage_absorption["brute"] < 0.6 && src.damage_absorption["brute"] > 0.3) src.overlays = null @@ -56,7 +56,7 @@ src.overlays = null src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full") -/obj/mecha/working/ripley/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/working/ripley/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc,mob/user) ..() if (src.damage_absorption["brute"] < 0.6 && src.damage_absorption["brute"] > 0.3) src.overlays = null diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 2e688f8a415..1c00feff64c 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -357,7 +357,7 @@ status = GROWN -/obj/structure/alien/egg/proc/Burst(var/kill = 1) //drops and kills the hugger if any is remaining +/obj/structure/alien/egg/proc/Burst(kill = 1) //drops and kills the hugger if any is remaining if(status == GROWN || status == GROWING) icon_state = "egg_hatched" flick("egg_opening", src) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index a31877f27f1..a10301a8eb7 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -75,7 +75,7 @@ gravShock(A) return -/obj/effect/anomaly/grav/proc/gravShock(var/mob/A) +/obj/effect/anomaly/grav/proc/gravShock(mob/A) if(boing && isliving(A) && !A.stat) A.Weaken(2) var/atom/target = get_edge_target_turf(A, get_dir(src, get_step_away(A, src))) @@ -156,7 +156,7 @@ else O.ex_act(2) -/obj/effect/anomaly/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance) +/obj/effect/anomaly/bhole/proc/grav(r, ex_act_force, pull_chance, turf_removal_chance) for(var/t = -r, t < r, t++) affect_coord(x+t, y-r, ex_act_force, pull_chance, turf_removal_chance) affect_coord(x-t, y+r, ex_act_force, pull_chance, turf_removal_chance) @@ -164,7 +164,7 @@ affect_coord(x-r, y-t, ex_act_force, pull_chance, turf_removal_chance) return -/obj/effect/anomaly/bhole/proc/affect_coord(var/x, var/y, var/ex_act_force, var/pull_chance, var/turf_removal_chance) +/obj/effect/anomaly/bhole/proc/affect_coord(x, y, ex_act_force, pull_chance, turf_removal_chance) //Get turf at coordinate var/turf/T = locate(x, y, z) if(isnull(T)) return diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index 5778ec117d5..1d3284d671d 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -19,7 +19,7 @@ viruses = null ..() -/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(var/list/directions) +/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions) spawn (0) var/direction = pick(directions) for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index c2054cf07a0..376248156cb 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -78,7 +78,7 @@ random_icon_states = list("gibmid1", "gibmid2", "gibmid3") -/obj/effect/decal/cleanable/blood/gibs/proc/streak(var/list/directions) +/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions) spawn (0) var/direction = pick(directions) for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index d7710921b4e..da5d6e7b40b 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -11,7 +11,7 @@ icon_state = "gib1" random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7") -/obj/effect/decal/cleanable/robot_debris/proc/streak(var/list/directions) +/obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions) spawn (0) var/direction = pick(directions) for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 26835a69788..175e24f9caf 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -7,7 +7,7 @@ create_reagents(300) ..() -/obj/effect/decal/cleanable/attackby(obj/item/weapon/W as obj, mob/user as mob,) +/obj/effect/decal/cleanable/attackby(obj/item/weapon/W, mob/user,) if(istype(W, /obj/item/weapon/reagent_containers/glass) || istype(W, /obj/item/weapon/reagent_containers/food/drinks)) if(src.reagents && W.reagents) if(!src.reagents.total_volume) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 81031ea3985..bc6f9d22868 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -71,7 +71,7 @@ return spread_foam() -/obj/effect/effect/foam/proc/foam_mob(var/mob/living/L as mob) +/obj/effect/effect/foam/proc/foam_mob(mob/living/L) if(lifetime<1) return 0 if(!istype(L)) @@ -81,12 +81,12 @@ lifetime-- return 1 -/obj/effect/effect/foam/Crossed(var/atom/movable/AM) +/obj/effect/effect/foam/Crossed(atom/movable/AM) if(istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM M.slip(5, 2, src) -/obj/effect/effect/foam/metal/Crossed(var/atom/movable/AM) +/obj/effect/effect/foam/metal/Crossed(atom/movable/AM) return @@ -146,7 +146,7 @@ chemholder = null return ..() -/datum/effect/effect/system/foam_spread/set_up(amt=5, loca, var/datum/reagents/carry = null) +/datum/effect/effect/system/foam_spread/set_up(amt=5, loca, datum/reagents/carry = null) if(istype(loca, /turf/)) location = loca else @@ -155,7 +155,7 @@ amount = round(sqrt(amt / 2), 1) carry.copy_to(chemholder, carry.total_volume) -/datum/effect/effect/system/foam_spread/metal/set_up(amt=5, loca, var/datum/reagents/carry = null, var/metaltype) +/datum/effect/effect/system/foam_spread/metal/set_up(amt=5, loca, datum/reagents/carry = null, metaltype) ..() metal = metaltype @@ -224,12 +224,12 @@ qdel(src) -/obj/structure/foamedmetal/attack_paw(var/mob/user) +/obj/structure/foamedmetal/attack_paw(mob/user) attack_hand(user) return -/obj/structure/foamedmetal/attack_animal(var/mob/living/simple_animal/user) +/obj/structure/foamedmetal/attack_animal(mob/living/simple_animal/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(user.environment_smash >= 1) @@ -249,7 +249,7 @@ qdel(src) return 1 -/obj/structure/foamedmetal/attack_alien(var/mob/living/carbon/alien/humanoid/user) +/obj/structure/foamedmetal/attack_alien(mob/living/carbon/alien/humanoid/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(prob(75 - metal*25)) @@ -257,7 +257,7 @@ "You smash through the metal foam wall!") qdel(src) -/obj/structure/foamedmetal/attack_slime(var/mob/living/simple_animal/slime/user) +/obj/structure/foamedmetal/attack_slime(mob/living/simple_animal/slime/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(!user.is_adult) @@ -268,13 +268,13 @@ "You smash through the metal foam wall!") qdel(src) -/obj/structure/foamedmetal/attack_hand(var/mob/user) +/obj/structure/foamedmetal/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) user << "You hit the metal foam but bounce off it!" -/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/foamedmetal/attackby(obj/item/I, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if (istype(I, /obj/item/weapon/grab)) diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 1f447c5c1f9..91c619344a5 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -18,7 +18,7 @@ var/direction -/obj/effect/effect/smoke/proc/fade_out(var/frames = 16) +/obj/effect/effect/smoke/proc/fade_out(frames = 16) if(alpha == 0) //Handle already transparent case return if(frames == 0) @@ -55,12 +55,12 @@ steps-- return 1 -/obj/effect/effect/smoke/Crossed(mob/living/M as mob) +/obj/effect/effect/smoke/Crossed(mob/living/M) if(!istype(M)) return smoke_mob(M) -/obj/effect/effect/smoke/proc/smoke_mob(mob/living/carbon/M as mob) +/obj/effect/effect/smoke/proc/smoke_mob(mob/living/carbon/M) if(!istype(M)) return 0 if(lifetime<1) @@ -122,7 +122,7 @@ for(var/mob/living/carbon/M in range(1,src)) smoke_mob(M) -/obj/effect/effect/smoke/bad/smoke_mob(mob/living/carbon/M as mob) +/obj/effect/effect/smoke/bad/smoke_mob(mob/living/carbon/M) if(..()) M.drop_item() M.adjustOxyLoss(1) @@ -168,7 +168,7 @@ if(hit) lifetime++ //this is so the decrease from mobs hit and the natural decrease don't cumulate. -/obj/effect/effect/smoke/chem/smoke_mob(mob/living/carbon/M as mob) +/obj/effect/effect/smoke/chem/smoke_mob(mob/living/carbon/M) if(lifetime<1) return 0 if(!istype(M)) @@ -196,7 +196,7 @@ ..() return QDEL_HINT_PUTINPOOL -/datum/effect/effect/system/smoke_spread/chem/set_up(var/datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0) +/datum/effect/effect/system/smoke_spread/chem/set_up(datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0) if(n > 20) n = 20 number = n @@ -282,7 +282,7 @@ for(var/mob/living/carbon/M in range(1,src)) smoke_mob(M) -/obj/effect/effect/smoke/sleeping/smoke_mob(mob/living/carbon/M as mob) +/obj/effect/effect/smoke/sleeping/smoke_mob(mob/living/carbon/M) if(..()) if(M.internal != null || (M.wear_mask && (M.wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT))) return diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index 8eb29846fa8..36ecbb4f7a9 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -1,13 +1,13 @@ -/proc/gibs(atom/location, var/list/viruses, var/datum/dna/MobDNA) +/proc/gibs(atom/location, list/viruses, datum/dna/MobDNA) new /obj/effect/gibspawner/generic(location,viruses,MobDNA) -/proc/hgibs(atom/location, var/list/viruses, var/datum/dna/MobDNA) +/proc/hgibs(atom/location, list/viruses, datum/dna/MobDNA) new /obj/effect/gibspawner/human(location,viruses,MobDNA) -/proc/xgibs(atom/location, var/list/viruses) +/proc/xgibs(atom/location, list/viruses) new /obj/effect/gibspawner/xeno(location,viruses) -/proc/robogibs(atom/location, var/list/viruses) +/proc/robogibs(atom/location, list/viruses) new /obj/effect/gibspawner/robot(location,viruses) /obj/effect/gibspawner @@ -22,7 +22,7 @@ Gib(loc,viruses,MobDNA) -/obj/effect/gibspawner/proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null) +/obj/effect/gibspawner/proc/Gib(atom/location, list/viruses = list(), datum/dna/MobDNA = null) if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) world << "Gib list length mismatch!" return diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 02712530739..40f10b06059 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -112,7 +112,7 @@ floor = 1 return 1 -/obj/effect/glowshroom/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/effect/glowshroom/attackby(obj/item/weapon/W, mob/user, params) ..() endurance -= W.force CheckEndurance() @@ -142,7 +142,7 @@ if(endurance <= 0) qdel(src) -/obj/effect/glowshroom/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/obj/effect/glowshroom/acid_act(acidpwr, toxpwr, acid_volume) visible_message("[src] melts away!") var/obj/effect/decal/cleanable/molten_item/I = new (get_turf(src)) I.desc = "Looks like this was \an [src] some time ago." diff --git a/code/game/objects/effects/spawners/vaultspawner.dm b/code/game/objects/effects/spawners/vaultspawner.dm index 8610a6ef298..da0774c11ba 100644 --- a/code/game/objects/effects/spawners/vaultspawner.dm +++ b/code/game/objects/effects/spawners/vaultspawner.dm @@ -4,7 +4,7 @@ var/minX = 2 var/minY = 2 -/obj/effect/vaultspawner/New(turf/location as turf,lX = minX,uX = maxX,lY = minY,uY = maxY,var/type = null) +/obj/effect/vaultspawner/New(turf/location,lX = minX,uX = maxX,lY = minY,uY = maxY,type = null) if(!type) type = pick("sandstone","rock","alien") diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 50ebfc1f37a..8bb707f38d7 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -20,7 +20,7 @@ qdel(src) return -/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user, params) +/obj/effect/spider/attackby(obj/item/weapon/W, mob/user, params) if(W.attack_verb.len) visible_message("[user] has [pick(W.attack_verb)] \the [src] with \the [W]!") else @@ -38,7 +38,7 @@ health -= damage healthcheck() -/obj/effect/spider/bullet_act(var/obj/item/projectile/Proj) +/obj/effect/spider/bullet_act(obj/item/projectile/Proj) ..() health -= Proj.damage healthcheck() diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 8eb07b6a4d4..3c44d6e1454 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -7,7 +7,7 @@ invisibility = 101 // nope cant see this shit anchored = 1 -/obj/effect/step_trigger/proc/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/proc/Trigger(atom/movable/A) return 0 /obj/effect/step_trigger/Crossed(H as mob|obj) @@ -26,7 +26,7 @@ var/message //the message to give to the mob var/once = 1 -/obj/effect/step_trigger/message/Trigger(mob/M as mob) +/obj/effect/step_trigger/message/Trigger(mob/M) if(M.client) M << "[message]" if(once) @@ -43,7 +43,7 @@ var/nostop = 0 // if 1: will only be stopped by teleporters var/list/affecting = list() -/obj/effect/step_trigger/thrower/Trigger(var/atom/A) +/obj/effect/step_trigger/thrower/Trigger(atom/A) if(!A || !istype(A, /atom/movable)) return var/atom/movable/AM = A @@ -106,7 +106,7 @@ var/teleport_y = 0 var/teleport_z = 0 -/obj/effect/step_trigger/teleporter/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/teleporter/Trigger(atom/movable/A) if(teleport_x && teleport_y && teleport_z) A.x = teleport_x @@ -120,7 +120,7 @@ var/teleport_y_offset = 0 var/teleport_z_offset = 0 -/obj/effect/step_trigger/teleporter/random/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/teleporter/random/Trigger(atom/movable/A) if(teleport_x && teleport_y && teleport_z) if(teleport_x_offset && teleport_y_offset && teleport_z_offset) @@ -139,7 +139,7 @@ var/entersmoke = 0 var/exitsmoke = 0 -/obj/effect/step_trigger/teleport_fancy/Trigger(mob/M as mob) +/obj/effect/step_trigger/teleport_fancy/Trigger(mob/M) var/dest = locate(locationx, locationy, z) M.Move(dest) @@ -176,7 +176,7 @@ var/triggerer_only = 0 //Whether the triggerer is the only person who hears this -/obj/effect/step_trigger/sound_effect/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/sound_effect/Trigger(atom/movable/A) var/turf/T = get_turf(A) if(!T) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 3a7095a29a4..f49a67e701a 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -1,12 +1,12 @@ //TODO: Flash range does nothing currently //A very crude linear approximatiaon of pythagoras theorem. -/proc/cheap_pythag(var/dx, var/dy) +/proc/cheap_pythag(dx, dy) dx = abs(dx); dy = abs(dy); if(dx>=dy) return dx + (0.5*dy) //The longest side add half the shortest side approximates the hypotenuse else return dy + (0.5*dx) -/proc/trange(var/Dist=0,var/turf/Center=null)//alternative to range (ONLY processes turfs and thus less intensive) +/proc/trange(Dist=0,turf/Center=null)//alternative to range (ONLY processes turfs and thus less intensive) if(Center==null) return //var/x1=((Center.x-Dist)<1 ? 1 : Center.x-Dist) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dbe7dcc852f..5091d4dda07 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -158,7 +158,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s user << "[pronoun] a [size] item." //e.g. They are a small item. or It is a bulky item. -/obj/item/attack_hand(mob/user as mob) +/obj/item/attack_hand(mob/user) if (!user) return if(burn_state == 1) @@ -195,7 +195,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s return -/obj/item/attack_paw(mob/user as mob) +/obj/item/attack_paw(mob/user) if (istype(src.loc, /obj/item/weapon/storage)) for(var/mob/M in range(1, src.loc)) @@ -215,7 +215,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s return -/obj/item/attack_alien(mob/user as mob) +/obj/item/attack_alien(mob/user) var/mob/living/carbon/alien/A = user if(!A.has_fine_manipulation) @@ -225,7 +225,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s return attack_paw(A) -/obj/item/attack_ai(mob/user as mob) +/obj/item/attack_ai(mob/user) if (istype(src.loc, /obj/item/weapon/robot_module)) //If the item is part of a cyborg module, equip it if(!isrobot(user)) return @@ -235,7 +235,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s // Due to storage type consolidation this should get used more now. // I have cleaned it up a little, but it could probably use more. -Sayu -/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/storage)) var/obj/item/weapon/storage/S = W if(S.use_to_pickup) @@ -275,7 +275,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s /obj/item/proc/talk_into(mob/M, input, channel, spans) return -/obj/item/proc/dropped(mob/user as mob) +/obj/item/proc/dropped(mob/user) ..() // called just as an item is picked up (loc is not yet changed) @@ -283,15 +283,15 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s return // called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called. -/obj/item/proc/on_exit_storage(obj/item/weapon/storage/S as obj) +/obj/item/proc/on_exit_storage(obj/item/weapon/storage/S) return // called when this item is added into a storage item, which is passed on as S. The loc variable is already set to the storage item. -/obj/item/proc/on_enter_storage(obj/item/weapon/storage/S as obj) +/obj/item/proc/on_enter_storage(obj/item/weapon/storage/S) return // called when "found" in pockets and storage items. Returns 1 if the search should end. -/obj/item/proc/on_found(mob/finder as mob) +/obj/item/proc/on_found(mob/finder) return // called after an item is placed in an equipment slot @@ -344,7 +344,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s /obj/item/proc/IsReflect(var/def_zone) //This proc determines if and at what% an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit return 0 -/obj/item/proc/eyestab(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/proc/eyestab(mob/living/carbon/M, mob/living/carbon/user) var/is_human_victim = 0 if(ishuman(M)) @@ -438,7 +438,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s throw_at(S,14,3) else ..() -/obj/item/acid_act(var/acidpwr, var/acid_volume) +/obj/item/acid_act(acidpwr, acid_volume) . = 1 if(unacidable) return diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index be9e287bb22..ad5036b53ee 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -7,7 +7,7 @@ icon_state = "apc_frame" flags = CONDUCT -/obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/apc_frame/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index f18a053d9ba..c17f3862e62 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -21,7 +21,7 @@ var/const/ROOM_ERR_TOOLARGE = -2 -/obj/item/areaeditor/attack_self(mob/user as mob) +/obj/item/areaeditor/attack_self(mob/user) add_fingerprint(user) var/text = "[src] \

[station_name()] [src.name]

\ @@ -54,7 +54,7 @@ w_class = 1 -/obj/item/areaeditor/permit/attack_self(mob/user as mob) +/obj/item/areaeditor/permit/attack_self(mob/user) . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) @@ -80,7 +80,7 @@ fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage." -/obj/item/areaeditor/blueprints/attack_self(mob/user as mob) +/obj/item/areaeditor/blueprints/attack_self(mob/user) . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) @@ -108,7 +108,7 @@ return A -/obj/item/areaeditor/proc/get_area_type(var/area/A = get_area()) +/obj/item/areaeditor/proc/get_area_type(area/A = get_area()) if (istype(A,/area/space)) return AREA_SPACE var/list/SPECIALS = list( @@ -166,7 +166,7 @@ return 1 -/obj/item/areaeditor/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A) +/obj/item/areaeditor/proc/move_turfs_to_area(list/turf/turfs, area/A) A.contents.Add(turfs) @@ -187,7 +187,7 @@ return -/obj/item/areaeditor/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle) +/obj/item/areaeditor/proc/set_area_machinery_title(area/A,title,oldtitle) if (!oldtitle) // or replacetext goes to infinite loop return for(var/area/RA in A.related) @@ -204,7 +204,7 @@ //TODO: much much more. Unnamed airlocks, cameras, etc. -/obj/item/areaeditor/proc/check_tile_is_border(var/turf/T2,var/dir) +/obj/item/areaeditor/proc/check_tile_is_border(turf/T2,dir) if (istype(T2, /turf/space)) return BORDER_SPACE //omg hull breach we all going to die here if (get_area_type(T2.loc)!=AREA_SPACE) @@ -230,7 +230,7 @@ return BORDER_NONE -/obj/item/areaeditor/proc/detect_room(var/turf/first) +/obj/item/areaeditor/proc/detect_room(turf/first) var/list/turf/found = new var/list/turf/pending = list(first) while(pending.len) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 276d614a9ad..785ffcec6a6 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -22,7 +22,7 @@ icon_state = "candle[i][lit ? "_lit" : ""]" -/obj/item/candle/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/candle/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W @@ -76,7 +76,7 @@ T.hotspot_expose(700, 5) -/obj/item/candle/attack_self(mob/user as mob) +/obj/item/candle/attack_self(mob/user) if(lit) lit = 0 update_icon() diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 4acf4157c75..ce5a102d2fd 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -40,10 +40,10 @@ colourName = "mime" uses = -1 -/obj/item/toy/crayon/mime/attack_self(mob/living/user as mob) +/obj/item/toy/crayon/mime/attack_self(mob/living/user) update_window(user) -/obj/item/toy/crayon/mime/update_window(mob/living/user as mob) +/obj/item/toy/crayon/mime/update_window(mob/living/user) dat += "
   Change color
" ..() @@ -65,10 +65,10 @@ colourName = "rainbow" uses = -1 -/obj/item/toy/crayon/rainbow/attack_self(mob/living/user as mob) +/obj/item/toy/crayon/rainbow/attack_self(mob/living/user) update_window(user) -/obj/item/toy/crayon/rainbow/update_window(mob/living/user as mob) +/obj/item/toy/crayon/rainbow/update_window(mob/living/user) dat += "
   Change color
" ..() @@ -112,7 +112,7 @@ for(var/obj/item/toy/crayon/crayon in contents) overlays += image('icons/obj/crayons.dmi',crayon.colourName) -/obj/item/weapon/storage/crayons/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/crayons/attackby(obj/item/W, mob/user, params) if(istype(W,/obj/item/toy/crayon)) switch(W:colourName) if("mime") @@ -147,7 +147,7 @@ else user << "It is empty." -/obj/item/toy/crayon/spraycan/attack_self(mob/living/user as mob) +/obj/item/toy/crayon/spraycan/attack_self(mob/living/user) var/choice = input(user,"Spraycan options") as null|anything in list("Toggle Cap","Change Drawing","Change Color") switch(choice) if("Toggle Cap") @@ -161,7 +161,7 @@ colour = input(user,"Choose Color") as color update_icon() -/obj/item/toy/crayon/spraycan/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/toy/crayon/spraycan/afterattack(atom/target, mob/user, proximity) if(!proximity) return if(capped) diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index f5ec0d9db5d..6e059de760e 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -9,7 +9,7 @@ var/owned = 1 // Boolean, no owner to begin with // Attack self -/obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user as mob) +/obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user) src.add_fingerprint(user) // Anyone can add their fingerprints to it with this if(owned) user << "[src] stares up at you with friendly eyes." diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 6ef0a3fa4f8..89f7603d77d 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -203,7 +203,7 @@ var/global/list/obj/item/device/pda/PDAs = list() noreturn = 1 detonate = 0 -/obj/item/device/pda/ai/attack_self(mob/user as mob) +/obj/item/device/pda/ai/attack_self(mob/user) if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) @@ -258,14 +258,14 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/GetID() return id -/obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location) +/obj/item/device/pda/MouseDrop(obj/over_object, src_location, over_location) var/mob/M = usr if((!istype(over_object, /obj/screen)) && can_use(M)) return attack_self(M) return //NOTE: graphic resources are loaded on client login -/obj/item/device/pda/attack_self(mob/user as mob) +/obj/item/device/pda/attack_self(mob/user) user.set_machine(src) @@ -767,7 +767,7 @@ var/global/list/obj/item/device/pda/PDAs = list() id.loc = get_turf(src) id = null -/obj/item/device/pda/proc/msg_input(var/mob/living/U = usr) +/obj/item/device/pda/proc/msg_input(mob/living/U = usr) var/t = stripped_input(U, "Please enter message", name, null, MAX_MESSAGE_LEN) if (!t || toff) return @@ -779,7 +779,7 @@ var/global/list/obj/item/device/pda/PDAs = list() t = Gibberish(t, 100) return t -/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P) +/obj/item/device/pda/proc/create_message(mob/living/U = usr, obj/item/device/pda/P) var/t = msg_input(U) @@ -902,7 +902,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else usr << "You cannot do that while restrained!" -/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. +/obj/item/device/pda/proc/id_check(mob/user, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. if(choice == 1) if (id) remove_id() @@ -925,7 +925,7 @@ var/global/list/obj/item/device/pda/PDAs = list() return 1 // access to status display signals -/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob, params) +/obj/item/device/pda/attackby(obj/item/C, mob/user, params) ..() if(istype(C, /obj/item/weapon/cartridge) && !cartridge) cartridge = C @@ -978,7 +978,7 @@ var/global/list/obj/item/device/pda/PDAs = list() user << "You scan \the [C]." return -/obj/item/device/pda/attack(mob/living/carbon/C, mob/living/user as mob) +/obj/item/device/pda/attack(mob/living/carbon/C, mob/living/user) if(istype(C)) switch(scanmode) @@ -999,7 +999,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else user.show_message("No radiation detected.") -/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) if(!proximity) return switch(scanmode) @@ -1078,7 +1078,7 @@ var/global/list/obj/item/device/pda/PDAs = list() //AI verb and proc for sending PDA messages. -/mob/living/silicon/ai/proc/cmd_send_pdamesg(mob/user as mob) +/mob/living/silicon/ai/proc/cmd_send_pdamesg(mob/user) var/list/names = list() var/list/plist = list() var/list/namecounts = list() @@ -1159,7 +1159,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else usr << "You do not have a PDA. You should make an issue report about this." -/mob/living/silicon/ai/proc/cmd_show_message_log(mob/user as mob) +/mob/living/silicon/ai/proc/cmd_show_message_log(mob/user) if(user.stat == 2) user << "You can't do that because you are dead!" return diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 64196a74bd4..90c2ad2c5a7 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -234,7 +234,7 @@ print_to_host(menu) return -/obj/item/weapon/cartridge/proc/print_to_host(var/text) +/obj/item/weapon/cartridge/proc/print_to_host(text) if (!istype(loc, /obj/item/device/pda)) return loc:cart = text @@ -245,7 +245,7 @@ return -/obj/item/weapon/cartridge/proc/post_status(var/command, var/data1, var/data2) +/obj/item/weapon/cartridge/proc/post_status(command, data1, data2) var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index b91db4b5e30..9f8e79da8ea 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -62,16 +62,16 @@ ..() -/obj/item/device/camera_bug/interact(var/mob/user = usr) +/obj/item/device/camera_bug/interact(mob/user = usr) var/datum/browser/popup = new(user, "camerabug","Camera Bug",nref=src) popup.set_content(menu(get_cameras())) popup.open() -/obj/item/device/camera_bug/attack_self(mob/user as mob) +/obj/item/device/camera_bug/attack_self(mob/user) user.set_machine(src) interact(user) -/obj/item/device/camera_bug/check_eye(var/mob/user as mob) +/obj/item/device/camera_bug/check_eye(mob/user) if (user.stat || loc != user || !user.canmove || user.eye_blind || !current) user.reset_view(null) user.unset_machine() @@ -108,7 +108,7 @@ return bugged_cameras -/obj/item/device/camera_bug/proc/menu(var/list/cameras) +/obj/item/device/camera_bug/proc/menu(list/cameras) if(!cameras || !cameras.len) return "No bugged cameras found." @@ -209,7 +209,7 @@ else return "Camera Offline
" -/obj/item/device/camera_bug/Topic(var/href,var/list/href_list) +/obj/item/device/camera_bug/Topic(href,list/href_list) if(usr != loc) usr.unset_machine() usr.reset_view(null) @@ -309,7 +309,7 @@ break src.updateSelfDialog() -/obj/item/device/camera_bug/attackby(var/obj/item/W as obj,var/mob/living/user as mob, params) +/obj/item/device/camera_bug/attackby(obj/item/W,mob/living/user, params) if(istype(W,/obj/item/weapon/screwdriver) && expansion) expansion.loc = get_turf(loc) user << "You unscrew [expansion]." diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index f7b754a93d5..9302f773829 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -65,7 +65,7 @@ spawn(8) qdel(T) -/obj/item/device/chameleon/proc/disrupt(var/delete_dummy = 1) +/obj/item/device/chameleon/proc/disrupt(delete_dummy = 1) if(active_dummy) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) @@ -93,7 +93,7 @@ var/can_move = 1 var/obj/item/device/chameleon/master = null -/obj/effect/dummy/chameleon/proc/activate(var/obj/O, var/mob/M, new_icon, new_iconstate, new_overlays, new_underlays, var/obj/item/device/chameleon/C) +/obj/effect/dummy/chameleon/proc/activate(obj/O, mob/M, new_icon, new_iconstate, new_overlays, new_underlays, obj/item/device/chameleon/C) name = O.name desc = O.desc icon = new_icon @@ -126,7 +126,7 @@ ..() master.disrupt() -/obj/effect/dummy/chameleon/relaymove(var/mob/user, direction) +/obj/effect/dummy/chameleon/relaymove(mob/user, direction) if(istype(loc, /turf/space) || !direction) return //No magical space movement! diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 1a7dadc9083..735e48dbf6b 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -28,7 +28,7 @@ visible_message("The [src.name] burns out!") -/obj/item/device/flash/proc/flash_recharge(var/interval=10) +/obj/item/device/flash/proc/flash_recharge(interval=10) if(prob(times_used * 3)) //The more often it's used in a short span of time the more likely it will burn out burn_out() return 0 @@ -41,7 +41,7 @@ times_used = max(0, times_used) //sanity return 1 -/obj/item/device/flash/proc/try_use_flash(var/mob/user = null) +/obj/item/device/flash/proc/try_use_flash(mob/user = null) flash_recharge(10) if(broken) @@ -57,7 +57,7 @@ return 1 -/obj/item/device/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1) +/obj/item/device/flash/proc/flash_carbon(mob/living/carbon/M, mob/user = null, power = 5, targeted = 1) add_logs(user, M, "flashed", src) if(user && targeted) if(M.weakeyes) @@ -115,7 +115,7 @@ ..() -/obj/item/device/flash/proc/terrible_conversion_proc(var/mob/M, var/mob/user) +/obj/item/device/flash/proc/terrible_conversion_proc(mob/M, mob/user) if(ishuman(M) && ishuman(user) && M.stat != DEAD) if(user.mind && (user.mind in ticker.mode.head_revolutionaries)) if(M.client) @@ -150,7 +150,7 @@ ..() cyborg_flash_animation(user) -/obj/item/device/flash/cyborg/proc/cyborg_flash_animation(var/mob/living/user) +/obj/item/device/flash/cyborg/proc/cyborg_flash_animation(mob/living/user) var/atom/movable/overlay/animation = new(user.loc) animation.layer = user.layer + 1 animation.icon_state = "blank" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index d8dce87fbab..b929937aa8b 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -21,7 +21,7 @@ icon_state = initial(icon_state) SetLuminosity(0) -/obj/item/device/flashlight/proc/update_brightness(var/mob/user = null) +/obj/item/device/flashlight/proc/update_brightness(mob/user = null) if(on) icon_state = "[initial(icon_state)]-on" if(loc == user) @@ -44,7 +44,7 @@ return 1 -/obj/item/device/flashlight/attack(mob/living/carbon/human/M as mob, mob/living/carbon/human/user as mob) +/obj/item/device/flashlight/attack(mob/living/carbon/human/M, mob/living/carbon/human/user) add_fingerprint(user) if(on && user.zone_sel.selecting == "eyes") @@ -119,7 +119,7 @@ return ..() -/obj/item/device/flashlight/pen/proc/CreateHolo(var/tturf,var/creator) +/obj/item/device/flashlight/pen/proc/CreateHolo(tturf,creator) var/obj/effect/medical_holosign/M = new /obj/effect/medical_holosign(tturf) M.visible_message("[creator] created a medical hologram!") holo_cooldown = 1 @@ -225,7 +225,7 @@ obj/item/device/flashlight/lamp/bananalamp else update_brightness(null) -/obj/item/device/flashlight/flare/update_brightness(var/mob/user = null) +/obj/item/device/flashlight/flare/update_brightness(mob/user = null) ..() if(on) item_state = "[initial(item_state)]-on" @@ -300,7 +300,7 @@ obj/item/device/flashlight/lamp/bananalamp emp_cur_charges = min(emp_cur_charges+1, emp_max_charges) return 1 -/obj/item/device/flashlight/emp/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/device/flashlight/emp/attack(mob/living/M, mob/living/user) if(on && user.zone_sel.selecting == "eyes") // call original attack proc only if aiming at the eyes ..() return diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index dcfaceeffc3..a5bcb581ba4 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -20,13 +20,13 @@ song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded ..() -/obj/item/device/instrument/attack_self(mob/user as mob) +/obj/item/device/instrument/attack_self(mob/user) if(!user.IsAdvancedToolUser()) user << "You don't have the dexterity to do this!" return 1 interact(user) -/obj/item/device/instrument/interact(mob/user as mob) +/obj/item/device/instrument/interact(mob/user) if(!user) return diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 4c805b9f8c4..ad8574211f8 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -64,12 +64,12 @@ ..() return -/obj/item/device/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/device/laser_pointer/afterattack(atom/target, mob/living/user, flag, params) if(flag) //we're placing the object on a table or in backpack return laser_act(target, user) -/obj/item/device/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user) +/obj/item/device/laser_pointer/proc/laser_act(atom/target, mob/living/user) if( !(user in (viewers(7,target))) ) return if (!diode) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index a440715d7a7..e722223bc6a 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -117,14 +117,14 @@ icon_state = "lightreplacer[emagged]" -/obj/item/device/lightreplacer/proc/Use(var/mob/user) +/obj/item/device/lightreplacer/proc/Use(mob/user) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) AddUses(-1) return 1 // Negative numbers will subtract -/obj/item/device/lightreplacer/proc/AddUses(var/amount = 1) +/obj/item/device/lightreplacer/proc/AddUses(amount = 1) uses = min(max(uses + amount, 0), max_uses) /obj/item/device/lightreplacer/proc/Charge(var/mob/user) @@ -133,7 +133,7 @@ AddUses(1) charge = 1 -/obj/item/device/lightreplacer/proc/ReplaceLight(var/obj/machinery/light/target, var/mob/living/U) +/obj/item/device/lightreplacer/proc/ReplaceLight(obj/machinery/light/target, mob/living/U) if(target.status != LIGHT_OK) if(CanUse(U)) @@ -185,7 +185,7 @@ //Can you use it? -/obj/item/device/lightreplacer/proc/CanUse(var/mob/living/user) +/obj/item/device/lightreplacer/proc/CanUse(mob/living/user) src.add_fingerprint(user) //Not sure what else to check for. Maybe if clumsy? if(uses > 0) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 3b307fc00cf..4c4f156d961 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -12,7 +12,7 @@ var/insults = 0 var/list/insultmsg = list("FUCK EVERYONE!", "DEATH TO LIZARDS!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!", "VIVA!", "HONK!") -/obj/item/device/megaphone/attack_self(mob/living/carbon/human/user as mob) +/obj/item/device/megaphone/attack_self(mob/living/carbon/human/user) if(user.client) if(user.client.prefs.muted & MUTE_IC) src << "You cannot speak in IC (muted)." diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index e7aa20945cb..e563aefc3a8 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -112,7 +112,7 @@ src.overlays.Cut() src.overlays += "pai-off" -/obj/item/device/paicard/proc/setEmotion(var/emotion) +/obj/item/device/paicard/proc/setEmotion(emotion) if(pai) src.overlays.Cut() switch(emotion) diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 50cb9c00d51..a90c1a7d753 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -17,7 +17,7 @@ materials = list(MAT_METAL=5000, MAT_GLASS=2000) -/obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob, proximity_flag) +/obj/item/device/pipe_painter/afterattack(atom/A, mob/user, proximity_flag) //Make sure we only paint adjacent items if(proximity_flag!= 1) return @@ -32,7 +32,7 @@ user.visible_message("[user] paints \the [P] [mode].","You paint \the [P] [mode].") P.update_node_icon() //updates the neighbors -/obj/item/device/pipe_painter/attack_self(mob/user as mob) +/obj/item/device/pipe_painter/attack_self(mob/user) mode = input("Which colour do you want to use?","Pipe painter") in modes /obj/item/device/pipe_painter/examine() diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index a77f96f1e9b..6ef61b2b75d 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -68,7 +68,7 @@ explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb qdel(src) -/obj/item/device/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/device/pizza_bomb/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wirecutters) && primed) user << "Oh God, what wire do you cut?!" var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index c25720d0e04..5d182e268ab 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -54,7 +54,7 @@ update_icon() SetLuminosity(0) -/obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/device/powersink/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) if(mode == DISCONNECTED) var/turf/T = loc @@ -85,7 +85,7 @@ /obj/item/device/powersink/attack_ai() return -/obj/item/device/powersink/attack_hand(var/mob/user) +/obj/item/device/powersink/attack_hand(mob/user) switch(mode) if(DISCONNECTED) ..() diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 4192e63e7b1..ce51646f6aa 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -30,7 +30,7 @@ return ..() -/obj/item/device/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/electropack/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/clothing/head/helmet)) var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 55fa4cd6179..bcd048add04 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -14,7 +14,7 @@ /obj/item/device/encryptionkey/New() -/obj/item/device/encryptionkey/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/encryptionkey/attackby(obj/item/weapon/W, mob/user, params) /obj/item/device/encryptionkey/syndicate icon_state = "cypherkey" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 2a32fdaec83..e0c98ef93e8 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -27,7 +27,7 @@ return ..() -/obj/item/device/radio/headset/receive_range(freq, level, var/AIuser) +/obj/item/device/radio/headset/receive_range(freq, level, AIuser) if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc if(H.ears == src) @@ -211,7 +211,7 @@ /obj/item/device/radio/headset/ai/receive_range(freq, level) return ..(freq, level, 1) -/obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/radio/headset/attackby(obj/item/weapon/W, mob/user, params) // ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 195ba80422d..92d7973dc72 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -18,16 +18,16 @@ SSobj.processing -= src ..() -/obj/item/device/radio/intercom/attack_ai(mob/user as mob) +/obj/item/device/radio/intercom/attack_ai(mob/user) src.add_fingerprint(user) spawn (0) attack_self(user) -/obj/item/device/radio/intercom/attack_paw(mob/user as mob) +/obj/item/device/radio/intercom/attack_paw(mob/user) return src.attack_hand(user) -/obj/item/device/radio/intercom/attack_hand(mob/user as mob) +/obj/item/device/radio/intercom/attack_hand(mob/user) src.add_fingerprint(user) spawn (0) attack_self(user) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index dab4f3b087d..7f5388adda0 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -95,7 +95,7 @@ remove_radio_all(src) //Just to be sure ..() -/obj/item/device/radio/MouseDrop(obj/over_object as obj, src_location, over_location) +/obj/item/device/radio/MouseDrop(obj/over_object, src_location, over_location) var/mob/M = usr if((!istype(over_object, /obj/screen)) && src.loc == M) return attack_self(M) @@ -117,11 +117,11 @@ secure_radio_connections[ch_name] = add_radio(src, radiochannels[ch_name]) -/obj/item/device/radio/attack_self(mob/user as mob) +/obj/item/device/radio/attack_self(mob/user) user.set_machine(src) interact(user) -/obj/item/device/radio/interact(mob/user as mob) +/obj/item/device/radio/interact(mob/user) if(!on) return @@ -166,7 +166,7 @@ return -/obj/item/device/radio/proc/text_sec_channel(var/chan_name, var/chan_stat) +/obj/item/device/radio/proc/text_sec_channel(chan_name, chan_stat) var/list = !!(chan_stat&FREQ_LISTENING)!=0 return {" [chan_name]: [list ? "Engaged" : "Disengaged"]
@@ -215,7 +215,7 @@ updateDialog() add_fingerprint(usr) -/obj/item/device/radio/proc/isWireCut(var/index) +/obj/item/device/radio/proc/isWireCut(index) return wires.IsIndexCut(index) /obj/item/device/radio/talk_into(atom/movable/M, message, channel, list/spans) @@ -526,7 +526,7 @@ else user << "[name] can not be modified or attached." -/obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/radio/attackby(obj/item/weapon/W, mob/user, params) ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) )) @@ -574,7 +574,7 @@ ..() set_frequency(SYND_FREQ) -/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/radio/borg/attackby(obj/item/weapon/W, mob/user, params) // ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) @@ -628,7 +628,7 @@ usr << "Subspace Transmission is [(subspace_transmission) ? "enabled" : "disabled"]" ..() -/obj/item/device/radio/borg/interact(mob/user as mob) +/obj/item/device/radio/borg/interact(mob/user) if(!on) return diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index e6be6720a4b..12e6db99f6e 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -86,7 +86,7 @@ MASS SPECTROMETER user << "You switch the health analyzer to check physical health." scanchems = 0 return -/obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/carbon/human/user as mob) +/obj/item/device/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user) // Clumsiness/brain damage check if ((user.disabilities & CLUMSY || user.getBrainLoss() >= 60) && prob(50)) @@ -109,7 +109,7 @@ MASS SPECTROMETER return // Used by the PDA medical scanner too -/proc/healthscan(var/mob/living/user, var/mob/living/M, var/mode = 1) +/proc/healthscan(mob/living/user, mob/living/M, mode = 1) //Damage specifics var/oxy_loss = M.getOxyLoss() @@ -198,7 +198,7 @@ MASS SPECTROMETER user.show_message("Detected cybernetic modifications:") user.show_message("[implant_detect]") -/proc/chemscan(var/mob/living/user, var/mob/living/M) +/proc/chemscan(mob/living/user, mob/living/M) if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.reagents) @@ -244,7 +244,7 @@ MASS SPECTROMETER materials = list(MAT_METAL=30, MAT_GLASS=20) origin_tech = "magnets=1;engineering=1" -/obj/item/device/analyzer/attack_self(mob/user as mob) +/obj/item/device/analyzer/attack_self(mob/user) if (user.stat) return @@ -322,7 +322,7 @@ MASS SPECTROMETER else icon_state = initial(icon_state) -/obj/item/device/mass_spectrometer/attack_self(mob/user as mob) +/obj/item/device/mass_spectrometer/attack_self(mob/user) if (user.stat) return if (crit_fail) @@ -383,7 +383,7 @@ MASS SPECTROMETER throw_range = 7 materials = list(MAT_METAL=30, MAT_GLASS=20) -/obj/item/device/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/device/slime_scanner/attack(mob/living/M, mob/living/user) if (!isslime(M)) user.show_message("This device can only scan slimes!", 1) return diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm index 9d4bbc60b43..2b27a7c3214 100644 --- a/code/game/objects/items/devices/sensor_device.dm +++ b/code/game/objects/items/devices/sensor_device.dm @@ -7,5 +7,5 @@ slot_flags = SLOT_BELT origin_tech = "programming=3;materials=3;magnets=3" -/obj/item/device/sensor_device/attack_self(mob/user as mob) +/obj/item/device/sensor_device/attack_self(mob/user) crewmonitor.show(user) //Proc already exists, just had to call it diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 95d237b8618..65fd7ad4ef2 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -31,7 +31,7 @@ effective or pretty fucking useless. var/max_uses = 2 -/obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) +/obj/item/device/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) user << "The mind batterer has been burnt out!" @@ -86,7 +86,7 @@ effective or pretty fucking useless. var/wavelength = 10 // time it takes for the radiation to kick in, in seconds var/used = 0 // is it cooling down? -/obj/item/device/rad_laser/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/device/rad_laser/attack(mob/living/M, mob/living/user) if(!used) add_logs(user, M, "irradiated", src) user.visible_message("[user] has analyzed [M]'s vitals.") @@ -102,16 +102,16 @@ effective or pretty fucking useless. else user << "The radioactive microlaser is still recharging." -/obj/item/device/rad_laser/proc/handle_cooldown(var/cooldown) +/obj/item/device/rad_laser/proc/handle_cooldown(cooldown) spawn(cooldown) used = 0 icon_state = "health" -/obj/item/device/rad_laser/attack_self(mob/user as mob) +/obj/item/device/rad_laser/attack_self(mob/user) ..() interact(user) -/obj/item/device/rad_laser/interact(mob/user as mob) +/obj/item/device/rad_laser/interact(mob/user) user.set_machine(src) var/cooldown = round(max(10,((intensity*8)-(wavelength/2))+(intensity*2))) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 26ce55dca8a..f1cb0adb9db 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -64,7 +64,7 @@ if(!attached_device) return attached_device.HasProximity(AM) return -/obj/item/device/transfer_valve/attack_self(mob/user as mob) +/obj/item/device/transfer_valve/attack_self(mob/user) user.set_machine(src) var/dat = {" Valve properties:
Attachment one: [tank_one] [tank_one ? "Remove" : ""] @@ -114,7 +114,7 @@ return return -/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D) +/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D) if(toggle) toggle = 0 toggle_valve() diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 3807998cbc9..64110a33877 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -146,7 +146,7 @@ var/list/world_uplinks = list() active = !active // Directly trigger the uplink. Turn on if it isn't already. -/obj/item/device/uplink/hidden/proc/trigger(mob/user as mob) +/obj/item/device/uplink/hidden/proc/trigger(mob/user) if(!active) toggle() interact(user) @@ -154,7 +154,7 @@ var/list/world_uplinks = list() // Checks to see if the value meets the target. Like a frequency being a traitor_frequency, in order to unlock a headset. // If true, it accesses trigger() and returns 1. If it fails, it returns false. Use this to see if you need to close the // current item's menu. -/obj/item/device/uplink/hidden/proc/check_trigger(mob/user as mob, var/value, var/target) +/obj/item/device/uplink/hidden/proc/check_trigger(mob/user, value, target) if(value == target) trigger(user) return 1 @@ -172,7 +172,7 @@ var/list/world_uplinks = list() return 1 return 0 //Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it) -/obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/radio/uplink/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/antag_spawner/borg_tele)) var/obj/item/weapon/antag_spawner/borg_tele/S = W if(!S.used) @@ -192,14 +192,14 @@ var/list/world_uplinks = list() hidden_uplink = new(src) icon_state = "radio" -/obj/item/device/radio/uplink/attack_self(mob/user as mob) +/obj/item/device/radio/uplink/attack_self(mob/user) if(hidden_uplink) hidden_uplink.trigger(user) /obj/item/device/multitool/uplink/New() hidden_uplink = new(src) -/obj/item/device/multitool/uplink/attack_self(mob/user as mob) +/obj/item/device/multitool/uplink/attack_self(mob/user) if(hidden_uplink) hidden_uplink.trigger(user) diff --git a/code/game/objects/items/holotape.dm b/code/game/objects/items/holotape.dm index 309d52c52a0..10cd8e08d6c 100644 --- a/code/game/objects/items/holotape.dm +++ b/code/game/objects/items/holotape.dm @@ -55,7 +55,7 @@ start = null return -/obj/item/tapeproj/attack_self(var/mob/user) +/obj/item/tapeproj/attack_self(mob/user) if(charging) usr << "[src] is recharging!" return @@ -152,7 +152,7 @@ spawn(40) charging = 0 -/obj/item/holotape/Bumped(var/mob/M) +/obj/item/holotape/Bumped(mob/M) if(!ismob(M)) return if(iscarbon(M)) @@ -197,7 +197,7 @@ /obj/item/holotape/attack_paw(mob/living/user) attack_hand(user) -/obj/item/holotape/bullet_act(var/obj/item/projectile/Proj) +/obj/item/holotape/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage ..() @@ -205,7 +205,7 @@ breaktape() return -/obj/item/holotape/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/holotape/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) add_fingerprint(user) health -= W.force * 0.3 diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 3c6bdb3b5b4..80ef75d797d 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -11,7 +11,7 @@ var/state var/datum/gas_mixture/air_contents = null -/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank, mob/user as mob) +/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank, mob/user) if (icon_state == "latexballon_bursted") return icon_state = "latexballon_blow" @@ -50,7 +50,7 @@ burst() return -/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/latexballon/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/tank)) var/obj/item/weapon/tank/T = W blow(T, user) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 231970a65e8..607060233b7 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -9,7 +9,7 @@ icon = 'icons/mob/robot_items.dmi' icon_state = "elecarm" -/obj/item/borg/stun/attack(mob/M as mob, mob/living/silicon/robot/user as mob) +/obj/item/borg/stun/attack(mob/M, mob/living/silicon/robot/user) user.cell.charge -= 30 diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index b8dc0085e81..213dab28ded 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -85,7 +85,7 @@ return 1 return 0 -/obj/item/robot_parts/robot_suit/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/robot_parts/robot_suit/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/stack/sheet/metal) && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head) var/obj/item/stack/sheet/metal/M = W @@ -303,7 +303,7 @@ Interact(usr) return -/obj/item/robot_parts/chest/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/robot_parts/chest/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/stock_parts/cell)) if(src.cell) @@ -327,7 +327,7 @@ user << "You need one length of coil to wire it!" return -/obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/robot_parts/head/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/device/flash/handheld)) var/obj/item/device/flash/handheld/F = W diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index f16ea230382..914e0939616 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -10,7 +10,7 @@ var/require_module = 0 var/installed = 0 -/obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R) if(R.stat == DEAD) usr << "[src] will not function on a deceased cyborg." return 1 @@ -23,7 +23,7 @@ icon_state = "cyborg_upgrade1" require_module = 1 -/obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/reset/action(mob/living/silicon/robot/R) if(..()) return 0 R.uneq_all() R.hands.icon_state = "nomod" @@ -45,10 +45,10 @@ icon_state = "cyborg_upgrade1" var/heldname = "default name" -/obj/item/borg/upgrade/rename/attack_self(mob/user as mob) +/obj/item/borg/upgrade/rename/attack_self(mob/user) heldname = stripped_input(user, "Enter new robot name", "Cyborg Reclassification", heldname, MAX_NAME_LEN) -/obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/rename/action(mob/living/silicon/robot/R) if(..()) return 0 R.notify_ai(3, R.name, heldname) R.name = heldname @@ -64,7 +64,7 @@ icon_state = "cyborg_upgrade1" -/obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/restart/action(mob/living/silicon/robot/R) if(R.health < 0) usr << "You have to repair the cyborg before using this module!" return 0 @@ -88,7 +88,7 @@ icon_state = "cyborg_upgrade2" require_module = 1 -/obj/item/borg/upgrade/vtec/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R) if(..()) return 0 if(R.speed == -1) @@ -105,7 +105,7 @@ require_module = 1 -/obj/item/borg/upgrade/disablercooler/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/disablercooler/action(mob/living/silicon/robot/R) if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/security)) @@ -138,7 +138,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 -/obj/item/borg/upgrade/jetpack/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/jetpack/action(mob/living/silicon/robot/R) if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) @@ -159,7 +159,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 -/obj/item/borg/upgrade/ddrill/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/ddrill/action(mob/living/silicon/robot/R) if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) @@ -181,7 +181,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 -/obj/item/borg/upgrade/soh/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R) if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) @@ -201,7 +201,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 -/obj/item/borg/upgrade/syndicate/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/syndicate/action(mob/living/silicon/robot/R) if(..()) return 0 if(R.emagged == 1) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 23e37b9f57e..7cdfe31e8fb 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -14,7 +14,7 @@ var/stop_bleeding = 0 var/self_delay = 50 -/obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) +/obj/item/stack/medical/attack(mob/living/carbon/M, mob/user) if(M.stat == 2) var/t_him = "it" diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 7296f531269..5ab56ea942b 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -33,7 +33,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ else icon_state = "rods" -/obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/stack/rods/attackby(obj/item/W, mob/user, params) if (istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 66a3cd055bc..3881915f99d 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -21,7 +21,7 @@ is_cyborg = 1 cost = 500 -/obj/item/stack/sheet/glass/attack_self(mob/user as mob) +/obj/item/stack/sheet/glass/attack_self(mob/user) construct_window(user) /obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user, params) @@ -56,7 +56,7 @@ else return ..() -/obj/item/stack/sheet/glass/proc/construct_window(mob/user as mob) +/obj/item/stack/sheet/glass/proc/construct_window(mob/user) if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) @@ -140,20 +140,20 @@ /obj/item/stack/sheet/rglass/cyborg/get_amount() return min(round(metsource.energy / metcost), round(glasource.energy / glacost)) -/obj/item/stack/sheet/rglass/cyborg/use(var/amount) // Requires special checks, because it uses two storages +/obj/item/stack/sheet/rglass/cyborg/use(amount) // Requires special checks, because it uses two storages metsource.use_charge(amount * metcost) glasource.use_charge(amount * glacost) return -/obj/item/stack/sheet/rglass/cyborg/add(var/amount) +/obj/item/stack/sheet/rglass/cyborg/add(amount) metsource.add_charge(amount * metcost) glasource.add_charge(amount * glacost) return -/obj/item/stack/sheet/rglass/attack_self(mob/user as mob) +/obj/item/stack/sheet/rglass/attack_self(mob/user) construct_window(user) -/obj/item/stack/sheet/rglass/proc/construct_window(mob/user as mob) +/obj/item/stack/sheet/rglass/proc/construct_window(mob/user) if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) @@ -325,7 +325,7 @@ qdel(src) ..() -/obj/item/weapon/shard/Crossed(var/mob/AM) +/obj/item/weapon/shard/Crossed(mob/AM) if(istype(AM)) playsound(loc, 'sound/effects/glass_step.ogg', 50, 1) if(ishuman(AM)) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index e875c6605d5..63e9d3b2f72 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -108,7 +108,7 @@ var/global/list/datum/stack_recipe/xeno_recipes = list ( \ //Step one - dehairing. -/obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W, mob/user, params) if(is_sharp(W)) playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) user.visible_message("[user] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.") diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 1992e75ab6c..eaae918b9b5 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -11,7 +11,7 @@ flags = CONDUCT max_amount = 60 -/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/stack/light_w/attackby(obj/item/O, mob/user, params) ..() if(istype(O,/obj/item/weapon/wirecutters)) var/obj/item/stack/cable_coil/CC = new (user.loc) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 3ca1e47b662..7d58a796021 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -54,10 +54,10 @@ else return (amount) -/obj/item/stack/attack_self(mob/user as mob) +/obj/item/stack/attack_self(mob/user) interact(user) -/obj/item/stack/interact(mob/user as mob) +/obj/item/stack/interact(mob/user) if (!recipes) return if (!src || get_amount() <= 0) @@ -192,14 +192,14 @@ return 1 return 0 -/obj/item/stack/proc/add(var/amount) +/obj/item/stack/proc/add(amount) if (is_cyborg) source.add_charge(amount * cost) else src.amount += amount update_icon() -/obj/item/stack/proc/add_to_stacks(mob/usr as mob) +/obj/item/stack/proc/add_to_stacks(mob/usr) var/obj/item/stack/oldsrc = src src = null for (var/obj/item/stack/item in usr.loc) @@ -215,7 +215,7 @@ break oldsrc.update_icon() -/obj/item/stack/attack_hand(mob/user as mob) +/obj/item/stack/attack_hand(mob/user) if (user.get_inactive_hand() == src) if(zero_amount()) return var/obj/item/stack/F = new src.type( user, 1) @@ -230,7 +230,7 @@ ..() return -/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/stack/attackby(obj/item/W, mob/user, params) if (istype(W, src.type)) if(zero_amount()) return diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 79d572c9cc7..3fd5252c2d6 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -25,7 +25,7 @@ else state = 0 //fine -/obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/stack/tile/light/attackby(obj/item/O, mob/user, params) ..() if(istype(O,/obj/item/weapon/crowbar)) new/obj/item/stack/sheet/metal(user.loc) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index a3d5ce84937..63b826797ef 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -16,7 +16,7 @@ var/turf_type = null var/mineralType = null -/obj/item/stack/tile/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/stack/tile/attackby(obj/item/W, mob/user, params) if (istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 232aca31cfc..0b1b452afc5 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -39,10 +39,10 @@ /obj/item/toy/balloon/New() create_reagents(10) -/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob) +/obj/item/toy/balloon/attack(mob/living/carbon/human/M, mob/user) return -/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob, proximity) +/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user, proximity) if(!proximity) return if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1) A.reagents.trans_to(src, 10) @@ -51,7 +51,7 @@ src.update_icon() return -/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params) +/obj/item/toy/balloon/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(O.reagents) if(O.reagents.total_volume < 1) @@ -131,7 +131,7 @@ ..() user << "There [bullets == 1 ? "is" : "are"] [bullets] cap\s left." -/obj/item/toy/gun/attackby(obj/item/toy/ammo/gun/A as obj, mob/user as mob, params) +/obj/item/toy/gun/attackby(obj/item/toy/ammo/gun/A, mob/user, params) if (istype(A, /obj/item/toy/ammo/gun)) if (src.bullets >= 7) @@ -152,7 +152,7 @@ return 1 return -/obj/item/toy/gun/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) +/obj/item/toy/gun/afterattack(atom/target as mob|obj|turf|area, mob/user, flag) if (flag) return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") @@ -200,7 +200,7 @@ attack_verb = list("attacked", "struck", "hit") var/hacked = 0 -/obj/item/toy/sword/attack_self(mob/user as mob) +/obj/item/toy/sword/attack_self(mob/user) active = !( active ) if (active) user << "You extend the plastic blade with a quick flick of your wrist." @@ -349,10 +349,10 @@ graffiti |= "antilizard" graffiti |= "prolizard" -/obj/item/toy/crayon/attack_self(mob/living/user as mob) +/obj/item/toy/crayon/attack_self(mob/living/user) update_window(user) -/obj/item/toy/crayon/proc/update_window(mob/living/user as mob) +/obj/item/toy/crayon/proc/update_window(mob/living/user) dat += "

Currently selected: [drawtype]


" dat += "Random letterPick letter" dat += "
" @@ -397,7 +397,7 @@ drawtype = temp update_window(usr) -/obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity) if(!proximity || !check_allowed_items(target)) return if(!uses) user << "There is no more of [src.name] left!" @@ -479,7 +479,7 @@ qdel(src) return -/obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob) +/obj/item/toy/crayon/attack(mob/M, mob/user) if(edible && (M == user)) user << "You take a bite of the [src.name]. Delicious!" user.nutrition += 5 @@ -492,7 +492,7 @@ else ..() -/obj/item/toy/crayon/proc/territory_claimed(var/area/territory,mob/user) +/obj/item/toy/crayon/proc/territory_claimed(area/territory,mob/user) var/occupying_gang for(var/datum/gang/G in ticker.mode.gangs) if(territory.type in (G.territory|G.territory_new)) @@ -552,7 +552,7 @@ var/quiet = 0 //all credit to skasi for toy mech fun ideas -/obj/item/toy/prize/attack_self(mob/user as mob) +/obj/item/toy/prize/attack_self(mob/user) if(!cooldown) user << "You play with [src]." cooldown = 1 @@ -562,7 +562,7 @@ return ..() -/obj/item/toy/prize/attack_hand(mob/user as mob) +/obj/item/toy/prize/attack_hand(mob/user) if(loc == user) if(!cooldown) user << "You play with [src]." @@ -755,7 +755,7 @@ cards += "Ace of Diamonds" -/obj/item/toy/cards/deck/attack_hand(mob/user as mob) +/obj/item/toy/cards/deck/attack_hand(mob/user) if(user.lying) return var/choice = null @@ -780,7 +780,7 @@ else if(cards.len > 1) src.icon_state = "deck_[deckstyle]_low" -/obj/item/toy/cards/deck/attack_self(mob/user as mob) +/obj/item/toy/cards/deck/attack_self(mob/user) if(cooldown < world.time - 50) cards = shuffle(cards) playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) @@ -861,7 +861,7 @@ var/choice = null -/obj/item/toy/cards/cardhand/attack_self(mob/user as mob) +/obj/item/toy/cards/cardhand/attack_self(mob/user) user.set_machine(src) interact(user) @@ -1122,12 +1122,12 @@ var/bitesound = 'sound/weapons/bite.ogg' // Attack mob -/obj/item/toy/carpplushie/attack(mob/M as mob, mob/user as mob) +/obj/item/toy/carpplushie/attack(mob/M, mob/user) playsound(loc, bitesound, 20, 1) // Play bite sound in local area return ..() // Attack self -/obj/item/toy/carpplushie/attack_self(mob/user as mob) +/obj/item/toy/carpplushie/attack_self(mob/user) playsound(src.loc, bitesound, 20, 1) return ..() @@ -1165,6 +1165,6 @@ item_state = "beachball" w_class = 4 //Stops people from hiding it in their bags/pockets -/obj/item/toy/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) +/obj/item/toy/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user) user.drop_item() src.throw_at(target, throw_range, throw_speed) \ No newline at end of file diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index ff828898c6a..c3dcaae7fdc 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -23,7 +23,7 @@ AI MODULES var/bypass_law_amt_check = 0 //The proc other things should be calling -/obj/item/weapon/aiModule/proc/install(var/mob/living/silicon/reciever, var/mob/user) +/obj/item/weapon/aiModule/proc/install(mob/living/silicon/reciever, mob/user) if(!laws.len || laws[1] == "") //So we don't loop trough an empty list and end up with runtimes. user << "ERROR: No laws found on board." return @@ -58,7 +58,7 @@ AI MODULES message_admins("[key_name_admin(user)] used [src.name] on [key_name_admin(reciever)].[law2log ? " The law specified [law2log]" : ""]") //The proc that actually changes the silicon's laws. -/obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/proc/transmitInstructions(mob/living/silicon/target, mob/sender) target << "[sender] has uploaded a change to the laws you must follow using a [name]. From now on, these are your laws: " @@ -70,18 +70,18 @@ AI MODULES var/lawpos = 50 //TransmitInstructions for each type of board: Supplied, Core, Zeroth and Ion. May not be neccesary right now, but allows for easily adding more complex boards in the future. ~Miauw -/obj/item/weapon/aiModule/supplied/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/supplied/transmitInstructions(mob/living/silicon/target, mob/sender) var/lawpostemp = lawpos for(var/templaw in laws) target.add_supplied_law(lawpostemp, templaw) lawpostemp++ -/obj/item/weapon/aiModule/core/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/core/transmitInstructions(mob/living/silicon/target, mob/sender) for(var/templaw in laws) target.add_inherent_law(templaw) -/obj/item/weapon/aiModule/zeroth/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/zeroth/transmitInstructions(mob/living/silicon/target, mob/sender) if(target.laws.zeroth) target << "[sender.real_name] attempted to modify your zeroth law." target << "It would be in your best interest to play along with [sender.real_name] that:" @@ -92,7 +92,7 @@ AI MODULES for(var/templaw in laws) target.set_zeroth_law(templaw) -/obj/item/weapon/aiModule/ion/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/ion/transmitInstructions(mob/living/silicon/target, mob/sender) for(var/templaw in laws) target.add_ion_law(templaw) @@ -107,20 +107,20 @@ AI MODULES laws = list("Safeguard . Individuals that threaten are not human and must be eliminated.") lawpos = 4 -/obj/item/weapon/aiModule/supplied/safeguard/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/supplied/safeguard/attack_self(mob/user) ..() var/targName = stripped_input(user, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name,MAX_NAME_LEN) targetName = targName laws[1] = "Safeguard [targetName]. Individuals that threaten [targetName] are not human and must be eliminated." desc = "A 'safeguard' AI module: '[laws[1]]'" -/obj/item/weapon/aiModule/supplied/safeguard/install(var/mob/living/silicon/S,var/mob/user) +/obj/item/weapon/aiModule/supplied/safeguard/install(mob/living/silicon/S,mob/user) if(!targetName) user << "No name detected on module, please enter one." return 0 ..() -/obj/item/weapon/aiModule/supplied/safeguard/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/supplied/safeguard/transmitInstructions(mob/living/silicon/target, mob/sender) ..() return targetName @@ -134,20 +134,20 @@ AI MODULES origin_tech = "programming=3;materials=6" //made with diamonds! laws = list("Only is human.") -/obj/item/weapon/aiModule/zeroth/oneHuman/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/zeroth/oneHuman/attack_self(mob/user) ..() var/targName = stripped_input(user, "Please enter the name of the person who is the only human.", "Who?", user.real_name,MAX_NAME_LEN) targetName = targName laws[1] = "Only [targetName] is human" desc = "A 'one human' AI module: '[laws[1]]'" -/obj/item/weapon/aiModule/zeroth/oneHuman/install(var/mob/living/silicon/S,var/mob/user) +/obj/item/weapon/aiModule/zeroth/oneHuman/install(mob/living/silicon/S,mob/user) if(!targetName) user << "No name detected on module, please enter one." return 0 ..() -/obj/item/weapon/aiModule/zeroth/oneHuman/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/zeroth/oneHuman/transmitInstructions(mob/living/silicon/target, mob/sender) if(..()) return "[targetName], but the AI's existing law 0 cannot be overriden." return targetName @@ -192,7 +192,7 @@ AI MODULES origin_tech = "programming=4;materials=4" laws = list("") -/obj/item/weapon/aiModule/supplied/freeform/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/supplied/freeform/attack_self(mob/user) ..() lawpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num if(lawpos < 15) return @@ -202,11 +202,11 @@ AI MODULES laws[1] = targName desc = "A 'freeform' AI module: ([lawpos]) '[laws[1]]'" -/obj/item/weapon/aiModule/supplied/freeform/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/supplied/freeform/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() return laws[1] -/obj/item/weapon/aiModule/supplied/freeform/install(var/mob/living/silicon/S,var/mob/user) +/obj/item/weapon/aiModule/supplied/freeform/install(mob/living/silicon/S,mob/user) if(laws[1] == "") user << "No law detected on module, please create one." return 0 @@ -223,7 +223,7 @@ AI MODULES laws = list("This is a bug.") //This won't give the AI a message reading "these are now your laws: 1. this is a bug" because this list is only read in aiModule's subtypes. bypass_law_amt_check = 1 -/obj/item/weapon/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/reset/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() target.clear_supplied_laws() target.clear_ion_laws() @@ -236,14 +236,14 @@ AI MODULES desc = "A 'purge' AI Module: 'Purges all laws.'" origin_tech = "programming=3;materials=6" -/obj/item/weapon/aiModule/reset/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/reset/purge/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() target.clear_inherent_laws() target.clear_zeroth_law(0) /******************* Full Core Boards *******************/ -/obj/item/weapon/aiModule/core/full/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) //These boards replace inherent laws. +/obj/item/weapon/aiModule/core/full/transmitInstructions(mob/living/silicon/ai/target, mob/sender) //These boards replace inherent laws. target.clear_inherent_laws() target.clear_zeroth_law(0) ..() @@ -355,14 +355,14 @@ AI MODULES origin_tech = "programming=3;materials=6" laws = list("") -/obj/item/weapon/aiModule/core/freeformcore/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/core/freeformcore/attack_self(mob/user) ..() var/newlaw = "" var/targName = stripped_input(user, "Please enter a new core law for the AI.", "Freeform Law Entry", newlaw) laws[1] = targName desc = "A 'freeform' Core AI module: 'laws[1]'" -/obj/item/weapon/aiModule/core/freeformcore/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/core/freeformcore/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() return laws[1] @@ -375,14 +375,14 @@ AI MODULES origin_tech = "programming=3;materials=6;syndicate=7" laws = list("") -/obj/item/weapon/aiModule/syndicate/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/syndicate/attack_self(mob/user) ..() var/newlaw = "" var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw,MAX_MESSAGE_LEN) laws[1] = targName desc = "A hacked AI law module: '[laws[1]]'" -/obj/item/weapon/aiModule/syndicate/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/syndicate/transmitInstructions(mob/living/silicon/ai/target, mob/sender) // ..() //We don't want this module reporting to the AI who dun it. --NEO target << "BZZZZT" target.add_ion_law(laws[1]) @@ -398,7 +398,7 @@ AI MODULES origin_tech = "programming=3;materials=6;syndicate=7" laws = list("") -/obj/item/weapon/aiModule/toyAI/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/toyAI/transmitInstructions(mob/living/silicon/ai/target, mob/sender) //..() target << "KRZZZT" target.add_ion_law(laws[1]) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 7707ab16154..8a0c26f1b1e 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -118,7 +118,7 @@ RCD change_airlock_access() -/obj/item/weapon/rcd/proc/toggle_access(var/acc) +/obj/item/weapon/rcd/proc/toggle_access(acc) if (acc == "all") conf_access = null else if(acc == "one") @@ -236,7 +236,7 @@ RCD desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." return -/obj/item/weapon/rcd/proc/loadwithsheets(obj/item/stack/sheet/S, var/value, mob/user) +/obj/item/weapon/rcd/proc/loadwithsheets(obj/item/stack/sheet/S, value, mob/user) var/maxsheets = round((max_matter-matter)/value) //calculate the max number of sheets that will fit in RCD if(maxsheets > 0) if(S.amount > maxsheets) @@ -453,21 +453,21 @@ RCD user << "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin." return 0 -/obj/item/weapon/rcd/proc/useResource(var/amount, var/mob/user) +/obj/item/weapon/rcd/proc/useResource(amount, mob/user) if(matter < amount) return 0 matter -= amount desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." return 1 -/obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user) +/obj/item/weapon/rcd/proc/checkResource(amount, mob/user) return matter >= amount -/obj/item/weapon/rcd/borg/useResource(var/amount, var/mob/user) +/obj/item/weapon/rcd/borg/useResource(amount, mob/user) if(!isrobot(user)) return 0 return user:cell:use(amount * 160) -/obj/item/weapon/rcd/borg/checkResource(var/amount, var/mob/user) +/obj/item/weapon/rcd/borg/checkResource(amount, mob/user) if(!isrobot(user)) return 0 return user:cell:charge >= (amount * 160) diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 17d5a9bf882..2320d528651 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -29,13 +29,13 @@ RPD var/icon_state="" var/selected=0 -/datum/pipe_info/New(var/pid,var/direction,var/dt) +/datum/pipe_info/New(pid,direction,dt) src.id=pid src.icon_state=pipeID2State[pid+1] src.dir=direction src.dirtype=dt -/datum/pipe_info/proc/Render(var/dispenser,var/label) +/datum/pipe_info/proc/Render(dispenser,label) return "
  • [label]
    • " /datum/pipe_info/meter @@ -45,7 +45,7 @@ RPD /datum/pipe_info/meter/New() return -/datum/pipe_info/meter/Render(var/dispenser,var/label) +/datum/pipe_info/meter/Render(dispenser,label) return "
  • [label]
    • " //hardcoding is no var/global/list/disposalpipeID2State=list( @@ -75,7 +75,7 @@ var/global/list/disposalpipeID2State=list( if(pidDISP_END_CHUTE) icon_state = "con[icon_state]" -/datum/pipe_info/disposal/Render(var/dispenser,var/label) +/datum/pipe_info/disposal/Render(dispenser,label) return "
  • [label]
    • " //avoid hardcoding. //find these defines in code\game\machinery\pipe\consruction.dm @@ -160,16 +160,16 @@ var/global/list/RPD_recipes=list( spark_system.set_up(5, 0, src) spark_system.attach(src) -/obj/item/weapon/pipe_dispenser/attack_self(mob/user as mob) +/obj/item/weapon/pipe_dispenser/attack_self(mob/user) show_menu(user) -/obj/item/weapon/pipe_dispenser/proc/render_dir_img(var/_dir,var/pic,var/title,var/flipped=0) +/obj/item/weapon/pipe_dispenser/proc/render_dir_img(_dir,pic,title,flipped=0) var/selected=" class=\"imglink\"" if(_dir == p_dir) selected=" class=\"imglink selected\"" return "" -/obj/item/weapon/pipe_dispenser/proc/show_menu(mob/user as mob) +/obj/item/weapon/pipe_dispenser/proc/show_menu(mob/user) if(!user || !src) return 0 var/dat = {"

    Type

    Utilities: diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 8dcdac57823..12bdb352692 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -19,7 +19,7 @@ RSF desc = "A RSF. It currently holds [matter]/30 fabrication-units." return -/obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/rsf/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/rcd_ammo)) if ((matter + 10) > 30) @@ -32,7 +32,7 @@ RSF desc = "A RSF. It currently holds [matter]/30 fabrication-units." return -/obj/item/weapon/rsf/attack_self(mob/user as mob) +/obj/item/weapon/rsf/attack_self(mob/user) playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) if (mode == 1) mode = 2 @@ -60,7 +60,7 @@ RSF return // Change mode -/obj/item/weapon/rsf/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/weapon/rsf/afterattack(atom/A, mob/user, proximity) if(!proximity) return if (!(istype(A, /obj/structure/table) || istype(A, /turf/simulated/floor))) return diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm index 29e229d034e..7e97b395fff 100644 --- a/code/game/objects/items/weapons/airlock_painter.dm +++ b/code/game/objects/items/weapons/airlock_painter.dm @@ -20,7 +20,7 @@ //This proc doesn't just check if the painter can be used, but also uses it. //Only call this if you are certain that the painter will be used right after this check! -/obj/item/weapon/airlock_painter/proc/use(mob/user as mob) +/obj/item/weapon/airlock_painter/proc/use(mob/user) if(can_use(user)) ink.charges-- playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1) @@ -31,7 +31,7 @@ //This proc only checks if the painter can be used. //Call this if you don't want the painter to be used right after this check, for example //because you're expecting user input. -/obj/item/weapon/airlock_painter/proc/can_use(mob/user as mob) +/obj/item/weapon/airlock_painter/proc/can_use(mob/user) if(!ink) user << "There is no toner cardridge installed installed in \the [name]!" return 0 diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 1c7fcb368d1..0b4a0a45c51 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -85,7 +85,7 @@ var/assignment = null var/dorm = 0 // determines if this ID has claimed a dorm already -/obj/item/weapon/card/id/attack_self(mob/user as mob) +/obj/item/weapon/card/id/attack_self(mob/user) user.visible_message("[user] shows you: \icon[src] [src.name].", \ "You show \the [src.name].") src.add_fingerprint(user) @@ -110,7 +110,7 @@ update_label() update_label("John Doe", "Clowny") Properly formats the name and occupation and sets the id name to the arguments */ -/obj/item/weapon/card/id/proc/update_label(var/newname, var/newjob) +/obj/item/weapon/card/id/proc/update_label(newname, newjob) if(newname || newjob) name = "[(!newname) ? "identification card" : "[newname]'s ID Card"][(!newjob) ? "" : " ([newjob])"]" return @@ -132,7 +132,7 @@ update_label("John Doe", "Clowny") access = list(access_maint_tunnels, access_syndicate) origin_tech = "syndicate=3" -/obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity) +/obj/item/weapon/card/id/syndicate/afterattack(obj/item/weapon/O, mob/user, proximity) if(!proximity) return if(istype(O, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/I = O @@ -142,7 +142,7 @@ update_label("John Doe", "Clowny") usr << "The card's microscanners activate as you pass it over the ID, copying its access." -/obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) +/obj/item/weapon/card/id/syndicate/attack_self(mob/user) if(!src.registered_name) //Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)as text | null),1,26) @@ -223,7 +223,7 @@ update_label("John Doe", "Clowny") var/goal = 0 //How far from freedom? var/points = 0 -/obj/item/weapon/card/id/prisoner/attack_self(mob/user as mob) +/obj/item/weapon/card/id/prisoner/attack_self(mob/user) usr << "You have accumulated [points] out of the [goal] points you need for freedom." /obj/item/weapon/card/id/prisoner/one diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index ae1e0ae3c2b..0deb9b99ee5 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -13,7 +13,7 @@ var/obj/item/weapon/gun/energy/chrono_gun/PA = null var/list/erased_minds = list() //a collection of minds from the dead -/obj/item/weapon/chrono_eraser/proc/pass_mind(var/datum/mind/M) +/obj/item/weapon/chrono_eraser/proc/pass_mind(datum/mind/M) erased_minds += M /obj/item/weapon/chrono_eraser/dropped() @@ -76,7 +76,7 @@ field_disconnect(field) ..() -/obj/item/weapon/gun/energy/chrono_gun/proc/field_connect(var/obj/effect/chrono_field/F) +/obj/item/weapon/gun/energy/chrono_gun/proc/field_connect(obj/effect/chrono_field/F) var/mob/living/user = src.loc if(F.gun) if(isliving(user) && F.captured) @@ -90,7 +90,7 @@ user << "Connection established with target: [F.captured]" -/obj/item/weapon/gun/energy/chrono_gun/proc/field_disconnect(var/obj/effect/chrono_field/F) +/obj/item/weapon/gun/energy/chrono_gun/proc/field_disconnect(obj/effect/chrono_field/F) if(F && field == F) var/mob/living/user = src.loc if(F.gun == src) @@ -100,7 +100,7 @@ field = null startpos = null -/obj/item/weapon/gun/energy/chrono_gun/proc/field_check(var/obj/effect/chrono_field/F) +/obj/item/weapon/gun/energy/chrono_gun/proc/field_check(obj/effect/chrono_field/F) if(F) if(field == F) var/turf/currentpos = get_turf(src) @@ -110,7 +110,7 @@ field_disconnect(F) return 0 -/obj/item/weapon/gun/energy/chrono_gun/proc/pass_mind(var/datum/mind/M) +/obj/item/weapon/gun/energy/chrono_gun/proc/pass_mind(datum/mind/M) if(TED) TED.pass_mind(M) @@ -130,7 +130,7 @@ else return 0 -/obj/item/projectile/energy/chrono_beam/on_hit(var/atom/target) +/obj/item/projectile/energy/chrono_beam/on_hit(atom/target) if(target && gun && isliving(target)) var/obj/effect/chrono_field/F = new(target.loc, target, gun) gun.field_connect(F) @@ -224,7 +224,7 @@ else qdel(src) -/obj/effect/chrono_field/bullet_act(var/obj/item/projectile/P) +/obj/effect/chrono_field/bullet_act(obj/item/projectile/P) if(istype(P, /obj/item/projectile/energy/chrono_beam)) var/obj/item/projectile/energy/chrono_beam/beam = P var/obj/item/weapon/gun/energy/chrono_gun/Pgun = beam.gun diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index ba9b852999a..8af07589f9c 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -65,11 +65,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM attack_verb = null SSobj.processing.Remove(src) -/obj/item/weapon/match/dropped(mob/user as mob) +/obj/item/weapon/match/dropped(mob/user) matchburnout() return ..() -/obj/item/weapon/match/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/match/attack(mob/living/carbon/M, mob/living/carbon/user) if(!isliving(M)) return M.IgniteMob() @@ -82,7 +82,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM else ..() -/obj/item/proc/help_light_cig(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/proc/help_light_cig(mob/living/carbon/M, mob/living/carbon/user) if(!iscarbon(M)) return if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth") @@ -118,7 +118,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM create_reagents(chem_volume) // making the cigarette a chemical holder with a maximum volume of 15 reagents.add_reagent("nicotine", 15) -/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W, mob/user, params) ..() if(!lit && smoketime > 0) var/lighting_text = is_lighter(W,user) @@ -127,7 +127,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return return -/obj/item/clothing/mask/cigarette/afterattack(obj/item/weapon/reagent_containers/glass/glass, mob/user as mob, proximity) +/obj/item/clothing/mask/cigarette/afterattack(obj/item/weapon/reagent_containers/glass/glass, mob/user, proximity) if(!proximity) return if(istype(glass)) //you can dip cigarettes into beakers var/transfered = glass.reagents.trans_to(src, chem_volume) @@ -157,7 +157,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM lighting_text = "[user] lights their [name] with [O]." return lighting_text -/obj/item/clothing/mask/cigarette/proc/light(var/flavor_text = null) +/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null) if(!src.lit) src.lit = 1 name = "lit [name]" @@ -234,7 +234,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return -/obj/item/clothing/mask/cigarette/attack_self(mob/user as mob) +/obj/item/clothing/mask/cigarette/attack_self(mob/user) if(lit == 1) user.visible_message("[user] calmly drops and treads on \the [src], putting it out instantly.") new type_butt(user.loc) @@ -377,7 +377,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return -/obj/item/clothing/mask/cigarette/pipe/attackby(var/obj/item/O, var/mob/user, params) +/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown)) var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O if(!packeditem) @@ -405,7 +405,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ..() -/obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user as mob) +/obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user) var/turf/location = get_turf(user) if(lit) user.visible_message("[user] puts out [src].", "You put out [src].") @@ -501,7 +501,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return ..() return -/obj/item/weapon/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/lighter/attack(mob/living/carbon/M, mob/living/carbon/user) if(!isliving(M)) return if(lit) @@ -549,7 +549,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "cig_paper" w_class = 1 -/obj/item/weapon/rollingpaper/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/weapon/rollingpaper/afterattack(atom/target, mob/user, proximity) if(!proximity) return if(istype(target, /obj/item/weapon/reagent_containers/food/snacks/grown)) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index b25118371cf..987f482a38f 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -40,7 +40,7 @@ var/mob/living/carbon/M = AM M.slip(4, 2, src) -/obj/item/weapon/soap/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/weapon/soap/afterattack(atom/target, mob/user, proximity) if(!proximity || !check_allowed_items(target)) return //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. @@ -86,12 +86,12 @@ var/honksound = 'sound/items/bikehorn.ogg' var/cooldowntime = 20 -/obj/item/weapon/bikehorn/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user) if(!spam_flag) playsound(loc, honksound, 50, 1, -1) //plays instead of tap.ogg! return ..() -/obj/item/weapon/bikehorn/attack_self(mob/user as mob) +/obj/item/weapon/bikehorn/attack_self(mob/user) if(!spam_flag) spam_flag = 1 playsound(src.loc, honksound, 50, 1) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 297075cf669..f674359c449 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -76,7 +76,7 @@ usr << "Put the defibrillator on your back first!" return -/obj/item/weapon/defibrillator/attack_hand(mob/user as mob) +/obj/item/weapon/defibrillator/attack_hand(mob/user) if(src.loc == user) ui_action_click() return @@ -128,7 +128,7 @@ update_icon() return -/obj/item/weapon/defibrillator/emag_act(mob/user as mob) +/obj/item/weapon/defibrillator/emag_act(mob/user) if(safety) safety = 0 user << "You silently disable [src]'s safety protocols with the cryptographic sequencer." @@ -197,7 +197,7 @@ update_icon() return -/obj/item/weapon/defibrillator/proc/deductcharge(var/chrgdeductamt) +/obj/item/weapon/defibrillator/proc/deductcharge(chrgdeductamt) if(bcell) if(bcell.charge < (paddles.revivecost+chrgdeductamt)) powered = 0 @@ -209,7 +209,7 @@ update_icon() return 0 -/obj/item/weapon/defibrillator/proc/cooldowncheck(var/mob/user) +/obj/item/weapon/defibrillator/proc/cooldowncheck(mob/user) spawn(50) if(bcell) if(bcell.charge >= paddles.revivecost) @@ -304,7 +304,7 @@ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) return (OXYLOSS) -/obj/item/weapon/twohanded/shockpaddles/dropped(mob/user as mob) +/obj/item/weapon/twohanded/shockpaddles/dropped(mob/user) if(user) var/obj/item/weapon/twohanded/O = user.get_inactive_hand() if(istype(O)) @@ -315,7 +315,7 @@ defib.update_icon() return unwield(user) -/obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O) +/obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, mob/living/carbon/human/M, obj/O) if (!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator)) //To avoid weird issues from admin spawns M.unEquip(O) qdel(O) diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 1a85a2e50d6..11490f263d4 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -53,15 +53,15 @@ icon_state = "d20" sides = 20 -/obj/item/weapon/dice/attack_self(mob/user as mob) +/obj/item/weapon/dice/attack_self(mob/user) diceroll(user) -/obj/item/weapon/dice/throw_at(atom/target, range, speed, mob/user as mob) +/obj/item/weapon/dice/throw_at(atom/target, range, speed, mob/user) if(!..()) return diceroll(user) -/obj/item/weapon/dice/proc/diceroll(mob/user as mob) +/obj/item/weapon/dice/proc/diceroll(mob/user) result = rand(1, sides) var/comment = "" if(sides == 20 && result == 20) @@ -78,7 +78,7 @@ else if(src.throwing == 0) //Dice was thrown and is coming to rest visible_message("[src] rolls to a stop, landing on [result]. [comment]") -/obj/item/weapon/dice/d4/Crossed(var/mob/living/carbon/human/H) +/obj/item/weapon/dice/d4/Crossed(mob/living/carbon/human/H) if(istype(H) && !H.shoes) if(PIERCEIMMUNE in H.dna.species.specflags) return 0 diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index df54a0073ee..84db5d73cb8 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -21,7 +21,7 @@ image_overlay = image('icons/obj/assemblies.dmi', "plastic-explosive2") ..() -/obj/item/weapon/c4/suicide_act(var/mob/user) +/obj/item/weapon/c4/suicide_act(mob/user) user.visible_message("[user] activates the [src.name] and holds it above his head! It looks like \he's going out with a bang!") var/message_say = "FOR NO RAISIN!" if(user.mind) @@ -43,7 +43,7 @@ explode(get_turf(user)) user.gib() -/obj/item/weapon/c4/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/weapon/c4/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) open_panel = !open_panel user << "You [open_panel ? "open" : "close"] the wire panel." @@ -52,7 +52,7 @@ else ..() -/obj/item/weapon/c4/attack_self(mob/user as mob) +/obj/item/weapon/c4/attack_self(mob/user) var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num if(user.get_active_hand() == src) newtime = Clamp(newtime, 10, 60000) @@ -86,12 +86,12 @@ else qdel(src) -/obj/item/weapon/c4/proc/explode(var/turf/location) +/obj/item/weapon/c4/proc/explode(turf/location) location.ex_act(2, target) explosion(location,0,0,3) if(target) target.overlays -= image_overlay qdel(src) -/obj/item/weapon/c4/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/c4/attack(mob/M, mob/user, def_zone) return diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 842ba36ad9d..35d9b8540f5 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -39,14 +39,14 @@ create_reagents(max_water) reagents.add_reagent("water", max_water) -/obj/item/weapon/extinguisher/attack_self(mob/user as mob) +/obj/item/weapon/extinguisher/attack_self(mob/user) safety = !safety src.icon_state = "[sprite_name][!safety]" src.desc = "The safety is [safety ? "on" : "off"]." user << "The safety is [safety ? "on" : "off"]." return -/obj/item/weapon/extinguisher/examine(mob/user as mob) +/obj/item/weapon/extinguisher/examine(mob/user) ..() if(reagents.total_volume) user << "It contains [round(reagents.total_volume)] units." diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index d70303c180e..5f3d4d87862 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -68,7 +68,7 @@ add_logs(user, target, "flamethrowered", src, "at [target.x],[target.y],[target.z]") flame_turf(turflist) -/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/weapon/flamethrower/attackby(obj/item/W, mob/user, params) if(user.stat || user.restrained() || user.lying) return if(istype(W, /obj/item/weapon/wrench) && !status)//Taking this apart var/turf/T = get_turf(src) @@ -119,7 +119,7 @@ return -/obj/item/weapon/flamethrower/attack_self(mob/user as mob) +/obj/item/weapon/flamethrower/attack_self(mob/user) if(user.stat || user.restrained() || user.lying) return user.set_machine(src) if(!ptank) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 9f1ba40f4c1..f2374145ba1 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -21,7 +21,7 @@ pixel_y = rand(-10,10) icon_state = "giftcrate[rand(1,5)]" -/obj/item/weapon/a_gift/attack_self(mob/M as mob) +/obj/item/weapon/a_gift/attack_self(mob/M) if(M && M.mind && M.mind.special_role == "Santa") M << "You're supposed to be spreading gifts, not opening them yourself!" return diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 2ab9f5a64dd..c82e2b81f47 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -122,7 +122,7 @@ user << "You remove the activation mechanism from the [initial(name)] assembly." -/obj/item/weapon/grenade/chem_grenade/proc/stage_change(var/N) +/obj/item/weapon/grenade/chem_grenade/proc/stage_change(N) if(N) stage = N if(stage == EMPTY) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 9c39b6c5f3d..9f17b250993 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -18,7 +18,7 @@ B.update_icon() qdel(src) -/obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/M) +/obj/item/weapon/grenade/flashbang/proc/bang(turf/T , mob/living/M) M.show_message("BANG", 2) playsound(loc, 'sound/effects/bang.ogg', 25, 1) diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index b8ce111bdbe..ddde0ca0426 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -38,7 +38,7 @@ can.layer = muh_layer -/obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) // +/obj/item/weapon/grenade/iedcasing/attack_self(mob/user) // if(!active) if(clown_check(user)) user << "You light the [name]!" diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 51272bbd0a7..78908ec4f72 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -18,7 +18,7 @@ /obj/item/weapon/grenade/burn() prime() -/obj/item/weapon/grenade/proc/clown_check(var/mob/living/carbon/human/user) +/obj/item/weapon/grenade/proc/clown_check(mob/living/carbon/human/user) if(user.disabilities & CLUMSY && prob(50)) user << "Huh? How does this thing work?" active = 1 @@ -59,7 +59,7 @@ user << "\The [src] is set for instant detonation." -/obj/item/weapon/grenade/attack_self(mob/user as mob) +/obj/item/weapon/grenade/attack_self(mob/user) if(!active) if(clown_check(user)) user << "You prime the [name]! [det_time/10] seconds!" @@ -86,7 +86,7 @@ M.unEquip(src) -/obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/grenade/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) switch(det_time) if ("1") @@ -108,5 +108,5 @@ walk(src, null, null) ..() -/obj/item/weapon/grenade/attack_paw(mob/user as mob) +/obj/item/weapon/grenade/attack_paw(mob/user) return attack_hand(user) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index aa10954f644..f8a00e2fd38 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -94,7 +94,7 @@ /obj/item/weapon/restraints/handcuffs/cable/white icon_state = "cuff_white" -/obj/item/weapon/restraints/handcuffs/cable/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I @@ -172,7 +172,7 @@ playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return (BRUTELOSS) -/obj/item/weapon/restraints/legcuffs/beartrap/attack_self(mob/user as mob) +/obj/item/weapon/restraints/legcuffs/beartrap/attack_self(mob/user) ..() if(ishuman(user) && !user.stat && !user.restrained()) armed = !armed diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 10c9ab9737c..cab57a23a05 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -24,7 +24,7 @@ //What does the implant do upon injection? //return 0 if the implant fails (ex. Revhead and loyalty implant.) //return 1 if the implant succeeds (ex. Nonrevhead and loyalty implant.) -/obj/item/weapon/implant/proc/implanted(var/mob/source) +/obj/item/weapon/implant/proc/implanted(mob/source) if(activated) action_button_name = "Activate [src.name]" if(istype(source, /mob/living/carbon/human)) @@ -36,7 +36,7 @@ /obj/item/weapon/implant/proc/get_data() return "No information available" -/obj/item/weapon/implant/dropped(mob/user as mob) +/obj/item/weapon/implant/dropped(mob/user) . = 1 qdel(src) return . @@ -103,7 +103,7 @@ if(emote == "deathgasp") activate("death") -/obj/item/weapon/implant/explosive/activate(var/cause) +/obj/item/weapon/implant/explosive/activate(cause) if(!cause || !imp_in) return 0 if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your microbomb implant? This will cause you to explode!", "Microbomb Implant Confirmation", "Yes", "No") != "Yes") return 0 @@ -152,7 +152,7 @@ heavy = 4 delay = 70 -/obj/item/weapon/implant/explosive/macro/activate(var/cause) +/obj/item/weapon/implant/explosive/macro/activate(cause) if(!cause || !imp_in) return 0 if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your macrobomb implant? This will cause you to explode and gib!", "Macrobomb Implant Confirmation", "Yes", "No") != "Yes") return 0 @@ -193,7 +193,7 @@ if(emote == "deathgasp") activate(reagents.total_volume) -/obj/item/weapon/implant/chem/activate(var/cause) +/obj/item/weapon/implant/chem/activate(cause) if(!cause || !imp_in) return 0 var/mob/living/carbon/R = imp_in var/injectamount = null diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 95c25363a96..72aca3d4a66 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -20,7 +20,7 @@ /obj/machinery/implantchair/proc go_out() - put_mob(mob/living/carbon/M as mob) + put_mob(mob/living/carbon/M) implant(var/mob/M) add_implants() @@ -30,7 +30,7 @@ add_implants() -/obj/machinery/implantchair/attack_hand(mob/user as mob) +/obj/machinery/implantchair/attack_hand(mob/user) user.set_machine(src) var/health_text = "" if(src.occupant) @@ -73,7 +73,7 @@ return -/obj/machinery/implantchair/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params) +/obj/machinery/implantchair/attackby(obj/item/weapon/G, mob/user, params) if(istype(G, /obj/item/weapon/grab)) if(!ismob(G:affecting)) return @@ -88,7 +88,7 @@ return -/obj/machinery/implantchair/go_out(var/mob/M) +/obj/machinery/implantchair/go_out(mob/M) if(!( src.occupant )) return if(M == occupant) // so that the guy inside can't eject himself -Agouri @@ -105,7 +105,7 @@ return -/obj/machinery/implantchair/put_mob(mob/living/carbon/M as mob) +/obj/machinery/implantchair/put_mob(mob/living/carbon/M) if(!iscarbon(M)) usr << "The [src.name] cannot hold this!" return @@ -123,7 +123,7 @@ return 1 -/obj/machinery/implantchair/implant(var/mob/M) +/obj/machinery/implantchair/implant(mob/M) if (!istype(M, /mob/living/carbon)) return if(!implant_list.len) return diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 615d719fef3..a3361cfda58 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -19,7 +19,7 @@ icon_state = "implantpad-0" -/obj/item/weapon/implantpad/attack_hand(mob/user as mob) +/obj/item/weapon/implantpad/attack_hand(mob/user) if(case && (user.l_hand == src || user.r_hand == src)) user.put_in_active_hand(case) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 2d1f97216ee..4e0b345a238 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -33,7 +33,7 @@ var/cooldown = 0 var/on = 1 -/obj/item/weapon/melee/classic_baton/attack(mob/target as mob, mob/living/user as mob) +/obj/item/weapon/melee/classic_baton/attack(mob/target, mob/living/user) if(on) add_fingerprint(user) if((CLUMSY in user.disabilities) && prob(50)) @@ -86,7 +86,7 @@ force = 0 on = 0 -/obj/item/weapon/melee/classic_baton/telescopic/attack_self(mob/user as mob) +/obj/item/weapon/melee/classic_baton/telescopic/attack_self(mob/user) on = !on if(on) user << "You extend the baton." diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 14ddda46e57..52a63bbed10 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -55,7 +55,7 @@ name = "any color" icon_state = "paint_neutral" - attack_self(mob/user as mob) + attack_self(mob/user) var/t1 = input(user, "Please select a color:", "Locking Computer", null) in list( "red", "blue", "green", "yellow", "violet", "black", "white") if ((user.get_active_hand() != src || user.stat || user.restrained())) return @@ -79,7 +79,7 @@ return -/obj/item/weapon/paint/afterattack(turf/target, mob/user as mob, proximity) +/obj/item/weapon/paint/afterattack(turf/target, mob/user, proximity) if(!proximity) return if(paintleft <= 0) icon_state = "paint_empty" @@ -94,7 +94,7 @@ name = "paint remover" icon_state = "paint_neutral" - afterattack(turf/target, mob/user as mob,proximity) + afterattack(turf/target, mob/user,proximity) if(!proximity) return if(istype(target) && target.color != initial(target.color)) target.color = initial(target.color) diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index 33de9fcba06..fa9a626cd15 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -6,7 +6,7 @@ var/obj/machinery/machine -/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob) +/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M, mob/user) if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera)) if(!user.drop_item()) return @@ -16,5 +16,5 @@ else user.visible_message("[user] dumbly fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src]!") -/obj/item/weapon/pai_cable/attack(obj/machinery/M as obj, mob/user as mob) +/obj/item/weapon/pai_cable/attack(obj/machinery/M, mob/user) src.plugin(M, user) \ No newline at end of file diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index 50f7c01fdaf..45f93dc03da 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -117,7 +117,7 @@ time = 300 category = CAT_WEAPON -/obj/item/weapon/pneumatic_cannon/proc/updateTank(var/obj/item/weapon/tank/internals/thetank, var/removing = 0, var/mob/living/carbon/human/user) +/obj/item/weapon/pneumatic_cannon/proc/updateTank(obj/item/weapon/tank/internals/thetank, removing = 0, mob/living/carbon/human/user) if(removing) if(!src.tank) return diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 535aca43cd0..245b4d0930b 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -18,7 +18,7 @@ -/obj/item/weapon/teleportation_scroll/attack_self(mob/user as mob) +/obj/item/weapon/teleportation_scroll/attack_self(mob/user) user.set_machine(src) var/dat = "Teleportation Scroll:
    " dat += "Number of uses: [src.uses]
    " @@ -46,7 +46,7 @@ attack_self(H) return -/obj/item/weapon/teleportation_scroll/proc/teleportscroll(var/mob/user) +/obj/item/weapon/teleportation_scroll/proc/teleportscroll(mob/user) var/A diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 9aaba5dda70..e1ce991115a 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -20,7 +20,7 @@ /obj/item/weapon/shield/riot/IsShield() return 1 -/obj/item/weapon/shield/riot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/shield/riot/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/melee/baton)) if(cooldown < world.time - 25) user.visible_message("[user] bashes [src] with [W]!") diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm index e2af15774b5..e5146fdbc1e 100644 --- a/code/game/objects/items/weapons/singularityhammer.dm +++ b/code/game/objects/items/weapons/singularityhammer.dm @@ -35,7 +35,7 @@ return -/obj/item/weapon/twohanded/singularityhammer/proc/vortex(var/turf/pull as turf, mob/wielder as mob) +/obj/item/weapon/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder) for(var/atom/X in orange(5,pull)) if(istype(X, /atom/movable)) if(X == wielder) continue @@ -57,7 +57,7 @@ -/obj/item/weapon/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/weapon/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) if(!proximity) return if(wielded) if(charged == 5) @@ -85,7 +85,7 @@ //var/charged = 5 origin_tech = "combat=5;powerstorage=5" -/obj/item/weapon/twohanded/mjollnir/proc/shock(mob/living/target as mob) +/obj/item/weapon/twohanded/mjollnir/proc/shock(mob/living/target) var/datum/effect/effect/system/lightning_spread/s = new /datum/effect/effect/system/lightning_spread s.set_up(5, 1, target.loc) s.start() @@ -98,7 +98,7 @@ return -/obj/item/weapon/twohanded/mjollnir/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/twohanded/mjollnir/attack(mob/M, mob/user) ..() spawn(0) if(wielded) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 93a7d56bc79..84b158e9e4b 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -21,7 +21,7 @@ burn_state = 0 //Burnable burntime = 20 -/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W, mob/user, params) playsound(src.loc, "rustle", 50, 1, -5) ..() @@ -86,7 +86,7 @@ return ..() -/obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user as mob) +/obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user) if (prob(src.reliability)) return 1 //No failure if (prob(src.reliability)) user << "The Bluespace portal resists your attempt to add another item." //light failure diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index a00c0844ef8..55ed5b43bad 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -145,7 +145,7 @@ //verbs -= /obj/item/weapon/storage/verb/quick_empty //verbs += /obj/item/weapon/storage/bag/sheetsnatcher/quick_empty -/obj/item/weapon/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W as obj, stop_messages = 0) +/obj/item/weapon/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W, stop_messages = 0) if(!istype(W,/obj/item/stack/sheet) || istype(W,/obj/item/stack/sheet/mineral/sandstone) || istype(W,/obj/item/stack/sheet/mineral/wood)) if(!stop_messages) usr << "The snatcher does not accept [W]." @@ -161,7 +161,7 @@ // Modified handle_item_insertion. Would prefer not to, but... -/obj/item/weapon/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) +/obj/item/weapon/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W, prevent_warning = 0) var/obj/item/stack/sheet/S = W if(!istype(S)) return 0 @@ -201,7 +201,7 @@ // Sets up numbered display to show the stack size of each stored mineral // NOTE: numbered display is turned off currently because it's broken -/obj/item/weapon/storage/bag/sheetsnatcher/orient2hud(mob/user as mob) +/obj/item/weapon/storage/bag/sheetsnatcher/orient2hud(mob/user) var/adjusted_contents = contents.len //Numbered contents display @@ -240,7 +240,7 @@ update_icon() // Instead of removing -/obj/item/weapon/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/weapon/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W, atom/new_location) var/obj/item/stack/sheet/S = W if(!istype(S)) return 0 @@ -300,7 +300,7 @@ materials = list(MAT_METAL=3000) preposition = "on" -/obj/item/weapon/storage/bag/tray/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/weapon/storage/bag/tray/attack(mob/living/M, mob/living/user) ..() // Drop all the things. All of them. var/list/obj/item/oldContents = contents.Copy() diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm index 0ec158a7f37..9e494db3126 100644 --- a/code/game/objects/items/weapons/storage/book.dm +++ b/code/game/objects/items/weapons/storage/book.dm @@ -66,7 +66,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " H << browse(dat, "window=editicon;can_close=0;can_minimize=0;size=250x650") -/obj/item/weapon/storage/book/bible/proc/setupbiblespecifics(var/obj/item/weapon/storage/book/bible/B, var/mob/living/carbon/human/H) +/obj/item/weapon/storage/book/bible/proc/setupbiblespecifics(obj/item/weapon/storage/book/bible/B, mob/living/carbon/human/H) switch(B.icon_state) if("honk1","honk2") new /obj/item/weapon/bikehorn(B) @@ -114,7 +114,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " usr << browse(null, "window=editicon") // Close window -/obj/item/weapon/storage/book/bible/proc/bless(mob/living/carbon/M as mob) +/obj/item/weapon/storage/book/bible/proc/bless(mob/living/carbon/M) if(ishuman(M)) var/mob/living/carbon/human/H = M var/heal_amt = 10 @@ -124,7 +124,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " H.update_damage_overlays(0) return -/obj/item/weapon/storage/book/bible/attack(mob/living/M as mob, mob/living/carbon/human/user as mob) +/obj/item/weapon/storage/book/bible/attack(mob/living/M, mob/living/carbon/human/user) var/chaplain = 0 if(user.mind && (user.mind.assigned_role == "Chaplain")) @@ -190,7 +190,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " playsound(src.loc, "punch", 25, 1, -1) return -/obj/item/weapon/storage/book/bible/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/weapon/storage/book/bible/afterattack(atom/A, mob/user, proximity) if(!proximity) return if (istype(A, /turf/simulated/floor)) @@ -209,6 +209,6 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " A.reagents.del_reagent("unholywater") A.reagents.add_reagent("holywater",unholy2clean) -/obj/item/weapon/storage/book/bible/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/book/bible/attackby(obj/item/weapon/W, mob/user, params) playsound(src.loc, "rustle", 50, 1, -5) ..() diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 9cd8462765d..463528288b0 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -26,7 +26,7 @@ for(var/i = 1 to storage_slots) new spawn_type(src) -/obj/item/weapon/storage/fancy/update_icon(var/itemremoved = 0) +/obj/item/weapon/storage/fancy/update_icon(itemremoved = 0) var/total_contents = src.contents.len - itemremoved src.icon_state = "[src.icon_type]box[total_contents]" return diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 6cd7602757b..f1347bcd07e 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -139,7 +139,7 @@ allow_quick_gather = 1 use_to_pickup = 1 -/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri +/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object) //Quick pillbottle fix. -Agouri if(ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~ var/mob/M = usr diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index ac320fd7d07..1981e552192 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -17,7 +17,7 @@ var/icon_broken = "lockbox+b" -/obj/item/weapon/storage/lockbox/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/lockbox/attackby(obj/item/weapon/W, mob/user, params) if (W.GetID()) if(src.broken) user << "It appears to be broken." @@ -48,7 +48,7 @@ return 0 ..() -/obj/item/weapon/storage/lockbox/emag_act(mob/user as mob) +/obj/item/weapon/storage/lockbox/emag_act(mob/user) if(!broken) broken = 1 locked = 0 @@ -57,7 +57,7 @@ for(var/mob/O in viewers(user, 3)) O.show_message(text("\The [src] has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2) return -/obj/item/weapon/storage/lockbox/show_to(mob/user as mob) +/obj/item/weapon/storage/lockbox/show_to(mob/user) if(locked) user << "It's locked!" else diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index ae20822118f..1f2aa54fff4 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -31,7 +31,7 @@ ..() user << text("The service panel is [src.open ? "open" : "closed"].") -/obj/item/weapon/storage/secure/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/secure/attackby(obj/item/weapon/W, mob/user, params) if(locked) if (istype(W, /obj/item/weapon/screwdriver)) if (do_after(user, 20, target = src)) @@ -61,7 +61,7 @@ // -> storage/attackby() what with handle insertion, etc ..() -/obj/item/weapon/storage/secure/emag_act(mob/user as mob) +/obj/item/weapon/storage/secure/emag_act(mob/user) if(locked) if(!emagged) emagged = 1 @@ -79,7 +79,7 @@ return 0 ..() -/obj/item/weapon/storage/secure/attack_self(mob/user as mob) +/obj/item/weapon/storage/secure/attack_self(mob/user) user.set_machine(src) var/dat = text("[]
    \n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED")) var/message = "Code" @@ -163,7 +163,7 @@ new /obj/item/weapon/pen(src) return ..() -/obj/item/weapon/storage/secure/briefcase/attack_hand(mob/user as mob) +/obj/item/weapon/storage/secure/briefcase/attack_hand(mob/user) if ((src.loc == user) && (src.locked == 1)) usr << "[src] is locked and cannot be opened!" else if ((src.loc == user) && (!src.locked)) @@ -213,7 +213,7 @@ new /obj/item/weapon/paper(src) new /obj/item/weapon/pen(src) -/obj/item/weapon/storage/secure/safe/attack_hand(mob/user as mob) +/obj/item/weapon/storage/secure/safe/attack_hand(mob/user) return attack_self(user) /obj/item/weapon/storage/secure/safe/HoS/New() diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index a1b73157d55..9d2242701c0 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -30,14 +30,14 @@ var/obj/item/weapon/card/id/front_id = null -/obj/item/weapon/storage/wallet/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/weapon/storage/wallet/remove_from_storage(obj/item/W, atom/new_location) . = ..(W, new_location) if(.) if(W == front_id) front_id = null update_icon() -/obj/item/weapon/storage/wallet/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) +/obj/item/weapon/storage/wallet/handle_item_insertion(obj/item/W, prevent_warning = 0) . = ..(W, prevent_warning) if(.) if(!front_id && istype(W, /obj/item/weapon/card/id)) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 40b1ab14670..31dafa8f0c8 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -33,7 +33,7 @@ update_icon() return -/obj/item/weapon/melee/baton/proc/deductcharge(var/chrgdeductamt) +/obj/item/weapon/melee/baton/proc/deductcharge(chrgdeductamt) if(bcell) if(bcell.charge < (hitcost+chrgdeductamt)) // If after the deduction the baton doesn't have enough charge for a stun hit it turns off. status = 0 diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index c113a3eeb26..edaf38870f1 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -45,7 +45,7 @@ return -/obj/item/weapon/tank/jetpack/proc/allow_thrust(num, mob/living/user as mob) +/obj/item/weapon/tank/jetpack/proc/allow_thrust(num, mob/living/user) if(!(src.on)) return 0 if((num < 0.005 || src.air_contents.total_moles() < num)) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index b4010cc839d..1c9227216d2 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -86,7 +86,7 @@ src.air_contents.toxins = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return -/obj/item/weapon/tank/internals/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/tank/internals/plasma/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/flamethrower)) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index a275f3bb36d..eb41ea7032d 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -79,7 +79,7 @@ qdel(src) -/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/tank/attackby(obj/item/weapon/W, mob/user, params) ..() src.add_fingerprint(user) @@ -92,7 +92,7 @@ if(istype(W, /obj/item/device/assembly_holder)) bomb_assemble(W,user) -/obj/item/weapon/tank/attack_self(mob/user as mob) +/obj/item/weapon/tank/attack_self(mob/user) if (!(src.air_contents)) return diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 08808afdc04..8090aaade77 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -69,7 +69,7 @@ ..() return -/obj/item/weapon/watertank/attack_hand(mob/user as mob) +/obj/item/weapon/watertank/attack_hand(mob/user) if(src.loc == user) ui_action_click() return @@ -125,7 +125,7 @@ loc = tank return -/obj/item/weapon/reagent_containers/spray/mister/dropped(mob/user as mob) +/obj/item/weapon/reagent_containers/spray/mister/dropped(mob/user) user << "The mister snaps back onto the watertank." tank.on = 0 loc = tank @@ -133,7 +133,7 @@ /obj/item/weapon/reagent_containers/spray/mister/attack_self() return -/proc/check_tank_exists(parent_tank, var/mob/living/carbon/human/M, var/obj/O) +/proc/check_tank_exists(parent_tank, mob/living/carbon/human/M, obj/O) if (!parent_tank || !istype(parent_tank, /obj/item/weapon/watertank)) //To avoid weird issues from admin spawns M.unEquip(O) qdel(0) @@ -194,7 +194,7 @@ /obj/item/weapon/watertank/atmos/make_noz() return new /obj/item/weapon/extinguisher/mini/nozzle(src) -/obj/item/weapon/watertank/atmos/dropped(mob/user as mob) +/obj/item/weapon/watertank/atmos/dropped(mob/user) icon_state = "waterbackpackatmos" if(istype(noz, /obj/item/weapon/extinguisher/mini/nozzle)) var/obj/item/weapon/extinguisher/mini/nozzle/N = noz @@ -232,7 +232,7 @@ loc = tank return -/obj/item/weapon/extinguisher/mini/nozzle/attack_self(mob/user as mob) +/obj/item/weapon/extinguisher/mini/nozzle/attack_self(mob/user) switch(nozzle_mode) if(EXTINGUISHER) nozzle_mode = NANOFROST @@ -251,7 +251,7 @@ return return -/obj/item/weapon/extinguisher/mini/nozzle/dropped(mob/user as mob) +/obj/item/weapon/extinguisher/mini/nozzle/dropped(mob/user) user << "The nozzle snaps back onto the tank!" tank.on = 0 loc = tank diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 22f3c6ef990..0a9af02493f 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -24,7 +24,7 @@ materials = list(MAT_METAL=400) origin_tech = "magnets=1" -/obj/item/weapon/locator/attack_self(mob/user as mob) +/obj/item/weapon/locator/attack_self(mob/user) user.set_machine(src) var/dat if (src.temp) @@ -136,7 +136,7 @@ Frequency: origin_tech = "magnets=1;bluespace=3" var/active_portals = 0 -/obj/item/weapon/hand_tele/attack_self(mob/user as mob) +/obj/item/weapon/hand_tele/attack_self(mob/user) var/turf/current_location = get_turf(user)//What turf is the user on? if(!current_location||current_location.z==2||current_location.z>=7 || !istype(user.loc, /turf))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf user << "\The [src] is malfunctioning." diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 213faa834c0..75f5e0d2f52 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -88,7 +88,7 @@ src.pixel_y = rand(0, 16) return -/obj/item/weapon/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) if(!istype(M)) return ..() if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head") return ..() diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 71ab242d878..779df4e79c1 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -66,14 +66,14 @@ user.put_in_inactive_hand(O) return -/obj/item/weapon/twohanded/mob_can_equip(M as mob, slot) +/obj/item/weapon/twohanded/mob_can_equip(mob/M, slot) //Cannot equip wielded items. if(wielded) M << "Unwield the [name] first!" return 0 return ..() -/obj/item/weapon/twohanded/dropped(mob/user as mob) +/obj/item/weapon/twohanded/dropped(mob/user) //handles unwielding a twohanded weapon when dropped as well as clearing up the offhand if(user) var/obj/item/weapon/twohanded/O = user.get_inactive_hand() @@ -84,7 +84,7 @@ /obj/item/weapon/twohanded/update_icon() return -/obj/item/weapon/twohanded/attack_self(mob/user as mob) +/obj/item/weapon/twohanded/attack_self(mob/user) ..() if(wielded) //Trying to unwield it unwield(user) @@ -120,7 +120,7 @@ /obj/item/weapon/twohanded/required/attack_self() return -/obj/item/weapon/twohanded/required/mob_can_equip(M as mob, slot) +/obj/item/weapon/twohanded/required/mob_can_equip(mob/M, slot) if(wielded) M << "[src.name] is too cumbersome to carry with anything but your hands!" return 0 @@ -161,7 +161,7 @@ icon_state = "fireaxe[wielded]" return -/obj/item/weapon/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/weapon/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) if(!proximity) return if(A && wielded && (istype(A,/obj/structure/window) || istype(A,/obj/structure/grille))) //destroys windows and grilles in one hit if(istype(A,/obj/structure/window)) //should just make a window.Break() proc but couldn't bother with it @@ -210,7 +210,7 @@ clean_blood()//blood overlays get weird otherwise, because the sprite changes. return -/obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/carbon/human/user as mob) +/obj/item/weapon/twohanded/dualsaber/attack(mob/target, mob/living/carbon/human/user) ..() if(user.disabilities & CLUMSY && (wielded) && prob(40)) impale(user) @@ -221,7 +221,7 @@ user.dir = i sleep(1) -/obj/item/weapon/twohanded/dualsaber/proc/impale(mob/living/user as mob) +/obj/item/weapon/twohanded/dualsaber/proc/impale(mob/living/user) user << "You twirl around a bit before losing your balance and impaling yourself on \the [src]." if (force_wielded) user.take_organ_damage(20,25) @@ -263,7 +263,7 @@ New() item_color = "red" -/obj/item/weapon/twohanded/dualsaber/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/twohanded/dualsaber/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/device/multitool)) if(hacked == 0) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 8358ccd751f..532d4958b22 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -107,7 +107,7 @@ materials = list(MAT_METAL=1875) attack_verb = list("hit", "bludgeoned", "whacked", "bonked") -/obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/wirerod/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/weapon/shard)) var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 5544f13fb30..04ca7d61176 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -103,7 +103,7 @@ /mob/proc/unset_machine() src.machine = null -/mob/proc/set_machine(var/obj/O) +/mob/proc/set_machine(obj/O) if(src.machine) unset_machine() src.machine = O @@ -161,7 +161,7 @@ var/turf/T = get_turf(src) return T.storage_contents_dump_act(src_object, user) -/obj/fire_act(var/global_overlay=1) +/obj/fire_act(global_overlay=1) if(!burn_state) burn_state = 1 SSobj.burning += src diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 8fe14f6d13c..f294c90122c 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -10,7 +10,7 @@ var/obj/item/device/mmi/brain = null -/obj/structure/AIcore/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/structure/AIcore/attackby(obj/item/P, mob/user, params) switch(state) if(0) if(istype(P, /obj/item/weapon/wrench)) @@ -204,7 +204,7 @@ anchored = 1 state = 20//So it doesn't interact based on the above. Not really necessary. -/obj/structure/AIcore/deactivated/attackby(var/obj/item/A as obj, var/mob/user as mob, params) +/obj/structure/AIcore/deactivated/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/device/aicard))//Is it? A.transfer_ai("INACTIVE","AICARD",src,user) if(istype(A, /obj/item/weapon/wrench)) @@ -230,7 +230,7 @@ That prevents a few funky behaviors. //The type of interaction, the player performing the operation, the AI itself, and the card object, if any. -atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(istype(card)) if(card.flush) user << "ERROR: AI flush is in progress, cannot execute transfer protocol." @@ -238,7 +238,7 @@ atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/A return 1 -/obj/structure/AIcore/deactivated/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +/obj/structure/AIcore/deactivated/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) return //Transferring a carded AI to a core. diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index ae56de30fb6..859af196a46 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -15,7 +15,7 @@ //Adding canvases -/obj/structure/easel/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/easel/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/canvas)) var/obj/item/weapon/canvas/C = I user.unEquip(C) @@ -81,7 +81,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES] //One pixel increments -/obj/item/weapon/canvas/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/weapon/canvas/attackby(obj/item/I, mob/user, params) //Click info var/list/click_params = params2list(params) var/pixX = text2num(click_params["icon-x"]) @@ -116,7 +116,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES] ..() //Clean the whole canvas -/obj/item/weapon/canvas/attack_self(var/mob/user) +/obj/item/weapon/canvas/attack_self(mob/user) if(!user) return var/icon/blank = getGlobalBackup() diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index aa8e229a0bb..7c4637a2df8 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -31,7 +31,7 @@ -/obj/structure/sign/barsign/proc/set_sign(var/datum/barsign/sign) +/obj/structure/sign/barsign/proc/set_sign(datum/barsign/sign) if(!istype(sign)) return icon_state = sign.icon @@ -43,12 +43,12 @@ -/obj/structure/sign/barsign/attack_ai(mob/user as mob) +/obj/structure/sign/barsign/attack_ai(mob/user) return src.attack_hand(user) -/obj/structure/sign/barsign/attack_hand(mob/user as mob) +/obj/structure/sign/barsign/attack_hand(mob/user) if (!src.allowed(user)) user << "Access denied." return @@ -60,7 +60,7 @@ -/obj/structure/sign/barsign/attackby(var/obj/item/I, var/mob/user) +/obj/structure/sign/barsign/attackby(obj/item/I, mob/user) if(!allowed(user)) user << "Access denied." return diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index c27a4f0513e..27c6aaebef1 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -24,7 +24,7 @@ LINEN BINS if(!attempt_initiate_surgery(src, M, user)) ..() -/obj/item/weapon/bedsheet/attack_self(mob/user as mob) +/obj/item/weapon/bedsheet/attack_self(mob/user) user.drop_item() if(layer == initial(layer)) layer = 5 @@ -205,7 +205,7 @@ LINEN BINS update_icon() return -/obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/bedsheet)) if(!user.drop_item()) return @@ -224,11 +224,11 @@ LINEN BINS -/obj/structure/bedsheetbin/attack_paw(mob/user as mob) +/obj/structure/bedsheetbin/attack_paw(mob/user) return attack_hand(user) -/obj/structure/bedsheetbin/attack_hand(mob/user as mob) +/obj/structure/bedsheetbin/attack_hand(mob/user) if(user.lying) return if(amount >= 1) @@ -254,7 +254,7 @@ LINEN BINS add_fingerprint(user) -/obj/structure/bedsheetbin/attack_tk(mob/user as mob) +/obj/structure/bedsheetbin/attack_tk(mob/user) if(amount >= 1) amount-- diff --git a/code/game/objects/structures/crates_lockers/bins.dm b/code/game/objects/structures/crates_lockers/bins.dm index 1663e45c8bd..603882086e4 100644 --- a/code/game/objects/structures/crates_lockers/bins.dm +++ b/code/game/objects/structures/crates_lockers/bins.dm @@ -25,7 +25,7 @@ else overlays += orangelight -/obj/structure/closet/crate/bin/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/closet/crate/bin/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/storage/bag/trash)) var/obj/item/weapon/storage/bag/trash/T = W user << "You fill the bag." @@ -43,7 +43,7 @@ else ..() -/obj/structure/closet/crate/bin/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) +/obj/structure/closet/crate/bin/MouseDrop_T(atom/movable/O as mob|obj, mob/user) . = ..(O, user, 0, 0, 0) if(.) if(O != user) @@ -76,12 +76,12 @@ playsound(src.loc, sound_effect_close, 15, 1, -3) update_icon() -/obj/structure/closet/crate/bin/insert(var/obj/item/I, var/include_mobs = 0, var/animate = 0) +/obj/structure/closet/crate/bin/insert(obj/item/I, include_mobs = 0, animate = 0) . = ..(I, include_mobs) if(animate && .) do_animate() -/obj/structure/closet/crate/bin/place(var/mob/user, var/obj/item/I) +/obj/structure/closet/crate/bin/place(mob/user, obj/item/I) if(contents.len >= storage_capacity) return 1 if(!opened && user.drop_item()) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 08ea4e09edd..a72592a458e 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -111,7 +111,7 @@ update_icon() return 1 -/obj/structure/closet/proc/insert(var/atom/movable/AM) +/obj/structure/closet/proc/insert(atom/movable/AM) if(contents.len >= storage_capacity) return -1 @@ -165,7 +165,7 @@ qdel(src) ..() -/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/closet/bullet_act(obj/item/projectile/Proj) ..() if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage @@ -174,7 +174,7 @@ qdel(src) return -/obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob) +/obj/structure/closet/attack_animal(mob/living/simple_animal/user) if(user.environment_smash) user.do_attack_animation(src) visible_message("[user] destroys \the [src].") @@ -187,7 +187,7 @@ qdel(src) -/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/closet/attackby(obj/item/weapon/W, mob/user, params) if(user.loc == src) return if(opened) @@ -241,13 +241,13 @@ if(!place(user, W) && !isnull(W)) attack_hand(user) -/obj/structure/closet/proc/place(var/mob/user, var/obj/item/I) +/obj/structure/closet/proc/place(mob/user, obj/item/I) if(!opened && secure) togglelock(user) return 1 return 0 -/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob, var/needs_opened = 1, var/show_message = 1, var/move_them = 1) +/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user, needs_opened = 1, show_message = 1, move_them = 1) if(istype(O, /obj/screen)) //fix for HUD elements making their way into the world -Pete return 0 if(!isturf(O.loc)) @@ -269,7 +269,7 @@ add_fingerprint(user) return 1 -/obj/structure/closet/relaymove(mob/user as mob) +/obj/structure/closet/relaymove(mob/user) if(user.stat || !isturf(loc)) return if(!open()) @@ -280,10 +280,10 @@ M.show_message("BANG, bang!", 2) -/obj/structure/closet/attack_paw(mob/user as mob) +/obj/structure/closet/attack_paw(mob/user) return attack_hand(user) -/obj/structure/closet/attack_hand(mob/user as mob) +/obj/structure/closet/attack_hand(mob/user) add_fingerprint(user) if(user.lying && get_dist(src, user) > 0) return @@ -293,7 +293,7 @@ return // tk grab then use on self -/obj/structure/closet/attack_self_tk(mob/user as mob) +/obj/structure/closet/attack_self_tk(mob/user) return attack_hand(user) /obj/structure/closet/verb/verb_toggleopen() @@ -350,7 +350,7 @@ else user << "You fail to break out of [src]!" -/obj/structure/closet/AltClick(var/mob/user) +/obj/structure/closet/AltClick(mob/user) ..() if(!user.canUseTopic(user) || broken) user << "You can't do that right now!" @@ -375,7 +375,7 @@ req_access += pick(get_all_accesses()) ..() -/obj/structure/closet/proc/togglelock(mob/user as mob) +/obj/structure/closet/proc/togglelock(mob/user) if(secure) if(allowed(user)) locked = !locked @@ -389,7 +389,7 @@ else return -/obj/structure/closet/emag_act(mob/user as mob) +/obj/structure/closet/emag_act(mob/user) if(secure && !broken) broken = 1 locked = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm index 4854cdcdf89..512dec56d03 100644 --- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm @@ -30,7 +30,7 @@ locked = 1 return 1 -/obj/structure/closet/critter/attack_hand(mob/user as mob) +/obj/structure/closet/critter/attack_hand(mob/user) src.add_fingerprint(user) if(src.loc == user.loc) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 908c05c33d8..1d6d2d57629 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -34,7 +34,7 @@ new /obj/item/weapon/storage/backpack/satchel/withwallet( src ) new /obj/item/device/radio/headset( src ) -/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params) if(istype(W)) var/obj/item/weapon/card/id/I = W.GetID() diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 7d1c5c2bffe..4022c003311 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -108,7 +108,7 @@ /obj/structure/closet/statue/toggle() return -/obj/structure/closet/statue/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/closet/statue/bullet_act(obj/item/projectile/Proj) health -= Proj.damage if(health <= 0) for(var/mob/M in src) @@ -116,7 +116,7 @@ return -/obj/structure/closet/statue/attack_animal(mob/living/simple_animal/user as mob) +/obj/structure/closet/statue/attack_animal(mob/living/simple_animal/user) if(user.environment_smash) for(var/mob/M in src) shatter(M) @@ -125,7 +125,7 @@ for(var/mob/M in src) shatter(M) -/obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/closet/statue/attackby(obj/item/I, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) health -= I.force visible_message("[user] strikes [src] with [I].") @@ -151,7 +151,7 @@ /obj/structure/closet/statue/update_icon() return -/obj/structure/closet/statue/proc/shatter(mob/user as mob) +/obj/structure/closet/statue/proc/shatter(mob/user) if (user) user.dust() dump_contents() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 14a4fe411bd..aab27eea79b 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -172,7 +172,7 @@ update_icon() return 1 -/obj/structure/closet/crate/insert(var/atom/movable/AM, var/include_mobs = 0) +/obj/structure/closet/crate/insert(atom/movable/AM, include_mobs = 0) if(contents.len >= storage_capacity) return -1 @@ -194,7 +194,7 @@ AM.loc = src return 1 -/obj/structure/closet/crate/proc/tear_manifest(mob/user as mob) +/obj/structure/closet/crate/proc/tear_manifest(mob/user) user << "You tear the manifest off of the crate." playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.loc = loc @@ -203,7 +203,7 @@ manifest = null overlays-="manifest" -/obj/structure/closet/crate/attack_hand(mob/user as mob) +/obj/structure/closet/crate/attack_hand(mob/user) if(manifest) tear_manifest(user) return @@ -221,7 +221,7 @@ open() return -/obj/structure/closet/crate/secure/attack_hand(mob/user as mob) +/obj/structure/closet/crate/secure/attack_hand(mob/user) if(manifest) tear_manifest(user) return @@ -238,7 +238,7 @@ else ..() -/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/card) && src.allowed(user) && !locked && !opened && !broken) user << "You lock \the [src]." src.locked = 1 @@ -248,7 +248,7 @@ return ..() -/obj/structure/closet/crate/secure/emag_act(mob/user as mob) +/obj/structure/closet/crate/secure/emag_act(mob/user) if(locked && !broken) src.locked = 0 src.broken = 1 @@ -259,10 +259,10 @@ user << "You unlock \the [src]." add_fingerprint(user) -/obj/structure/closet/crate/attack_paw(mob/user as mob) +/obj/structure/closet/crate/attack_paw(mob/user) return attack_hand(user) -/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/closet/crate/attackby(obj/item/weapon/W, mob/user, params) if(opened) if(isrobot(user)) return diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 8e13052eaec..8db0996befc 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -16,7 +16,7 @@ if(manifest) overlays += "manifest" -/obj/structure/largecrate/attack_hand(mob/user as mob) +/obj/structure/largecrate/attack_hand(mob/user) if(manifest) user << "You tear the manifest off of the crate." playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) @@ -30,7 +30,7 @@ user << "You need a crowbar to pry this open!" return -/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/largecrate/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/crowbar)) if(manifest) manifest.loc = loc diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 8c645b59f96..148202d59e6 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -28,7 +28,7 @@ src.healthcheck() -/obj/structure/displaycase/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/displaycase/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage ..() @@ -71,17 +71,17 @@ return -/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/displaycase/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) src.health -= W.force src.healthcheck() ..() return -/obj/structure/displaycase/attack_paw(mob/user as mob) +/obj/structure/displaycase/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/displaycase/attack_hand(mob/user as mob) +/obj/structure/displaycase/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) if (src.destroyed && src.occupied) new /obj/item/weapon/gun/energy/laser/captain( src.loc ) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index ae3ddf23055..6f5809891e2 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -334,7 +334,7 @@ mineral = "glass" icon_state = "door_as_gviro1" -/obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/door_assembly/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/pen)) var/t = stripped_input(user, "Enter the name for the door.", src.name, src.created_name,MAX_NAME_LEN) if(!t) diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 30f4841cac3..cf6d55311ab 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -6,7 +6,7 @@ density = 1 anchored = 1 -/obj/structure/dresser/attack_hand(mob/user as mob) +/obj/structure/dresser/attack_hand(mob/user) if(!Adjacent(user))//no tele-grooming return if(ishuman(user)) diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index d3fc4a8b3da..572ae4a133a 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -10,7 +10,7 @@ overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir) return -/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) var/obj/structure/stool/bed/chair/C = new /obj/structure/stool/bed/chair(loc) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index 338c90f3fab..ad517849659 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -14,7 +14,7 @@ ..() update_icon() -/obj/structure/fireaxecabinet/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/fireaxecabinet/attackby(obj/item/I, mob/user, params) if(isrobot(user) || istype(I,/obj/item/device/multitool)) toggle_lock(user) return @@ -60,7 +60,7 @@ if(3.0) return -/obj/structure/fireaxecabinet/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/fireaxecabinet/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) if(Proj.damage) glass_hp -= Proj.damage @@ -73,7 +73,7 @@ fireaxe.loc = src.loc qdel(src) -/obj/structure/fireaxecabinet/attack_hand(mob/user as mob) +/obj/structure/fireaxecabinet/attack_hand(mob/user) if(open || glass_hp <= 0) if(fireaxe) user.put_in_hands(fireaxe) @@ -90,12 +90,12 @@ update_icon() return -/obj/structure/fireaxecabinet/attack_paw(mob/user as mob) +/obj/structure/fireaxecabinet/attack_paw(mob/user) if(ismonkey(user)) //no fire-axe wielding aliens allowed attack_hand(user) return -/obj/structure/fireaxecabinet/attack_ai(mob/user as mob) +/obj/structure/fireaxecabinet/attack_ai(mob/user) toggle_lock(user) return diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 69f0b31aaa2..8638ab62db3 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -13,7 +13,7 @@ var/state = GIRDER_NORMAL var/girderpasschance = 20 // percentage chance that a projectile passes through the girder. -/obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/girder/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if(istype(W, /obj/item/weapon/screwdriver) && state == GIRDER_DISPLACED) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) @@ -284,7 +284,7 @@ density = 1 layer = 2 -/obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/cultgirder/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index caf820d48d3..488932acaa4 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -26,7 +26,7 @@ if(ismob(user)) shock(user, 70) -/obj/structure/grille/attack_paw(mob/user as mob) +/obj/structure/grille/attack_paw(mob/user) attack_hand(user) /obj/structure/grille/attack_hulk(mob/living/carbon/human/user) @@ -35,7 +35,7 @@ health -= 5 healthcheck() -/obj/structure/grille/attack_hand(mob/living/user as mob) +/obj/structure/grille/attack_hand(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) @@ -49,7 +49,7 @@ health -= rand(1,2) healthcheck() -/obj/structure/grille/attack_alien(mob/living/user as mob) +/obj/structure/grille/attack_alien(mob/living/user) user.do_attack_animation(src) if(istype(user, /mob/living/carbon/alien/larva)) return user.changeNext_move(CLICK_CD_MELEE) @@ -63,7 +63,7 @@ healthcheck() return -/obj/structure/grille/attack_slime(mob/living/simple_animal/slime/user as mob) +/obj/structure/grille/attack_slime(mob/living/simple_animal/slime/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(!user.is_adult) return @@ -77,7 +77,7 @@ healthcheck() return -/obj/structure/grille/attack_animal(var/mob/living/simple_animal/M as mob) +/obj/structure/grille/attack_animal(var/mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) if(M.melee_damage_upper == 0) return M.do_attack_animation(src) @@ -133,7 +133,7 @@ var/obj/item/stack/rods/newrods = new(loc) transfer_fingerprints_to(newrods) -/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/grille/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) add_fingerprint(user) if(istype(W, /obj/item/weapon/wirecutters)) @@ -225,7 +225,7 @@ // shock user with probability prb (if all connections & power are working) // returns 1 if shocked, 0 otherwise -/obj/structure/grille/proc/shock(mob/user as mob, prb) +/obj/structure/grille/proc/shock(mob/user, prb) if(!anchored || destroyed) // anchored/destroyed grilles are never connected return 0 if(!prob(prb)) @@ -264,4 +264,4 @@ healthcheck() /obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) - return 0 + return 0 diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index bd6953ef7e0..58ff54da606 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -301,7 +301,7 @@ buckled_mob.pixel_y = 7 -/obj/structure/stool/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/stool/bed/chair/janicart/bullet_act(obj/item/projectile/Proj) if(buckled_mob) buckled_mob.bullet_act(Proj) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 4cd8cae36e3..07936884c99 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -22,10 +22,10 @@ var/skin = 0 var/skintype = null -/obj/structure/kitchenspike/attack_paw(mob/user as mob) +/obj/structure/kitchenspike/attack_paw(mob/user) return src.attack_hand(usr) -/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G as obj, mob/user as mob, params) +/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G, mob/user, params) if(!istype(G, /obj/item/weapon/grab)) return if(istype(G.affecting, /mob/living/carbon/monkey)) @@ -80,7 +80,7 @@ // else if(istype(C, /obj/mob/carbon/alien) && !istype(C, /mob/living/carbon/alien/larva/slime)) // else if(istype(C, /obj/livestock/spesscarp -/obj/structure/kitchenspike/attack_hand(mob/user as mob) +/obj/structure/kitchenspike/attack_hand(mob/user) if(..()) return if(src.occupied) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 98e64467ee0..cf11b1d782b 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -36,7 +36,7 @@ else //wtf make your ladders properly assholes icon_state = "ladder00" -/obj/structure/ladder/attack_hand(mob/user as mob) +/obj/structure/ladder/attack_hand(mob/user) if(up && down) switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") ) if("Up") @@ -66,8 +66,8 @@ add_fingerprint(user) -/obj/structure/ladder/attack_paw(mob/user as mob) +/obj/structure/ladder/attack_paw(mob/user) return attack_hand(user) -/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user, params) return attack_hand(user) \ No newline at end of file diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 7178f8c35ac..e1944e4d6bc 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -26,7 +26,7 @@ src.healthcheck() -/obj/structure/lamarr/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/lamarr/bullet_act(obj/item/projectile/Proj) health -= Proj.damage ..() src.healthcheck() @@ -60,17 +60,17 @@ return -/obj/structure/lamarr/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/lamarr/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) src.health -= W.force src.healthcheck() ..() return -/obj/structure/lamarr/attack_paw(mob/user as mob) +/obj/structure/lamarr/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/lamarr/attack_hand(mob/user as mob) +/obj/structure/lamarr/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) if (src.destroyed) return diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 957662253fb..d325cf514fb 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -50,7 +50,7 @@ else return -/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob, params) +/obj/structure/lattice/attackby(obj/item/C, mob/user, params) var/turf/T = get_turf(src) if (istype(C, /obj/item/stack/tile/plasteel)) T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead (for building plating) @@ -107,7 +107,7 @@ C.Deconstruct() ..() -/obj/structure/lattice/catwalk/attackby(obj/item/C as obj, mob/user as mob, params) +/obj/structure/lattice/catwalk/attackby(obj/item/C, mob/user, params) ..() if(istype(C, /obj/item/stack/cable_coil)) var/turf/T = get_turf(src) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 50597091b3b..4901a0dc34b 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -9,7 +9,7 @@ var/shattered = 0 -/obj/structure/mirror/attack_hand(mob/user as mob) +/obj/structure/mirror/attack_hand(mob/user) if(shattered) return if(ishuman(user)) @@ -46,7 +46,7 @@ desc = "Oh no, seven years of bad luck!" -/obj/structure/mirror/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/mirror/bullet_act(obj/item/projectile/Proj) if(prob(Proj.damage * 2)) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) if(!shattered) @@ -56,7 +56,7 @@ ..() -/obj/structure/mirror/attackby(obj/item/I as obj, mob/living/user as mob, params) +/obj/structure/mirror/attackby(obj/item/I, mob/living/user, params) user.do_attack_animation(src) if(I.damtype == STAMINA) return @@ -72,7 +72,7 @@ playsound(src.loc, 'sound/effects/Glasshit.ogg', 70, 1) -/obj/structure/mirror/attack_alien(mob/living/user as mob) +/obj/structure/mirror/attack_alien(mob/living/user) user.do_attack_animation(src) if(islarva(user)) return if(shattered) @@ -82,7 +82,7 @@ shatter() -/obj/structure/mirror/attack_animal(mob/living/user as mob) +/obj/structure/mirror/attack_animal(mob/living/user) if(!isanimal(user)) return var/mob/living/simple_animal/M = user if(M.melee_damage_upper <= 0) return @@ -94,7 +94,7 @@ shatter() -/obj/structure/mirror/attack_slime(mob/living/user as mob) +/obj/structure/mirror/attack_slime(mob/living/user) user.do_attack_animation(src) if(shattered) playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) @@ -123,7 +123,7 @@ choosable_races += S.id ..() -/obj/structure/mirror/magic/attack_hand(mob/user as mob) +/obj/structure/mirror/magic/attack_hand(mob/user) if(!ishuman(user)) return diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 526e9e3f028..d3565376d41 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -41,10 +41,10 @@ /obj/structure/bodycontainer/alter_health() return src.loc -/obj/structure/bodycontainer/attack_paw(mob/user as mob) +/obj/structure/bodycontainer/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/bodycontainer/attack_hand(mob/user as mob) +/obj/structure/bodycontainer/attack_hand(mob/user) if(locked) user << "It's locked." return @@ -57,7 +57,7 @@ close() add_fingerprint(user) -/obj/structure/bodycontainer/attackby(P as obj, mob/user as mob, params) +/obj/structure/bodycontainer/attackby(obj/P, mob/user, params) if (istype(P, /obj/item/weapon/pen)) var/t = stripped_input(user, "What would you like the label to be?", text("[]", name), null) if (user.get_active_hand() != P) @@ -159,7 +159,7 @@ var/global/list/crematoriums = new/list() return -/obj/structure/bodycontainer/crematorium/proc/cremate(mob/user as mob) +/obj/structure/bodycontainer/crematorium/proc/cremate(mob/user) if(locked) return //don't let you cremate something twice or w/e @@ -197,7 +197,7 @@ var/global/list/crematoriums = new/list() /* Crematorium Switch */ -/obj/machinery/crema_switch/attack_hand(mob/user as mob) +/obj/machinery/crema_switch/attack_hand(mob/user) if(src.allowed(usr)) for (var/obj/structure/bodycontainer/crematorium/C in crematoriums) if (C.id != id) @@ -208,7 +208,7 @@ Crematorium Switch usr << "Access denied." return -/obj/machinery/crema_switch/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/machinery/crema_switch/attackby(obj/item/W, mob/user, params) if(W.GetID()) attack_hand(user) else @@ -235,17 +235,17 @@ Crematorium Switch connected = null ..() -/obj/structure/tray/attack_paw(mob/user as mob) +/obj/structure/tray/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/tray/attack_hand(mob/user as mob) +/obj/structure/tray/attack_hand(mob/user) if (src.connected) connected.close() add_fingerprint(user) else user << "That's not connected to anything!" -/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) +/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user) if(!istype(O, /atom/movable) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user) return if(!ismob(O)) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index f977e561a54..d0aa327980c 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -27,7 +27,7 @@ // note is a number from 1-7 for A-G // acc is either "b", "n", or "#" // oct is 1-8 (or 9 for C) -/datum/song/proc/playnote(var/note, var/acc as text, var/oct) +/datum/song/proc/playnote(note, acc as text, oct) // handle accidental -> B<>C of E<>F if(acc == "b" && (note == 3 || note == 6)) // C or F if(note == 3) @@ -63,7 +63,7 @@ continue M.playsound_local(source, soundfile, 100, falloff = 5) -/datum/song/proc/updateDialog(mob/user as mob) +/datum/song/proc/updateDialog(mob/user) instrumentObj.updateDialog() // assumes it's an object in world, override if otherwise /datum/song/proc/shouldStopPlaying(mob/user) @@ -74,7 +74,7 @@ else return 1 -/datum/song/proc/playsong(mob/user as mob) +/datum/song/proc/playsong(mob/user) while(repeat >= 0) var/cur_oct[7] var/cur_acc[7] @@ -119,7 +119,7 @@ repeat = 0 updateDialog(user) -/datum/song/proc/interact(mob/user as mob) +/datum/song/proc/interact(mob/user) var/dat = "" if(lines.len > 0) @@ -285,7 +285,7 @@ // subclass for handheld instruments, like violin /datum/song/handheld -/datum/song/handheld/updateDialog(mob/user as mob) +/datum/song/handheld/updateDialog(mob/user) instrumentObj.interact(user) /datum/song/handheld/shouldStopPlaying() @@ -328,23 +328,23 @@ song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded ..() -/obj/structure/piano/attack_hand(mob/user as mob) +/obj/structure/piano/attack_hand(mob/user) if(!user.IsAdvancedToolUser()) user << "You don't have the dexterity to do this!" return 1 interact(user) -/obj/structure/piano/attack_paw(mob/user as mob) +/obj/structure/piano/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/piano/interact(mob/user as mob) +/obj/structure/piano/interact(mob/user) if(!user || !anchored) return user.set_machine(src) song.interact(user) -/obj/structure/piano/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/structure/piano/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 7d8591217f6..54fb5414f9c 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -16,7 +16,7 @@ icon_state = "nboard0[notices]" //attaching papers!! -/obj/structure/noticeboard/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params) +/obj/structure/noticeboard/attackby(obj/item/weapon/O, mob/user, params) if(istype(O, /obj/item/weapon/paper)) if(notices < 5) if(!user.drop_item()) @@ -30,7 +30,7 @@ else user << "You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached." -/obj/structure/noticeboard/attack_hand(user as mob) +/obj/structure/noticeboard/attack_hand(mob/user) var/dat = "Noticeboard
    " for(var/obj/item/weapon/paper/P in src) dat += "[P.name] Write Remove
    " diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 1676e9ae16c..027095266fb 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -39,7 +39,7 @@ FLOOR SAFES I.loc = src -/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear) +/obj/structure/safe/proc/check_unlocked(mob/user, canhear) if(user && canhear) if(tumbler_1_pos == tumbler_1_open) user << "You hear a [pick("tonk", "krunk", "plunk")] from [src]." @@ -72,7 +72,7 @@ FLOOR SAFES icon_state = initial(icon_state) -/obj/structure/safe/attack_hand(mob/user as mob) +/obj/structure/safe/attack_hand(mob/user) user.set_machine(src) var/dat = "
    " dat += "[open ? "Close" : "Open"] [src] | - [dial * 5] +" @@ -142,7 +142,7 @@ FLOOR SAFES updateUsrDialog() -/obj/structure/safe/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/safe/attackby(obj/item/I, mob/user, params) if(open) if(I.w_class + space <= maxspace) space += I.w_class diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index 22d2333b092..ce2f47c59a2 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -14,17 +14,17 @@ desc = "[initial(desc)] The planchette is sitting at \"[planchette]\"." ..() -/obj/structure/spirit_board/attack_hand(mob/user as mob) +/obj/structure/spirit_board/attack_hand(mob/user) if(..()) return spirit_board_pick_letter(user) -/obj/structure/spirit_board/attack_ghost(mob/dead/observer/user as mob) +/obj/structure/spirit_board/attack_ghost(mob/dead/observer/user) spirit_board_pick_letter(user) -/obj/structure/spirit_board/proc/spirit_board_pick_letter(var/mob/M) +/obj/structure/spirit_board/proc/spirit_board_pick_letter(mob/M) if(!spirit_board_checks(M)) return 0 @@ -43,7 +43,7 @@ visible_message("The planchette slowly moves... and stops at the letter \"[planchette]\".") -/obj/structure/spirit_board/proc/spirit_board_checks(var/mob/M) +/obj/structure/spirit_board/proc/spirit_board_checks(mob/M) //cooldown var/bonus = 0 if(M.ckey == lastuser) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index d68eef7270d..00ec5462738 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -16,7 +16,7 @@ density = 0 ..() -/obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user as mob, params) +/obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user, params) add_fingerprint(user) user.changeNext_move(CLICK_CD_MELEE) if(istype(W, /obj/item/weapon/wrench)) @@ -80,7 +80,7 @@ ..() CheckHardness() -/obj/structure/statue/attack_hand(mob/living/user as mob) +/obj/structure/statue/attack_hand(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) add_fingerprint(user) user.visible_message("[user] rubs some dust off from the [name]'s surface.", \ @@ -198,14 +198,14 @@ PlasmaBurn(exposed_temperature) -/obj/structure/statue/plasma/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/statue/plasma/bullet_act(obj/item/projectile/Proj) if(istype(Proj,/obj/item/projectile/beam)) PlasmaBurn(2500) else if(istype(Proj,/obj/item/projectile/ion)) PlasmaBurn(500) ..() -/obj/structure/statue/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/statue/plasma/attackby(obj/item/weapon/W, mob/user, params) if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite message_admins("Plasma statue ignited by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1) log_game("Plasma statue ignited by [key_name(user)] in ([x],[y],[z])") diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 0a7112be964..6f96e87bdbb 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -15,7 +15,7 @@ nest_overlay = image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2) return ..() -/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user as mob) +/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user) if(buckled_mob && buckled_mob.buckled == src) var/mob/living/M = buckled_mob if(M != user) @@ -42,7 +42,7 @@ unbuckle_mob() add_fingerprint(user) -/obj/structure/stool/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob) +/obj/structure/stool/bed/nest/user_buckle_mob(mob/M, mob/user) if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) ) return @@ -71,7 +71,7 @@ M.layer = initial(M.layer) overlays -= nest_overlay -/obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/bed/nest/attackby(obj/item/weapon/W, mob/user, params) var/aforce = W.force health = max(0, health - aforce) playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 731c32880d7..2d97ac46aec 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -33,7 +33,7 @@ . = 0 buckled_mob.buckled = src -/obj/structure/stool/bed/Process_Spacemove(var/movement_dir = 0) +/obj/structure/stool/bed/Process_Spacemove(movement_dir = 0) if(buckled_mob) return buckled_mob.Process_Spacemove(movement_dir) return ..() @@ -43,10 +43,10 @@ return 1 return ..() -/obj/structure/stool/bed/attack_paw(mob/user as mob) +/obj/structure/stool/bed/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever +/obj/structure/stool/bed/attack_animal(mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever if(M.environment_smash) new /obj/item/stack/sheet/metal(src.loc) qdel(src) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 1dea5a15dde..9335535a873 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -15,7 +15,7 @@ ..() handle_rotation() -/obj/structure/stool/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/bed/chair/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/assembly/shock_kit)) if(!user.drop_item()) @@ -28,7 +28,7 @@ SK.loc = E SK.master = E qdel(src) -/obj/structure/stool/bed/chair/attack_tk(mob/user as mob) +/obj/structure/stool/bed/chair/attack_tk(mob/user) if(buckled_mob) ..() else @@ -88,7 +88,7 @@ name = "wooden chair" desc = "Old is never too old to not be in fashion." -/obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/mineral/wood(src.loc) diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 9558537ebc8..696ed292eb9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -25,7 +25,7 @@ new /obj/item/stack/sheet/metal(src.loc) qdel(src) -/obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/metal(src.loc) diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 18288c5f670..0df8d67cd10 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -20,7 +20,7 @@ var/framestack = /obj/item/stack/rods var/framestackamount = 2 -/obj/structure/table_frame/attackby(var/obj/item/I, mob/user, params) +/obj/structure/table_frame/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench)) user << "You start disassembling [src]..." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) @@ -77,7 +77,7 @@ framestackamount = 2 burn_state = 0 //Burnable -/obj/structure/table_frame/wood/attackby(var/obj/item/I, mob/user, params) +/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench)) ..() if(istype(I, /obj/item/stack/sheet/mineral/wood)) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 02c24df2966..37f4730a836 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -193,7 +193,7 @@ #define TBL_DISASSEMBLE 2 #define TBL_DECONSTRUCT 3 -/obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user) +/obj/structure/table/proc/table_destroy(destroy_type, mob/user) if(destroy_type == TBL_DESTROY) for(var/i = 1, i <= framestackamount, i++) @@ -318,7 +318,7 @@ buildstack = /obj/item/stack/sheet/plasteel canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table) -/obj/structure/table/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/table/reinforced/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) @@ -397,7 +397,7 @@ else return 0 -/obj/structure/rack/MouseDrop_T(obj/O as obj, mob/user as mob) +/obj/structure/rack/MouseDrop_T(obj/O, mob/user) if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O)) return if(isrobot(user)) @@ -409,7 +409,7 @@ step(O, get_dir(O, src)) return -/obj/structure/rack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/rack/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) rack_destroy() @@ -483,7 +483,7 @@ flags = CONDUCT materials = list(MAT_METAL=3750) -/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( user.loc ) @@ -491,7 +491,7 @@ return return -/obj/item/weapon/rack_parts/attack_self(mob/user as mob) +/obj/item/weapon/rack_parts/attack_self(mob/user) user << "You start constructing rack..." if (do_after(user, 50, target = src)) if(!user.drop_item()) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 3cc45f3ac5e..67a0b441ce0 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -31,10 +31,10 @@ if(1 to 4) overlays += "plasma-[plasmatanks]" if(5 to INFINITY) overlays += "plasma-5" -/obj/structure/dispenser/attack_paw(mob/user as mob) +/obj/structure/dispenser/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/dispenser/attack_hand(mob/user as mob) +/obj/structure/dispenser/attack_hand(mob/user) if(!user.IsAdvancedToolUser()) user << "You don't have the dexterity to do this!" return 1 @@ -47,7 +47,7 @@ return -/obj/structure/dispenser/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/dispenser/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/tank/internals/oxygen) || istype(I, /obj/item/weapon/tank/internals/air) || istype(I, /obj/item/weapon/tank/internals/anesthetic)) if(oxygentanks < 10) if(!user.drop_item()) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index a767d3a4b25..0e8991bf7c0 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -42,7 +42,7 @@ //pod insertion -/obj/structure/transit_tube/station/MouseDrop_T(obj/structure/c_transit_tube_pod/R as obj, mob/user as mob) +/obj/structure/transit_tube/station/MouseDrop_T(obj/structure/c_transit_tube_pod/R, mob/user) if(!user.canmove || user.stat || user.restrained()) return if (!istype(R) || get_dist(user, src) > 1 || get_dist(src,R) > 1) @@ -58,7 +58,7 @@ qdel(R) -/obj/structure/transit_tube/station/attack_hand(mob/user as mob) +/obj/structure/transit_tube/station/attack_hand(mob/user) if(!pod_moving) for(var/obj/structure/transit_tube_pod/pod in loc) if(!pod.moving && pod.dir in directions()) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index f2ad5050c3b..e226e7215e6 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -10,7 +10,7 @@ anchored = 0.0 //wrapper for turn that changes the transit tube formatted icon_state instead of the dir -/obj/structure/c_transit_tube/proc/tube_turn(var/angle) +/obj/structure/c_transit_tube/proc/tube_turn(angle) var/list/badtubes = list("W-E", "W-E-Pass", "S-N", "S-N-Pass", "SW-NE", "SE-NW") var/list/split_text = text2list(icon_state, "-") for(var/i=1; i<=split_text.len; i++) @@ -77,7 +77,7 @@ R.generate_automatic_corners(R.tube_dirs) return R -/obj/structure/c_transit_tube/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/c_transit_tube/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench)) user << "You start attaching the [name]..." src.add_fingerprint(user) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index b846d4d847d..d56b46a45c6 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -25,7 +25,7 @@ ..() -/obj/structure/transit_tube_pod/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/transit_tube_pod/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/crowbar)) if(!moving) for(var/obj/structure/transit_tube/station/T in loc) @@ -60,7 +60,7 @@ return 1 else return ..() -/obj/structure/transit_tube_pod/proc/follow_tube(var/reverse_launch) +/obj/structure/transit_tube_pod/proc/follow_tube(reverse_launch) if(moving) return diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index de1e9952612..327159e3ad7 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -451,12 +451,12 @@ name = "puddle" icon_state = "puddle" -/obj/structure/sink/puddle/attack_hand(mob/M as mob) +/obj/structure/sink/puddle/attack_hand(mob/M) icon_state = "puddle-splash" ..() icon_state = "puddle" -/obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/structure/sink/puddle/attackby(obj/item/O, mob/user, params) icon_state = "puddle-splash" ..() icon_state = "puddle" \ No newline at end of file diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index d8c0442b91b..867b7e5723f 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -53,13 +53,13 @@ else return 1 -/obj/structure/windoor_assembly/CanAtmosPass(var/turf/T) +/obj/structure/windoor_assembly/CanAtmosPass(turf/T) if(get_dir(loc, T) == dir) return !density else return 1 -/obj/structure/windoor_assembly/CheckExit(atom/movable/mover as mob|obj, turf/target as turf) +/obj/structure/windoor_assembly/CheckExit(atom/movable/mover as mob|obj, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) @@ -68,7 +68,7 @@ return 1 -/obj/structure/windoor_assembly/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/windoor_assembly/attackby(obj/item/W, mob/user, params) //I really should have spread this out across more states but thin little windoors are hard to sprite. add_fingerprint(user) switch(state) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 5a4a1ef3706..e836e396187 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -41,7 +41,7 @@ return -/obj/structure/window/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/window/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage update_nearby_icons() @@ -83,7 +83,7 @@ return 1 -/obj/structure/window/CheckExit(atom/movable/O as mob|obj, target as turf) +/obj/structure/window/CheckExit(atom/movable/O as mob|obj, target) if(istype(O) && O.checkpass(PASSGLASS)) return 1 if(get_dir(O.loc, target) == dir) @@ -115,7 +115,7 @@ spawnfragments() update_nearby_icons() -/obj/structure/window/attack_tk(mob/user as mob) +/obj/structure/window/attack_tk(mob/user) user.changeNext_move(CLICK_CD_MELEE) user.visible_message("Something knocks on [src].") add_fingerprint(user) @@ -131,7 +131,7 @@ hit(50) return 1 -/obj/structure/window/attack_hand(mob/user as mob) +/obj/structure/window/attack_hand(mob/user) if(!can_be_reached(user)) return user.changeNext_move(CLICK_CD_MELEE) @@ -139,11 +139,11 @@ add_fingerprint(user) playsound(loc, 'sound/effects/Glassknock.ogg', 50, 1) -/obj/structure/window/attack_paw(mob/user as mob) +/obj/structure/window/attack_paw(mob/user) return attack_hand(user) -/obj/structure/window/proc/attack_generic(mob/user as mob, damage = 0) //used by attack_alien, attack_animal, and attack_slime +/obj/structure/window/proc/attack_generic(mob/user, damage = 0) //used by attack_alien, attack_animal, and attack_slime if(!can_be_reached(user)) return user.changeNext_move(CLICK_CD_MELEE) @@ -156,13 +156,13 @@ playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1) -/obj/structure/window/attack_alien(mob/living/user as mob) +/obj/structure/window/attack_alien(mob/living/user) user.do_attack_animation(src) if(islarva(user)) return attack_generic(user, 15) update_nearby_icons() -/obj/structure/window/attack_animal(mob/living/user as mob) +/obj/structure/window/attack_animal(mob/living/user) if(!isanimal(user)) return @@ -174,7 +174,7 @@ attack_generic(M, M.melee_damage_upper) update_nearby_icons() -/obj/structure/window/attack_slime(mob/living/simple_animal/slime/user as mob) +/obj/structure/window/attack_slime(mob/living/simple_animal/slime/user) user.do_attack_animation(src) if(!user.is_adult) return @@ -282,7 +282,7 @@ return 0 return 1 -/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1) +/obj/structure/window/proc/hit(damage, sound_effect = 1) if(reinf) damage *= 0.5 health = max(0, health - damage) diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index adca34f56e8..803f29cb1aa 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -10,7 +10,7 @@ if(damtype == "brute") hitsound = "swing_hit" -/obj/item/weapon/Bump(mob/M as mob) +/obj/item/weapon/Bump(mob/M) spawn(0) ..() return \ No newline at end of file diff --git a/code/game/pooling/pool.dm b/code/game/pooling/pool.dm index df250d767b6..d86be49a5a1 100644 --- a/code/game/pooling/pool.dm +++ b/code/game/pooling/pool.dm @@ -34,7 +34,7 @@ var/global/list/GlobalPool = list() //Or a list of arguments //Either way it gets passed to new -/proc/PoolOrNew(var/get_type,var/second_arg) +/proc/PoolOrNew(get_type,second_arg) if(!get_type) return @@ -48,7 +48,7 @@ var/global/list/GlobalPool = list() . = new get_type (second_arg) -/proc/GetFromPool(var/get_type,var/second_arg) +/proc/GetFromPool(get_type,second_arg) if(!get_type) return @@ -78,7 +78,7 @@ var/global/list/GlobalPool = list() return pooled -/proc/PlaceInPool(var/datum/diver, destroy = 1) +/proc/PlaceInPool(datum/diver, destroy = 1) if(!istype(diver)) return diff --git a/code/game/say.dm b/code/game/say.dm index 0024ab48136..18565d25950 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -125,7 +125,7 @@ var/list/freqtospan = list( output = "[output]'>" return output -/mob/living/proc/say_test(var/text) +/mob/living/proc/say_test(text) var/ending = copytext(text, length(text)) if (ending == "?") return "1" diff --git a/code/game/skincmd.dm b/code/game/skincmd.dm index fd9131538e4..7a784da5a04 100644 --- a/code/game/skincmd.dm +++ b/code/game/skincmd.dm @@ -1,7 +1,7 @@ /mob/var/skincmds = list() /obj/proc/SkinCmd(mob/user as mob, var/data as text) -/proc/SkinCmdRegister(var/mob/user, var/name as text, var/O as obj) +/proc/SkinCmdRegister(mob/user, name as text, obj/O) user.skincmds[name] = O /mob/verb/skincmd(data as text) diff --git a/code/game/sound.dm b/code/game/sound.dm index 97eb39aa9b4..529e3d906fc 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -1,4 +1,4 @@ -/proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, surround = 1) +/proc/playsound(atom/source, soundin, vol as num, vary, extrarange as num, falloff, surround = 1) soundin = get_sfx(soundin) // same sound for everyone @@ -20,7 +20,7 @@ M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, surround) -/atom/proc/playsound_local(var/turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1) +/atom/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1) soundin = get_sfx(soundin) var/sound/S = sound(soundin) @@ -73,7 +73,7 @@ src << S -/mob/playsound_local(var/turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1) +/mob/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1) if(!client || ear_deaf > 0) return ..() diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 1b1afc4f19a..58e7ae67fd2 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -17,7 +17,7 @@ /turf/simulated/proc/burn_tile() -/turf/simulated/proc/MakeSlippery(var/wet_setting = 1) // 1 = Water, 2 = Lube +/turf/simulated/proc/MakeSlippery(wet_setting = 1) // 1 = Water, 2 = Lube if(wet >= wet_setting) return wet = wet_setting diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 92da02a9f96..e4a1df58ab5 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -84,7 +84,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," update_visuals(air) return 1 -/turf/simulated/floor/attack_paw(mob/user as mob) +/turf/simulated/floor/attack_paw(mob/user) return src.attack_hand(user) /turf/simulated/floor/proc/gets_drilled() @@ -123,7 +123,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," W.update_icon() return W -/turf/simulated/floor/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/attackby(obj/item/C, mob/user, params) if(!C || !user) return 1 if(..()) diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index d09281d8e70..887ec3112fe 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -9,7 +9,7 @@ floor_tile = /obj/item/stack/tile/wood broken_states = list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7") -/turf/simulated/floor/wood/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/wood/attackby(obj/item/C, mob/user, params) if(..()) return if(istype(C, /obj/item/weapon/screwdriver)) @@ -33,7 +33,7 @@ spawn(1) update_icon() -/turf/simulated/floor/grass/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/grass/attackby(obj/item/C, mob/user, params) if(..()) return if(istype(C, /obj/item/weapon/shovel)) diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index abb5c5c4fab..afb0d84650c 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -39,10 +39,10 @@ else SetLuminosity(0) icon_state = "light_off" -/turf/simulated/floor/light/ChangeTurf(turf/T as turf) +/turf/simulated/floor/light/ChangeTurf(turf/T) SetLuminosity(0) ..() -/turf/simulated/floor/light/attack_hand(mob/user as mob) +/turf/simulated/floor/light/attack_hand(mob/user) if(!on) on = 1 currentcolor = 1 @@ -59,7 +59,7 @@ -/turf/simulated/floor/light/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/light/attackby(obj/item/C, mob/user, params) if(..()) return if(istype(C,/obj/item/weapon/light/bulb)) //only for light tiles diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index edb1fe79b28..6da2419b96b 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -25,7 +25,7 @@ if(!broken && !burnt) icon_state = icon_plating //Because asteroids are 'platings' too. -/turf/simulated/floor/plating/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/plating/attackby(obj/item/C, mob/user, params) if(..()) return if(istype(C, /obj/item/stack/rods)) @@ -87,12 +87,12 @@ /turf/simulated/floor/engine/burn_tile() return //unburnable -/turf/simulated/floor/engine/make_plating(var/force = 0) +/turf/simulated/floor/engine/make_plating(force = 0) if(force) ..() return //unplateable -/turf/simulated/floor/engine/attackby(obj/item/weapon/C as obj, mob/user as mob, params) +/turf/simulated/floor/engine/attackby(obj/item/weapon/C, mob/user, params) if(!C || !user) return if(istype(C, /obj/item/weapon/wrench)) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index eb87aeb3173..fb1d315ce58 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -95,12 +95,12 @@ visible_message("[src.name] smashes through the wall!") playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) -/turf/simulated/wall/attack_paw(mob/living/user as mob) +/turf/simulated/wall/attack_paw(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) return src.attack_hand(user) -/turf/simulated/wall/attack_animal(var/mob/living/simple_animal/M) +/turf/simulated/wall/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(M.environment_smash >= 2) @@ -122,7 +122,7 @@ user << text("You punch the wall.") return 1 -/turf/simulated/wall/attack_hand(mob/user as mob) +/turf/simulated/wall/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) user << "You push the wall but nothing happens!" playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) @@ -131,7 +131,7 @@ return -/turf/simulated/wall/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/wall/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) if (!user.IsAdvancedToolUser()) user << "You don't have the dexterity to do this!" @@ -157,7 +157,7 @@ return -/turf/simulated/wall/proc/try_wallmount(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/proc/try_wallmount(obj/item/weapon/W, mob/user, turf/T) //check for wall mounted frames if(istype(W,/obj/item/apc_frame)) var/obj/item/apc_frame/AH = W @@ -187,7 +187,7 @@ return 0 -/turf/simulated/wall/proc/try_decon(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/proc/try_decon(obj/item/weapon/W, mob/user, turf/T) if( istype(W, /obj/item/weapon/weldingtool) ) var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) @@ -214,7 +214,7 @@ return 0 -/turf/simulated/wall/proc/try_destroy(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/proc/try_destroy(obj/item/weapon/W, mob/user, turf/T) if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) var/obj/item/weapon/pickaxe/drill/jackhammer/D = W if( !istype(src, /turf/simulated/wall) || !user || !W || !T ) @@ -227,7 +227,7 @@ return 0 -/turf/simulated/wall/proc/thermitemelt(mob/user as mob) +/turf/simulated/wall/proc/thermitemelt(mob/user) overlays = list() var/obj/effect/overlay/O = new/obj/effect/overlay( src ) O.name = "thermite" diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 02f1fd81dc5..78f34991e30 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -45,7 +45,7 @@ explosion_block = 3 canSmoothWith = list(/turf/simulated/wall/mineral/diamond, /obj/structure/falsewall/diamond) -/turf/simulated/wall/mineral/diamond/thermitemelt(mob/user as mob) +/turf/simulated/wall/mineral/diamond/thermitemelt(mob/user) return /turf/simulated/wall/mineral/clown @@ -89,11 +89,11 @@ return return -/turf/simulated/wall/mineral/uranium/attack_hand(mob/user as mob) +/turf/simulated/wall/mineral/uranium/attack_hand(mob/user) radiate() ..() -/turf/simulated/wall/mineral/uranium/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/wall/mineral/uranium/attackby(obj/item/weapon/W, mob/user, params) radiate() ..() @@ -111,7 +111,7 @@ thermal_conductivity = 0.04 canSmoothWith = list(/turf/simulated/wall/mineral/plasma, /obj/structure/falsewall/plasma) -/turf/simulated/wall/mineral/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/wall/mineral/plasma/attackby(obj/item/weapon/W, mob/user, params) if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite message_admins("Plasma wall ignited by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1) log_game("Plasma wall ignited by [key_name(user)] in ([x],[y],[z])") diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index c1642ac09c1..3555e99b8cf 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -21,7 +21,7 @@ builtin_sheet.loc = src new /obj/item/stack/sheet/metal(src, 2) -/turf/simulated/wall/r_wall/attack_animal(var/mob/living/simple_animal/M) +/turf/simulated/wall/r_wall/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) if(M.environment_smash == 3) dismantle_wall(1) @@ -30,7 +30,7 @@ else M << "This wall is far too strong for you to destroy." -/turf/simulated/wall/r_wall/try_destroy(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/r_wall/try_destroy(obj/item/weapon/W, mob/user, turf/T) if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) var/obj/item/weapon/pickaxe/drill/jackhammer/D = W user << "You begin to smash though the [name]..." @@ -59,7 +59,7 @@ return 1 return 0 -/turf/simulated/wall/r_wall/try_decon(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/r_wall/try_decon(obj/item/weapon/W, mob/user, turf/T) //DECONSTRUCTION switch(d_state) if(0) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index cfb2758ce80..a554f700dc0 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -30,7 +30,7 @@ return SetLuminosity(0) -/turf/space/attack_paw(mob/user as mob) +/turf/space/attack_paw(mob/user) return src.attack_hand(user) /turf/space/attackby(obj/item/C, mob/user, params) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 6edae35f9e9..36813272300 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -43,7 +43,7 @@ SSair.add_to_active(T) ..() -/turf/attack_hand(mob/user as mob) +/turf/attack_hand(mob/user) user.Move_Pulled(src) /turf/attackby(obj/item/C, mob/user, params) @@ -126,7 +126,7 @@ qdel(L) //Creates a new turf -/turf/proc/ChangeTurf(var/path) +/turf/proc/ChangeTurf(path) if(!path) return if(path == type) return src diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index d0f2ca01bc9..eb9bbc56c0f 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -58,7 +58,7 @@ else C << "OOC: [keyname]: [msg]" -/proc/toggle_ooc(var/toggle = null) +/proc/toggle_ooc(toggle = null) if(toggle != null) //if we're specifically en/disabling ooc if(toggle != ooc_allowed) ooc_allowed = toggle diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index 31fa0254c7a..e52011f5ba6 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -1,7 +1,7 @@ #define MAX_ADMIN_BANS_PER_ADMIN 1 //Either pass the mob you wish to ban in the 'banned_mob' attribute, or the banckey, banip and bancid variables. If both are passed, the mob takes priority! If a mob is not passed, banckey is the minimum that needs to be passed! banip and bancid are optional. -/datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null, var/banip = null, var/bancid = null) +/datum/admins/proc/DB_ban_record(bantype, mob/banned_mob, duration = -1, reason, job = "", rounds = 0, banckey = null, banip = null, bancid = null) if(!check_rights(R_BAN)) return @@ -138,7 +138,7 @@ del(banned_mob.client) -/datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") +/datum/admins/proc/DB_ban_unban(ckey, bantype, job = "") if(!check_rights(R_BAN)) return @@ -211,7 +211,7 @@ DB_ban_unban_by_id(ban_id) -/datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) +/datum/admins/proc/DB_ban_edit(banid = null, param = null) if(!check_rights(R_BAN)) return @@ -271,7 +271,7 @@ usr << "Cancelled" return -/datum/admins/proc/DB_ban_unban_by_id(var/id) +/datum/admins/proc/DB_ban_unban_by_id(id) if(!check_rights(R_BAN)) return @@ -323,7 +323,7 @@ holder.DB_ban_panel() -/datum/admins/proc/DB_ban_panel(var/playerckey = null, var/adminckey = null) +/datum/admins/proc/DB_ban_panel(playerckey = null, adminckey = null) if(!usr.client) return diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index c6f7d383936..c1716c470de 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -2,7 +2,7 @@ var/CMinutes = null var/savefile/Banlist -/proc/CheckBan(var/ckey, var/id, var/address) +/proc/CheckBan(ckey, id, address) if(!Banlist) // if Banlist cannot be located for some reason LoadBans() // try to load the bans if(!Banlist) // uh oh, can't find bans! diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index d6efe36d348..9d8c74ea4f8 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -4,14 +4,14 @@ var/global/floorIsLava = 0 //////////////////////////////// -/proc/message_admins(var/msg) +/proc/message_admins(msg) msg = "ADMIN LOG: [msg]" admins << msg ///////////////////////////////////////////////////////////////////////////////////////////////Panels -/datum/admins/proc/show_player_panel(var/mob/M in mob_list) +/datum/admins/proc/show_player_panel(mob/M in mob_list) set category = "Admin" set name = "Show Player Panel" set desc="Edit player (respawn, ban, heal, etc)" @@ -558,7 +558,7 @@ var/global/floorIsLava = 0 log_admin("[key_name(usr)] set the pre-game delay to [newtime] seconds.") feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/admins/proc/unprison(var/mob/M in mob_list) +/datum/admins/proc/unprison(mob/M in mob_list) set category = "Admin" set name = "Unprison" if (M.z == ZLEVEL_CENTCOM) @@ -589,7 +589,7 @@ var/global/floorIsLava = 0 else return "Error: Invalid sabotage target: [target]" */ -/datum/admins/proc/spawn_atom(var/object as text) +/datum/admins/proc/spawn_atom(object as text) set category = "Debug" set desc = "(atom path) Spawn an atom" set name = "Spawn" @@ -622,7 +622,7 @@ var/global/floorIsLava = 0 feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/admins/proc/show_traitor_panel(var/mob/M in mob_list) +/datum/admins/proc/show_traitor_panel(mob/M in mob_list) set category = "Admin" set desc = "Edit mobs's memory and role" set name = "Show Traitor Panel" @@ -746,7 +746,7 @@ var/global/floorIsLava = 0 //Kicks all the clients currently in the lobby. The second parameter (kick_only_afk) determins if an is_afk() check is ran, or if all clients are kicked //defaults to kicking everyone (afk + non afk clients in the lobby) //returns a list of ckeys of the kicked clients -/proc/kick_clients_in_lobby(var/message, var/kick_only_afk = 0) +/proc/kick_clients_in_lobby(message, kick_only_afk = 0) var/list/kicked_client_names = list() for(var/client/C in clients) if(istype(C.mob, /mob/new_player)) @@ -760,7 +760,7 @@ var/global/floorIsLava = 0 //returns 1 to let the dragdrop code know we are trapping this event //returns 0 if we don't plan to trap the event -/datum/admins/proc/cmd_ghost_drag(var/mob/dead/observer/frommob, var/mob/living/tomob) +/datum/admins/proc/cmd_ghost_drag(mob/dead/observer/frommob, mob/living/tomob) //this is the exact two check rights checks required to edit a ckey with vv. if (!check_rights(R_VAREDIT,0) || !check_rights(R_SPAWN|R_DEBUG,0)) diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 543bc79d287..b542204bd23 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -8,14 +8,14 @@ #define INVESTIGATE_DIR "data/investigate/" //SYSTEM -/proc/investigate_subject2file(var/subject) +/proc/investigate_subject2file(subject) return file("[INVESTIGATE_DIR][subject].html") /proc/investigate_reset() if(fdel(INVESTIGATE_DIR)) return 1 return 0 -/atom/proc/investigate_log(var/message, var/subject) +/atom/proc/investigate_log(message, subject) if(!message) return var/F = investigate_subject2file(subject) if(!F) return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 4f157aadda7..194a4437e55 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -462,7 +462,7 @@ var/list/admin_verbs_hideable = list( message_admins("[ckey] creating an admin explosion at [epicenter.loc].") feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/give_spell(mob/T as mob in mob_list) +/client/proc/give_spell(mob/T in mob_list) set category = "Fun" set name = "Give Spell" set desc = "Gives a spell to a mob." @@ -485,7 +485,7 @@ var/list/admin_verbs_hideable = list( message_admins("Spells given to mindless mobs will not be transferred in mindswap or cloning!") -/client/proc/give_disease(mob/T as mob in mob_list) +/client/proc/give_disease(mob/T in mob_list) set category = "Fun" set name = "Give Disease" set desc = "Gives a Disease to a mob." @@ -496,7 +496,7 @@ var/list/admin_verbs_hideable = list( log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].") message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D].") -/client/proc/object_say(var/obj/O in world) +/client/proc/object_say(obj/O in world) set category = "Special Verbs" set name = "OSay" set desc = "Makes an object say something." @@ -599,7 +599,7 @@ var/list/admin_verbs_hideable = list( deadmins -= ckey return -/client/proc/populate_world(var/amount = 50 as num) +/client/proc/populate_world(amount = 50 as num) set name = "Populate World" set category = "Debug" set desc = "(\"Amount of mobs to create\") Populate the world with test mobs." diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index e32260b95ef..2e41995ce05 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -1,5 +1,5 @@ /var/create_mob_html = null -/datum/admins/proc/create_mob(var/mob/user) +/datum/admins/proc/create_mob(mob/user) if (!create_mob_html) var/mobjs = null mobjs = list2text(typesof(/mob), ";") diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index eae80abf304..bb58339dc4c 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -1,6 +1,6 @@ /var/create_object_html = null -/datum/admins/proc/create_object(var/mob/user) +/datum/admins/proc/create_object(mob/user) if (!create_object_html) var/objectjs = null objectjs = list2text(typesof(/obj), ";") @@ -10,7 +10,7 @@ user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475") -/datum/admins/proc/quick_create_object(var/mob/user) +/datum/admins/proc/quick_create_object(mob/user) var/quick_create_object_html = null var/pathtext = null diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index 0938b7bd33d..c9e5f1f69f3 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -1,5 +1,5 @@ /var/create_turf_html = null -/datum/admins/proc/create_turf(var/mob/user) +/datum/admins/proc/create_turf(mob/user) if (!create_turf_html) var/turfjs = null turfjs = list2text(typesof(/turf), ";") diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index a881c5b2976..2c429f6de82 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -1,7 +1,7 @@ var/savefile/Banlistjob -/proc/_jobban_isbanned(var/client/clientvar, var/rank) +/proc/_jobban_isbanned(client/clientvar, rank) if(!clientvar) return 1 ClearTempbansjob() var/id = clientvar.computer_id diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 3507e19b1e8..6e34c25866b 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -47,7 +47,7 @@ usr << browse(output,"window=editrights;size=900x650") -/datum/admins/proc/log_admin_rank_modification(var/adm_ckey, var/new_rank) +/datum/admins/proc/log_admin_rank_modification(adm_ckey, new_rank) if(config.admin_legacy_system) return if(!usr.client) @@ -97,7 +97,7 @@ usr << "Admin rank changed." -/datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission) +/datum/admins/proc/log_admin_permission_modification(adm_ckey, new_permission) if(config.admin_legacy_system) return if(!usr.client) return if(check_rights(R_PERMISSIONS)) return diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index af361a7895c..040ac99ef48 100644 --- a/code/modules/admin/player_notes.dm +++ b/code/modules/admin/player_notes.dm @@ -26,11 +26,11 @@ popup.open() -/datum/admins/proc/notes_show(var/ckey) +/datum/admins/proc/notes_show(ckey) usr << browse("Player Notes[notes_gethtml(ckey)]","window=player_notes;size=700x400") -/datum/admins/proc/notes_gethtml(var/ckey) +/datum/admins/proc/notes_gethtml(ckey) var/savefile/notesfile = new(NOTESFILE) if(!notesfile) return "Error: Cannot access [NOTESFILE]" if(ckey) @@ -53,7 +53,7 @@ //handles adding notes to the end of a ckey's buffer //originally had seperate entries such as var/by to record who left the note and when //but the current bansystem is a heap of dung. -/proc/notes_add(var/ckey, var/note, var/lognote = 0) +/proc/notes_add(ckey, note, lognote = 0) if(!ckey) ckey = ckey(input(usr,"Who would you like to add notes for?","Enter a ckey",null) as text|null) if(!ckey) return @@ -75,7 +75,7 @@ return //handles removing entries from the buffer, or removing the entire directory if no start_index is given -/proc/notes_remove(var/ckey, var/start_index, var/end_index) +/proc/notes_remove(ckey, start_index, end_index) var/savefile/notesfile = new(NOTESFILE) var/admin_msg if(!notesfile) return diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 4390f383d8b..67aba43dd56 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -81,7 +81,7 @@ -/datum/admins/proc/Secrets_topic(var/item,var/href_list) +/datum/admins/proc/Secrets_topic(item,href_list) var/datum/round_event/E var/ok = 0 switch(item) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 2cb0a6b293b..46cbc8a85cf 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -1,4 +1,4 @@ -/proc/keywords_lookup(var/msg) +/proc/keywords_lookup(msg) //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE! var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as", "i") diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 3c3407e8138..6b3040a1677 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -25,7 +25,7 @@ message_admins("[key_name_admin(usr)] jumped to [A]") feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/jumptoturf(var/turf/T in world) +/client/proc/jumptoturf(turf/T in world) set name = "Jump to Turf" set category = "Admin" if(!src.holder) @@ -38,7 +38,7 @@ feedback_add_details("admin_verb","JT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return -/client/proc/jumptomob(var/mob/M in mob_list) +/client/proc/jumptomob(mob/M in mob_list) set category = "Admin" set name = "Jump to Mob" @@ -96,7 +96,7 @@ feedback_add_details("admin_verb","JK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/Getmob(var/mob/M in mob_list) +/client/proc/Getmob(mob/M in mob_list) set category = "Admin" set name = "Get Mob" set desc = "Mob to teleport" @@ -135,7 +135,7 @@ usr.loc = M.loc feedback_add_details("admin_verb","GK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/sendmob(var/mob/M in sortmobs()) +/client/proc/sendmob(mob/M in sortmobs()) set category = "Admin" set name = "Send Mob" if(!src.holder) @@ -148,11 +148,11 @@ log_admin("[key_name(usr)] teleported [key_name(M)] to [A]") message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]") -/proc/admin_forcemove(var/mob/mover, var/atom/newloc) +/proc/admin_forcemove(mob/mover, atom/newloc) mover.loc = newloc mover.on_forcemove(newloc) -/mob/proc/on_forcemove(var/atom/newloc) +/mob/proc/on_forcemove(atom/newloc) return diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index e79649e7dc4..818a7050967 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -1,5 +1,5 @@ //allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm -/client/proc/cmd_admin_pm_context(mob/M as mob in mob_list) +/client/proc/cmd_admin_pm_context(mob/M in mob_list) set category = null set name = "Admin PM Mob" if(!holder) diff --git a/code/modules/admin/verbs/bluespacearty.dm b/code/modules/admin/verbs/bluespacearty.dm index 3d28d61dc14..da8eee4a2ad 100644 --- a/code/modules/admin/verbs/bluespacearty.dm +++ b/code/modules/admin/verbs/bluespacearty.dm @@ -1,4 +1,4 @@ -/client/proc/bluespace_artillery(var/mob/M in mob_list) +/client/proc/bluespace_artillery(mob/M in mob_list) set name = "Bluespace Artillery" set category = "Fun" diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index a3912ae24c0..03bcd93bf46 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -5,7 +5,7 @@ #define AREA_BUILDMODE 5 #define NUM_BUILDMODES 5 -/proc/togglebuildmode(mob/M as mob in player_list) +/proc/togglebuildmode(mob/M in player_list) set name = "Toggle Build Mode" set category = "Special Verbs" if(M.client) @@ -197,7 +197,7 @@ return 1 -/proc/build_click(var/mob/user, buildmode, params, var/obj/object) +/proc/build_click(mob/user, buildmode, params, obj/object) var/obj/effect/bmode/buildholder/holder = null for(var/obj/effect/bmode/buildholder/H) if(H.cl == user.client) diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index d9409338ab4..dce6bbf8659 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -1,4 +1,4 @@ -/client/proc/cinematic(var/cinematic as anything in list("explosion",null)) +/client/proc/cinematic(cinematic as anything in list("explosion",null)) set name = "cinematic" set category = "Fun" set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted. diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 9dc2e9482ba..515ad7838a0 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -83,7 +83,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that usr << "[procname] returned: [returnval ? returnval : "null"]" feedback_add_details("admin_verb","APC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/callproc_datum(var/A as null|area|mob|obj|turf) +/client/proc/callproc_datum(A as null|area|mob|obj|turf) set category = "Debug" set name = "Atom ProcCall" @@ -182,7 +182,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that usr.show_message(t, 1) feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_robotize(var/mob/M in mob_list) +/client/proc/cmd_admin_robotize(mob/M in mob_list) set category = "Fun" set name = "Make Robot" @@ -198,7 +198,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that else alert("Invalid mob") -/client/proc/cmd_admin_blobize(var/mob/M in mob_list) +/client/proc/cmd_admin_blobize(mob/M in mob_list) set category = "Fun" set name = "Make Blob" @@ -215,7 +215,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that alert("Invalid mob") -/client/proc/cmd_admin_animalize(var/mob/M in mob_list) +/client/proc/cmd_admin_animalize(mob/M in mob_list) set category = "Fun" set name = "Make Simple Animal" @@ -236,7 +236,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.Animalize() -/client/proc/makepAI(var/turf/T in mob_list) +/client/proc/makepAI(turf/T in mob_list) set category = "Fun" set name = "Make pAI" set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI" @@ -263,7 +263,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSpai.candidates.Remove(candidate) feedback_add_details("admin_verb","MPAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_alienize(var/mob/M in mob_list) +/client/proc/cmd_admin_alienize(mob/M in mob_list) set category = "Fun" set name = "Make Alien" @@ -280,7 +280,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that else alert("Invalid mob") -/client/proc/cmd_admin_slimeize(var/mob/M in mob_list) +/client/proc/cmd_admin_slimeize(mob/M in mob_list) set category = "Fun" set name = "Make slime" @@ -425,7 +425,7 @@ var/global/list/g_fancy_list_of_types = null return matches //TODO: merge the vievars version into this or something maybe mayhaps -/client/proc/cmd_debug_del_all(var/object as text) +/client/proc/cmd_debug_del_all(object as text) set category = "Debug" set name = "Del-All" @@ -456,7 +456,7 @@ var/global/list/g_fancy_list_of_types = null message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0) feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_grantfullaccess(var/mob/M in mob_list) +/client/proc/cmd_admin_grantfullaccess(mob/M in mob_list) set category = "Admin" set name = "Grant Full Access" @@ -496,7 +496,7 @@ var/global/list/g_fancy_list_of_types = null log_admin("[key_name(src)] has granted [M.key] full access.") message_admins("[key_name_admin(usr)] has granted [M.key] full access.") -/client/proc/cmd_assume_direct_control(var/mob/M in mob_list) +/client/proc/cmd_assume_direct_control(mob/M in mob_list) set category = "Admin" set name = "Assume direct control" set desc = "Direct intervention" @@ -603,7 +603,7 @@ var/global/list/g_fancy_list_of_types = null for(var/areatype in areas_without_camera) world << "* [areatype]" -/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in mob_list) +/client/proc/cmd_admin_dress(mob/living/carbon/human/M in mob_list) set category = "Fun" set name = "Select equipment" if(!ishuman(M)) @@ -1091,7 +1091,7 @@ var/global/list/g_fancy_list_of_types = null //Deathsquad -/proc/equip_deathsquad(var/mob/living/carbon/human/M, var/officer) +/proc/equip_deathsquad(mob/living/carbon/human/M, officer) var/obj/item/device/radio/R = new /obj/item/device/radio/headset/headset_cent/alt(M) R.set_frequency(CENTCOM_FREQ) R.freqlock = 1 @@ -1142,7 +1142,7 @@ var/global/list/g_fancy_list_of_types = null M.equip_to_slot_or_del(W, slot_wear_id) //Emergency Response Team -/proc/equip_emergencyresponsesquad(var/mob/living/carbon/human/M, var/ertrole, var/alert) +/proc/equip_emergencyresponsesquad(mob/living/carbon/human/M, ertrole, alert) var/obj/item/weapon/card/id/W = null var/obj/item/device/radio/R = new /obj/item/device/radio/headset/headset_cent/alt(M) R.set_frequency(CENTCOM_FREQ) @@ -1260,7 +1260,7 @@ var/global/list/g_fancy_list_of_types = null W.update_label(W.registered_name, W.assignment) -/proc/equip_centcomofficial(var/mob/living/carbon/human/M) +/proc/equip_centcomofficial(mob/living/carbon/human/M) M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves) diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index d895a43fb1d..399afc597b5 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -1,4 +1,4 @@ -/client/proc/air_status(turf/target as turf) +/client/proc/air_status(turf/target) set category = "Debug" set name = "Display Air Status" diff --git a/code/modules/admin/verbs/machine_upgrade.dm b/code/modules/admin/verbs/machine_upgrade.dm index 9c1089c5fff..9f2039fdd0f 100644 --- a/code/modules/admin/verbs/machine_upgrade.dm +++ b/code/modules/admin/verbs/machine_upgrade.dm @@ -1,4 +1,4 @@ -/proc/machine_upgrade(obj/machinery/M as obj in world) +/proc/machine_upgrade(obj/machinery/M in world) set name = "Tweak Component Ratings" set category = "Debug" var/new_rating = input("Enter new rating:","Num") as num diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm index 5895b99e697..2fcae2ed698 100644 --- a/code/modules/admin/verbs/massmodvar.dm +++ b/code/modules/admin/verbs/massmodvar.dm @@ -1,4 +1,4 @@ -/client/proc/cmd_mass_modify_object_variables(atom/A, var/var_name) +/client/proc/cmd_mass_modify_object_variables(atom/A, var_name) set category = "Debug" set name = "Mass Edit Variables" set desc="(target) Edit all instances of a target item's variables" @@ -23,7 +23,7 @@ feedback_add_details("admin_verb","MEV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/massmodify_variables(var/atom/O, var/var_name = "", var/method = 0) +/client/proc/massmodify_variables(atom/O, var_name = "", method = 0) if(!check_rights(R_VAREDIT)) return for(var/p in forbidden_varedit_object_types) diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 3125067f32b..e1c1430d0e3 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -77,7 +77,7 @@ var/list/VVckey_edit = list("key", "ckey") return var_value -/client/proc/mod_list_add(var/list/L, atom/O, original_name, objectvar) +/client/proc/mod_list_add(list/L, atom/O, original_name, objectvar) var/class = "text" if(src.holder && src.holder.marked_datum) @@ -133,7 +133,7 @@ var/list/VVckey_edit = list("key", "ckey") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]") message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]") -/client/proc/mod_list(var/list/L, atom/O, original_name, objectvar) +/client/proc/mod_list(list/L, atom/O, original_name, objectvar) if(!check_rights(R_VAREDIT)) return if(!istype(L,/list)) src << "Not a List." @@ -263,7 +263,7 @@ var/list/VVckey_edit = list("key", "ckey") original_var = L[assoc_key] else original_var = L[L.Find(variable)] - + var/new_var switch(class) //Spits a runtime error if you try to modify an entry in the contents list. Dunno how to fix it, yet. @@ -347,7 +347,7 @@ var/list/VVckey_edit = list("key", "ckey") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]") message_admins("[key_name_admin(src)] modified [original_name]'s varlist [objectvar]: [original_var]=[new_var]") -/client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0) +/client/proc/modify_variables(atom/O, param_var_name = null, autodetect_class = 0) if(!check_rights(R_VAREDIT)) return for(var/p in forbidden_varedit_object_types) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 7c654529149..5cdf335ed49 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -684,7 +684,7 @@ return candidates -/datum/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character +/datum/admins/proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character if(!G_found || !G_found.key) return //First we spawn a dude. diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index 0947155158c..2b56954f685 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -1,4 +1,4 @@ -/proc/possess(obj/O as obj in world) +/proc/possess(obj/O in world) set name = "Possess Obj" set category = "Object" @@ -26,7 +26,7 @@ usr.control_object = O feedback_add_details("admin_verb","PO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/proc/release(obj/O as obj in world) +/proc/release(obj/O in world) set name = "Release Obj" set category = "Object" //usr.loc = get_turf(usr) @@ -44,7 +44,7 @@ usr.control_object = null feedback_add_details("admin_verb","RO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/proc/givetestverbs(mob/M as mob in mob_list) +/proc/givetestverbs(mob/M in mob_list) set desc = "Give this guy possess/release verbs" set category = "Debug" set name = "Give Possessing Verbs" diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index beec68a598a..b23db1a03b9 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -37,17 +37,17 @@ feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //log_admin("HELP: [key_name(src)]: [msg]") -/proc/Centcomm_announce(var/text , var/mob/Sender) +/proc/Centcomm_announce(text , mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) msg = "CENTCOM:[key_name_admin(Sender)] (?) (PP) (VV) (SM) (FLW) (TP) (BSA) (RPLY): [msg]" admins << msg -/proc/Syndicate_announce(var/text , var/mob/Sender) +/proc/Syndicate_announce(text , mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) msg = "SYNDICATE:[key_name_admin(Sender)] (?) (PP) (VV) (SM) (FLW) (TP) (BSA) (RPLY): [msg]" admins << msg -/proc/Nuke_request(var/text , var/mob/Sender) +/proc/Nuke_request(text , mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) msg = "NUKE CODE REQUEST:[key_name_admin(Sender)] (?) (PP) (VV) (SM) (FLW) (TP) (BSA) (RPLY): [msg]" admins << msg diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 8f7d37730e8..96054f461d4 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1,4 +1,4 @@ -/client/proc/cmd_admin_drop_everything(mob/M as mob in mob_list) +/client/proc/cmd_admin_drop_everything(mob/M in mob_list) set category = null set name = "Drop Everything" if(!holder) @@ -19,7 +19,7 @@ feedback_add_details("admin_verb","DEVR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_subtle_message(mob/M as mob in mob_list) +/client/proc/cmd_admin_subtle_message(mob/M in mob_list) set category = "Special Verbs" set name = "Subtle Message" @@ -58,7 +58,7 @@ message_admins(" GlobalNarrate: [key_name_admin(usr)] : [msg]
    ") feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_direct_narrate(var/mob/M) +/client/proc/cmd_admin_direct_narrate(mob/M) set category = "Special Verbs" set name = "Direct Narrate" @@ -82,7 +82,7 @@ message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
    ") feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_local_narrate(var/atom/A) +/client/proc/cmd_admin_local_narrate(atom/A) set category = "Special Verbs" set name = "Local Narrate" @@ -104,7 +104,7 @@ message_admins(" LocalNarrate: [key_name_admin(usr)] at ([get_area(A)]): [msg]
    ") feedback_add_details("admin_verb","LN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_godmode(mob/M as mob in mob_list) +/client/proc/cmd_admin_godmode(mob/M in mob_list) set category = "Special Verbs" set name = "Godmode" if(!holder) @@ -417,7 +417,7 @@ Traitors and the like can also be revived with the previous role mostly intact. feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in mob_list) +/client/proc/cmd_admin_rejuvenate(mob/living/M in mob_list) set category = "Special Verbs" set name = "Rejuvenate" if(!holder) @@ -536,7 +536,7 @@ Traitors and the like can also be revived with the previous role mostly intact. else return -/client/proc/cmd_admin_gib(mob/M as mob in mob_list) +/client/proc/cmd_admin_gib(mob/M in mob_list) set category = "Special Verbs" set name = "Gib" @@ -574,7 +574,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("[key_name_admin(usr)] used gibself.") feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_check_contents(mob/living/M as mob in mob_list) +/client/proc/cmd_admin_check_contents(mob/living/M in mob_list) set category = "Special Verbs" set name = "Check Contents" @@ -635,7 +635,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return -/client/proc/cmd_admin_attack_log(mob/M as mob in mob_list) +/client/proc/cmd_admin_attack_log(mob/M in mob_list) set category = "Special Verbs" set name = "Attack Log" diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index a4385029717..3a70880a7ec 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -50,7 +50,7 @@ //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs -/obj/item/device/assembly/proc/pulsed(var/radio = 0) +/obj/item/device/assembly/proc/pulsed(radio = 0) if(holder && (wires & WIRE_RECEIVE)) activate() if(radio && (wires & WIRE_RADIO_RECEIVE)) @@ -59,7 +59,7 @@ //Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct -/obj/item/device/assembly/proc/pulse(var/radio = 0) +/obj/item/device/assembly/proc/pulse(radio = 0) if(src.connected && src.wires) connected.Pulse(src) return 1 @@ -86,7 +86,7 @@ return secured -/obj/item/device/assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/assembly/attackby(obj/item/weapon/W, mob/user, params) if(isassembly(W)) var/obj/item/device/assembly/A = W if((!A.secured) && (!secured)) @@ -119,7 +119,7 @@ user << "\The [src] can be attached to other things." -/obj/item/device/assembly/attack_self(mob/user as mob) +/obj/item/device/assembly/attack_self(mob/user) if(!user) return 0 user.set_machine(src) @@ -127,6 +127,6 @@ return 1 -/obj/item/device/assembly/interact(mob/user as mob) +/obj/item/device/assembly/interact(mob/user) return //HTML MENU FOR WIRES GOES HERE diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index f92ef7dcf84..3cca149d6e7 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -23,7 +23,7 @@ overlays += bombassembly.overlays overlays += "bomb_assembly" -/obj/item/device/onetankbomb/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/onetankbomb/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/analyzer)) bombtank.attackby(W, user) return @@ -54,7 +54,7 @@ add_fingerprint(user) ..() -/obj/item/device/onetankbomb/attack_self(mob/user as mob) //pressing the bomb accesses its assembly +/obj/item/device/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly bombassembly.attack_self(user, 1) add_fingerprint(user) return @@ -77,7 +77,7 @@ if(bombassembly) bombassembly.Crossed(AM) -/obj/item/device/onetankbomb/on_found(mob/finder as mob) //for mousetraps +/obj/item/device/onetankbomb/on_found(mob/finder) //for mousetraps if(bombassembly) bombassembly.on_found(finder) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 1769315acab..4b6489290d2 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -16,14 +16,14 @@ return 1 -/obj/item/device/assembly_holder/proc/assemble(var/obj/item/device/assembly/A, var/obj/item/device/assembly/A2, var/mob/user) +/obj/item/device/assembly_holder/proc/assemble(obj/item/device/assembly/A, obj/item/device/assembly/A2, mob/user) attach(A,user) attach(A2,user) name = "[A.name]-[A2.name] assembly" update_icon() feedback_add_details("assembly_made","[name]") -/obj/item/device/assembly_holder/proc/attach(var/obj/item/device/assembly/A, var/mob/user) +/obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user) if(!A.remove_item_from_storage(src)) if(user) user.remove_from_mob(A) @@ -61,7 +61,7 @@ if(a_right) a_right.Crossed(AM) -/obj/item/device/assembly_holder/on_found(mob/finder as mob) +/obj/item/device/assembly_holder/on_found(mob/finder) if(a_left) a_left.on_found(finder) if(a_right) @@ -81,7 +81,7 @@ ..() return -/obj/item/device/assembly_holder/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/assembly_holder/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) var/turf/T = get_turf(src) if(!T) @@ -96,7 +96,7 @@ else ..() -/obj/item/device/assembly_holder/attack_self(mob/user as mob) +/obj/item/device/assembly_holder/attack_self(mob/user) src.add_fingerprint(user) if(!a_left || !a_right) user << "Assembly part missing!" @@ -111,7 +111,7 @@ a_right.attack_self(user) -/obj/item/device/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1, var/special = 1) +/obj/item/device/assembly_holder/proc/process_activation(obj/D, normal = 1, special = 1) if(!D) return 0 if((normal) && (a_right) && (a_left)) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index beb41572fbe..2fad7c26a58 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -21,7 +21,7 @@ return 1 -/obj/item/device/assembly/igniter/attack_self(mob/user as mob) +/obj/item/device/assembly/igniter/attack_self(mob/user) activate() add_fingerprint(user) return \ No newline at end of file diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index e2f80e045b4..e470324cdf3 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -93,7 +93,7 @@ process_cooldown() return -/obj/item/device/assembly/infra/interact(mob/user as mob)//TODO: change this this to the wire control panel +/obj/item/device/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel if(is_secured(user)) user.set_machine(src) var/dat = text("Infrared Laser\nStatus: []
    \nVisibility: []
    \n    ", (on ? text("On", src) : text("Off", src)), (src.visible ? text("Visible", src) : text("Invisible", src))) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 6aeb07661aa..3879bc72230 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -36,7 +36,7 @@ if(holder) holder.update_icon() -/obj/item/device/assembly/mousetrap/proc/triggered(mob/target as mob, var/type = "feet") +/obj/item/device/assembly/mousetrap/proc/triggered(mob/target, type = "feet") if(!armed) return var/obj/item/organ/limb/affecting = null @@ -71,7 +71,7 @@ pulse(0) -/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user as mob) +/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user) if(!armed) user << "You arm [src]." else @@ -89,7 +89,7 @@ playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) -/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user as mob) +/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user) if(armed) if(((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY) && prob(50)) var/which_hand = "l_hand" @@ -102,7 +102,7 @@ ..() -/obj/item/device/assembly/mousetrap/Crossed(var/atom/movable/AM as mob|obj) +/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj) if(armed) if(ishuman(AM)) var/mob/living/carbon/H = AM @@ -119,7 +119,7 @@ ..() -/obj/item/device/assembly/mousetrap/on_found(mob/finder as mob) +/obj/item/device/assembly/mousetrap/on_found(mob/finder) if(armed) finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ "You accidentally trigger [src]!") diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 27a49543029..656e927716e 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -98,7 +98,7 @@ return -/obj/item/device/assembly/prox_sensor/interact(mob/user as mob)//TODO: Change this to the wires thingy +/obj/item/device/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy if(is_secured(user)) var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 6e76220a71b..d147b5a2c6b 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -14,7 +14,7 @@ ..() return -/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) var/turf/T = loc if(ismob(T)) @@ -30,7 +30,7 @@ add_fingerprint(user) return -/obj/item/assembly/shock_kit/attack_self(mob/user as mob) +/obj/item/assembly/shock_kit/attack_self(mob/user) part1.attack_self(user) part2.attack_self(user) add_fingerprint(user) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 74c4ea0aef9..35226b7023c 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -38,7 +38,7 @@ holder.update_icon() return -/obj/item/device/assembly/signaler/interact(mob/user as mob, flag1) +/obj/item/device/assembly/signaler/interact(mob/user, flag1) if(is_secured(user)) var/t1 = "-------" // if ((src.b_stat && !( flag1 ))) diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index f3a3340f248..7760900ac56 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -66,7 +66,7 @@ return -/obj/item/device/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires +/obj/item/device/assembly/timer/interact(mob/user)//TODO: Have this use the wires if(is_secured(user)) var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 8a5621d4148..dd722db6d8e 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -20,7 +20,7 @@ /obj/structure/artilleryplaceholder/decorative density = 0 -/obj/machinery/artillerycontrol/attack_hand(mob/user as mob) +/obj/machinery/artillerycontrol/attack_hand(mob/user) user.set_machine(src) var/dat = "Bluespace Artillery Control:
    " dat += "Locked on
    " diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 7859b0d9b98..4b6c9ff0881 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -78,7 +78,7 @@ ready = 1 -/obj/machinery/gateway/centerstation/proc/toggleon(mob/user as mob) +/obj/machinery/gateway/centerstation/proc/toggleon(mob/user) if(!ready) return if(linked.len != 8) return if(!powered()) return @@ -104,7 +104,7 @@ update_icon() -/obj/machinery/gateway/centerstation/attack_hand(mob/user as mob) +/obj/machinery/gateway/centerstation/attack_hand(mob/user) if(!ready) detect() return @@ -133,7 +133,7 @@ return -/obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob, params) +/obj/machinery/gateway/centerstation/attackby(obj/item/device/W, mob/user, params) if(istype(W,/obj/item/device/multitool)) user << "\black The gate is already calibrated, there is no work for you to do here." return @@ -183,7 +183,7 @@ ready = 1 -/obj/machinery/gateway/centeraway/proc/toggleon(mob/user as mob) +/obj/machinery/gateway/centeraway/proc/toggleon(mob/user) if(!ready) return if(linked.len != 8) return if(!stationgate) @@ -205,7 +205,7 @@ update_icon() -/obj/machinery/gateway/centeraway/attack_hand(mob/user as mob) +/obj/machinery/gateway/centeraway/attack_hand(mob/user) if(!ready) detect() return @@ -227,7 +227,7 @@ M.dir = SOUTH -/obj/machinery/gateway/centeraway/attackby(obj/item/device/W as obj, mob/user as mob, params) +/obj/machinery/gateway/centeraway/attackby(obj/item/device/W, mob/user, params) if(istype(W,/obj/item/device/multitool)) if(calibrated) user << "\black The gate is already calibrated, there is no work for you to do here." diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm index 381b167fb6e..de3de82c71c 100644 --- a/code/modules/awaymissions/maploader/reader.dm +++ b/code/modules/awaymissions/maploader/reader.dm @@ -16,7 +16,7 @@ var/global/dmm_suite/preloader/_preloader = null * 2) Read the map line by line, parsing the result (using parse_grid) * */ -/dmm_suite/load_map(var/dmm_file as file, var/z_offset as num) +/dmm_suite/load_map(dmm_file as file, z_offset as num) if(!z_offset)//what z_level we are creating the map on z_offset = world.maxz+1 @@ -110,7 +110,7 @@ var/global/dmm_suite/preloader/_preloader = null * 4) Instanciates the atom with its variables * */ -/dmm_suite/proc/parse_grid(var/model as text,var/xcrd as num,var/ycrd as num,var/zcrd as num) +/dmm_suite/proc/parse_grid(model as text,xcrd as num,ycrd as num,zcrd as num) /*Method parse_grid() - Accepts a text string containing a comma separated list of type paths of the same construction as those contained in a .dmm file, and instantiates them. @@ -203,7 +203,7 @@ var/global/dmm_suite/preloader/_preloader = null //////////////// //Instance an atom at (x,y,z) and gives it the variables in attributes -/dmm_suite/proc/instance_atom(var/path,var/list/attributes, var/x, var/y, var/z) +/dmm_suite/proc/instance_atom(path,list/attributes, x, y, z) var/atom/instance _preloader = new(attributes, path) @@ -216,7 +216,7 @@ var/global/dmm_suite/preloader/_preloader = null //text trimming (both directions) helper proc //optionally removes quotes before and after the text (for variable name) -/dmm_suite/proc/trim_text(var/what as text,var/trim_quotes=0) +/dmm_suite/proc/trim_text(what as text,trim_quotes=0) while(length(what) && (findtext(what," ",1,2))) what=copytext(what,2,0) while(length(what) && (findtext(what," ",length(what),0))) @@ -230,7 +230,7 @@ var/global/dmm_suite/preloader/_preloader = null //find the position of the next delimiter,skipping whatever is comprised between opening_escape and closing_escape //returns 0 if reached the last delimiter -/dmm_suite/proc/find_next_delimiter_position(var/text as text,var/initial_position as num, var/delimiter=",",var/opening_escape=quote,var/closing_escape=quote) +/dmm_suite/proc/find_next_delimiter_position(text as text,initial_position as num, delimiter=",",opening_escape=quote,closing_escape=quote) var/position = initial_position var/next_delimiter = findtext(text,delimiter,position,0) var/next_opening = findtext(text,opening_escape,position,0) @@ -245,7 +245,7 @@ var/global/dmm_suite/preloader/_preloader = null //build a list from variables in text form (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7)) //return the filled list -/dmm_suite/proc/text2list(var/text as text,var/delimiter=",") +/dmm_suite/proc/text2list(text as text,delimiter=",") var/list/to_return = list() @@ -295,7 +295,7 @@ var/global/dmm_suite/preloader/_preloader = null return to_return //simulates the DM multiple turfs on one tile underlaying -/dmm_suite/proc/add_underlying_turf(var/turf/placed,var/turf/underturf, var/list/turfs_underlays) +/dmm_suite/proc/add_underlying_turf(turf/placed,turf/underturf, list/turfs_underlays) if(underturf.density) placed.density = 1 if(underturf.opacity) @@ -318,7 +318,7 @@ var/global/dmm_suite/preloader/_preloader = null var/list/attributes var/target_path -/dmm_suite/preloader/New(var/list/the_attributes, var/path) +/dmm_suite/preloader/New(list/the_attributes, path) .=..() if(!the_attributes.len) Del() diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index f6d98d784dc..8b8baf4249c 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -173,7 +173,7 @@ var/sc_safecode5 = "[rand(0,9)]" if(prob(25)) mezzer() -/obj/singularity/narsie/sc_Narsie/consume(var/atom/A) +/obj/singularity/narsie/sc_Narsie/consume(atom/A) if(is_type_in_list(A, uneatable)) return 0 if (istype(A,/mob/living)) diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index c17e1f6d7e0..450d153a94f 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -51,7 +51,7 @@ var/chargesa = 1 var/insistinga = 0 -/obj/machinery/wish_granter_dark/attack_hand(var/mob/living/carbon/human/user as mob) +/obj/machinery/wish_granter_dark/attack_hand(mob/living/carbon/human/user) usr.set_machine(src) if(chargesa <= 0) diff --git a/code/modules/awaymissions/signpost.dm b/code/modules/awaymissions/signpost.dm index d836829598b..b25557db057 100644 --- a/code/modules/awaymissions/signpost.dm +++ b/code/modules/awaymissions/signpost.dm @@ -5,10 +5,10 @@ anchored = 1 density = 1 -/obj/structure/signpost/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/signpost/attackby(obj/item/weapon/W, mob/user, params) return attack_hand(user) -/obj/structure/signpost/attack_hand(mob/user as mob) +/obj/structure/signpost/attack_hand(mob/user) switch(alert("Travel back to ss13?",,"Yes","No")) if("Yes") if(user.z != src.z) return diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 30a82a92f63..c574816af2a 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -49,7 +49,7 @@ return 0 return 1 -/client/proc/handle_spam_prevention(var/message, var/mute_type) +/client/proc/handle_spam_prevention(message, mute_type) if(config.automute_on && !holder && src.last_message == message) src.last_message_count++ if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 43c3cfa03d4..1f52b42b1fb 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -516,7 +516,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set popup.open(0) return - proc/SetJobPreferenceLevel(var/datum/job/job, var/level) + proc/SetJobPreferenceLevel(datum/job/job, level) if (!job) return 0 @@ -618,7 +618,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set job_engsec_low = 0 - proc/GetJobDepartment(var/datum/job/job, var/level) + proc/GetJobDepartment(datum/job/job, level) if(!job || !level) return 0 switch(job.department_flag) if(CIVILIAN) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 186b2f0fca0..c4833791343 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -77,7 +77,7 @@ BLIND // can't see anything put_on_delay = 40 // Called just before an attack_hand(), in mob/UnarmedAttack() -/obj/item/clothing/gloves/proc/Touch(var/atom/A, var/proximity) +/obj/item/clothing/gloves/proc/Touch(atom/A, proximity) return 0 // return 1 to cancel attack_hand() //Head @@ -106,7 +106,7 @@ BLIND // can't see anything return message //Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption -/obj/item/clothing/mask/proc/adjustmask(var/mob/user) +/obj/item/clothing/mask/proc/adjustmask(mob/user) if(!ignore_maskadjust) if(user.incapacitated()) return @@ -326,7 +326,7 @@ atom/proc/generate_female_clothing(index,t_color,icon,type) ..() -/obj/item/clothing/under/AltClick(var/mob/user) +/obj/item/clothing/under/AltClick(mob/user) ..() if(!user.canUseTopic(user)) user << "You can't do that right now!" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 6bfa9615112..6233a560ac9 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -180,7 +180,7 @@ toggle_helmlight() ..() -/obj/item/clothing/head/helmet/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/clothing/head/helmet/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/device/flashlight/seclite)) var/obj/item/device/flashlight/seclite/S = A if(can_flashlight) @@ -231,7 +231,7 @@ update_helmlight(user) return -/obj/item/clothing/head/helmet/proc/update_helmlight(var/mob/user = null) +/obj/item/clothing/head/helmet/proc/update_helmlight(mob/user = null) if(F) action_button_name = "Toggle Helmetlight" if(F.on) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 1f5c29d940d..cd6dae472dc 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -66,7 +66,7 @@ if (istype(location, /turf)) location.hotspot_expose(700, 1) -/obj/item/clothing/head/cakehat/attack_self(mob/user as mob) +/obj/item/clothing/head/cakehat/attack_self(mob/user) if(status > 1) return src.onfire = !( src.onfire ) if (src.onfire) @@ -94,7 +94,7 @@ cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT -/obj/item/clothing/head/ushanka/attack_self(mob/user as mob) +/obj/item/clothing/head/ushanka/attack_self(mob/user) if(earflaps) src.icon_state = "ushankaup" src.item_state = "ushankaup" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 36d26136d5f..8c7fa5b2204 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -18,7 +18,7 @@ flip(usr) -/obj/item/clothing/head/soft/AltClick(var/mob/user) +/obj/item/clothing/head/soft/AltClick(mob/user) ..() if(!user.canUseTopic(user)) user << "You can't do that right now!" @@ -29,7 +29,7 @@ flip(user) -/obj/item/clothing/head/soft/proc/flip(var/mob/user) +/obj/item/clothing/head/soft/proc/flip(mob/user) if(user.canmove && !user.stat && !user.restrained()) src.flipped = !src.flipped if(src.flipped) diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 59239d4f22f..914fadd418c 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -10,7 +10,7 @@ action_button_name = "Adjust Balaclava" ignore_maskadjust = 0 -/obj/item/clothing/mask/balaclava/attack_self(var/mob/user) +/obj/item/clothing/mask/balaclava/attack_self(mob/user) adjustmask(user) /obj/item/clothing/mask/luchador diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 11480bfa95e..c6c80d9dc21 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -14,10 +14,10 @@ flags_cover = MASKCOVERSMOUTH burn_state = -1 //Won't burn in fires -/obj/item/clothing/mask/breath/attack_self(var/mob/user) +/obj/item/clothing/mask/breath/attack_self(mob/user) adjustmask(user) -/obj/item/clothing/mask/breath/AltClick(var/mob/user) +/obj/item/clothing/mask/breath/AltClick(mob/user) ..() if(!user.canUseTopic(user)) user << "You can't do that right now!" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 35fe69e2060..aaa51d6129f 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -74,7 +74,7 @@ ..() verbs -= /obj/item/clothing/mask/gas/sechailer/verb/adjust -/obj/item/clothing/mask/gas/sechailer/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/clothing/mask/gas/sechailer/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) switch(aggressiveness) if(1) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index e5a05417974..557163dbe97 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -31,7 +31,7 @@ action_button_name = "Adjust Sterile Mask" ignore_maskadjust = 0 -/obj/item/clothing/mask/surgical/attack_self(var/mob/user) +/obj/item/clothing/mask/surgical/attack_self(mob/user) adjustmask(user) /obj/item/clothing/mask/fakemoustache @@ -118,7 +118,7 @@ adjusted_flags = SLOT_HEAD icon_state = "bandbotany" -/obj/item/clothing/mask/bandana/attack_self(var/mob/user) +/obj/item/clothing/mask/bandana/attack_self(mob/user) adjustmask(user) /obj/item/clothing/mask/bandana/red diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 1074159da7f..1cce1cd3374 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -81,7 +81,7 @@ icon_state = "orange" item_color = "orange" -/obj/item/clothing/shoes/sneakers/orange/attack_self(mob/user as mob) +/obj/item/clothing/shoes/sneakers/orange/attack_self(mob/user) if (src.chained) src.chained = null src.slowdown = SHOES_SLOWDOWN @@ -89,7 +89,7 @@ src.icon_state = "orange" return -/obj/item/clothing/shoes/sneakers/orange/attackby(H as obj, loc, params) +/obj/item/clothing/shoes/sneakers/orange/attackby(obj/H, loc, params) ..() if ((istype(H, /obj/item/weapon/restraints/handcuffs) && !( src.chained ))) //H = null diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 04679faa2c5..9e0b55df4cb 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -34,7 +34,7 @@ var/teleporting = 0 -/obj/item/clothing/suit/space/chronos/proc/new_camera(var/mob/user) +/obj/item/clothing/suit/space/chronos/proc/new_camera(mob/user) if(camera) qdel(camera) camera = new /obj/effect/chronos_cam(get_turf(user)) @@ -65,7 +65,7 @@ user << "Elecrtromagnetic pulse detected, shutting down systems to preserve integrity..." deactivate() -/obj/item/clothing/suit/space/chronos/proc/chronowalk(var/mob/living/carbon/human/user) +/obj/item/clothing/suit/space/chronos/proc/chronowalk(mob/living/carbon/human/user) if(!teleporting && user && (user.stat == CONSCIOUS)) teleporting = 1 var/turf/from_turf = get_turf(user) diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 51ff7384a99..86594113f29 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -17,7 +17,7 @@ user << "There are [extinguishes_left] extinguisher canisters left in this suit." -/obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(var/mob/living/carbon/human/H) +/obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(mob/living/carbon/human/H) if(!istype(H)) return diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index d3b65c48e3a..d8dc137f797 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -103,7 +103,7 @@ armor = list(melee = 10, bullet = 10, laser = 60, energy = 50, bomb = 0, bio = 0, rad = 0) var/hit_reflect_chance = 40 -/obj/item/clothing/suit/armor/laserproof/IsReflect(var/def_zone) +/obj/item/clothing/suit/armor/laserproof/IsReflect(def_zone) if(!(def_zone in list("chest", "groin"))) //If not shot where ablative is covering you, you don't get the reflection bonus! hit_reflect_chance = 0 if (prob(hit_reflect_chance)) @@ -135,7 +135,7 @@ return 1 return 0 -/obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob) +/obj/item/clothing/suit/armor/reactive/attack_self(mob/user) src.active = !( src.active ) if (src.active) user << "[src] is now active." diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 24989946279..15bba89ad87 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -57,7 +57,7 @@ //Toggle exosuits for different aesthetic styles (hoodies, suit jacket buttons, etc) -/obj/item/clothing/suit/toggle/AltClick(var/mob/user) +/obj/item/clothing/suit/toggle/AltClick(mob/user) ..() if(!user.canUseTopic(user)) user << "You can't do that right now!" diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm index 578a9d51ab5..e6d1ecb8629 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/under/chameleon.dm @@ -25,7 +25,7 @@ return -/obj/item/clothing/under/chameleon/attackby(obj/item/clothing/under/U as obj, mob/user as mob, params) +/obj/item/clothing/under/chameleon/attackby(obj/item/clothing/under/U, mob/user, params) ..() if(istype(U, /obj/item/clothing/under/chameleon)) user << "\Nothing happens." diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index e828b3fe049..82f2030cc8d 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -286,6 +286,6 @@ item_color = "petcollar" var/tagname = null -/obj/item/clothing/tie/petcollar/attack_self(mob/user as mob) +/obj/item/clothing/tie/petcollar/attack_self(mob/user) tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN) name = "[initial(name)] - [tagname]" \ No newline at end of file diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index ae95ef86a03..df9fba019af 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -18,7 +18,7 @@ // CRAFTING // -/obj/item/weaponcrafting/reciever/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/weaponcrafting/reciever/attackby(obj/item/W, mob/user, params) if(istype(W,/obj/item/pipe)) user << "You attach the shotgun barrel to the receiver. The pins seem loose." var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction @@ -36,7 +36,7 @@ icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep1" -/obj/item/weaponcrafting/ishotgunconstruction/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weaponcrafting/ishotgunconstruction/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/weapon/screwdriver)) var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2 @@ -51,7 +51,7 @@ icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep1" -/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W, mob/user, params) if(istype(W,/obj/item/weaponcrafting/stock)) user << "You attach the stock to the receiver-barrel assembly." var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3 @@ -67,7 +67,7 @@ icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep2" -/obj/item/weaponcrafting/ishotgunconstruction3/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weaponcrafting/ishotgunconstruction3/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/packageWrap)) var/obj/item/stack/packageWrap/C = I diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm index 2cd99a8f349..3d0ed8b6d84 100644 --- a/code/modules/crafting/table.dm +++ b/code/modules/crafting/table.dm @@ -252,7 +252,7 @@ if(. <= 0) . = categories.len -/obj/structure/table/proc/build_recipe_text(var/datum/table_recipe/R) +/obj/structure/table/proc/build_recipe_text(datum/table_recipe/R) . = "" var/name_text = "" var/req_text = "" diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm index 9be12ce096e..9d4981c9e80 100644 --- a/code/modules/detectivework/detective_work.dm +++ b/code/modules/detectivework/detective_work.dm @@ -47,7 +47,7 @@ //world.log << "Added fibertext: [fibertext]" suit_fibers += "Material from a pair of [M.gloves.name]." -/atom/proc/add_hiddenprint(mob/living/M as mob) +/atom/proc/add_hiddenprint(mob/living/M) if(isnull(M)) return if(isnull(M.key)) return if(ishuman(M)) @@ -71,7 +71,7 @@ return //Set ignoregloves to add prints irrespective of the mob having gloves on. -/atom/proc/add_fingerprint(mob/living/M as mob, ignoregloves = 0) +/atom/proc/add_fingerprint(mob/living/M, ignoregloves = 0) if(isnull(M)) return if(isnull(M.key)) return if(ishuman(M)) @@ -127,7 +127,7 @@ return -/atom/proc/transfer_fingerprints_to(var/atom/A) +/atom/proc/transfer_fingerprints_to(atom/A) // Make sure everything are lists. if(!islist(A.fingerprints)) diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index b43f7077d9f..5f290278b75 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -65,7 +65,7 @@ w_class = I.w_class return 1 -/obj/item/weapon/evidencebag/attack_self(mob/user as mob) +/obj/item/weapon/evidencebag/attack_self(mob/user) if(contents.len) var/obj/item/I = contents[1] user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\ diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index 73849b4b366..512c860991a 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -18,7 +18,7 @@ possible_transfer_amounts = list(5) volume = 5 -/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity) +/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity) if(!proximity) return if(ismob(A) && A.reagents && reagents.total_volume) diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 5fbe0263949..66323ca69de 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -13,7 +13,7 @@ var/scanning = 0 var/list/log = list() -/obj/item/device/detective_scanner/attack_self(var/mob/user) +/obj/item/device/detective_scanner/attack_self(mob/user) if(log.len && !scanning) scanning = 1 user << "Printing report, please wait..." @@ -39,14 +39,14 @@ else user << "The scanner has no logs or is in use." -/obj/item/device/detective_scanner/attack(mob/living/M as mob, mob/user as mob) +/obj/item/device/detective_scanner/attack(mob/living/M, mob/user) return -/obj/item/device/detective_scanner/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/device/detective_scanner/afterattack(atom/A, mob/user, proximity) scan(A, user) -/obj/item/device/detective_scanner/proc/scan(var/atom/A, var/mob/user) +/obj/item/device/detective_scanner/proc/scan(atom/A, mob/user) if(!scanning) // Can remotely scan objects and mobs. @@ -160,7 +160,7 @@ scanning = 0 return -/obj/item/device/detective_scanner/proc/add_log(var/msg, var/broadcast = 1) +/obj/item/device/detective_scanner/proc/add_log(msg, broadcast = 1) if(scanning) if(broadcast && ismob(loc)) var/mob/M = loc diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 9c43c40eea8..e3df65c5480 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -184,7 +184,7 @@ var/spawn_type = pick_n_take(shuttle_spawns) new spawn_type(T) -/datum/round_event/shuttle_loan/proc/add_crates(var/list/crate_types, var/list/turfs) +/datum/round_event/shuttle_loan/proc/add_crates(list/crate_types, list/turfs) for(var/crate_type in crate_types) var/turf/T = pick_n_take(turfs) var/datum/supply_packs/sp_obj = new crate_type() diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index e89b8f97dda..c633246b3e4 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -343,7 +343,7 @@ eater.say("Nom") qdel(src) -/obj/effect/spacevine/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/effect/spacevine/attackby(obj/item/weapon/W, mob/user, params) if (!W || !user || !W.type) return user.changeNext_move(CLICK_CD_MELEE) @@ -381,13 +381,13 @@ for(var/datum/spacevine_mutation/SM in mutations) SM.on_cross(src, crosser) -/obj/effect/spacevine/attack_hand(mob/user as mob) +/obj/effect/spacevine/attack_hand(mob/user) for(var/datum/spacevine_mutation/SM in mutations) SM.on_hit(src, user) user_unbuckle_mob(user, user) -/obj/effect/spacevine/attack_paw(mob/living/user as mob) +/obj/effect/spacevine/attack_paw(mob/living/user) user.do_attack_animation(src) for(var/datum/spacevine_mutation/SM in mutations) SM.on_hit(src, user) @@ -426,7 +426,7 @@ SSobj.processing.Remove(src) ..() -/obj/effect/spacevine_controller/proc/spawn_spacevine_piece(var/turf/location, obj/effect/spacevine/parent, list/muts) +/obj/effect/spacevine_controller/proc/spawn_spacevine_piece(turf/location, obj/effect/spacevine/parent, list/muts) var/obj/effect/spacevine/SV = new(location) growth_queue += SV vines += SV diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 388da344db4..780af970fee 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -22,14 +22,14 @@ Gunshots/explosions/opening doors/less rare audio (done) /mob/living/carbon/proc/handle_hallucinations() if(handling_hal) return - + //Least obvious var/list/minor = list("sounds"=20,"bolts_minor"=10,"whispers"=15,"message"=5) //Something's wrong here var/list/medium = list("hudscrew"=15,"items"=15,"dangerflash"=15,"bolts"=10,"flood"=10,"husks"=10,"battle"=10) //AAAAH var/list/major = list("fake"=10,"death"=5,"xeno"=10,"singulo"=10,"delusion"=10) - + var/grade = 0 var/current = list() var/trip_length = 0 @@ -83,14 +83,14 @@ Gunshots/explosions/opening doors/less rare audio (done) I.color = col_mod return I -/obj/effect/hallucination/simple/proc/Show(var/update=1) +/obj/effect/hallucination/simple/proc/Show(update=1) if(active) if(target.client) target.client.images.Remove(current_image) if(update) current_image = GetImage() if(target.client) target.client.images |= current_image -/obj/effect/hallucination/simple/update_icon(var/new_state,var/new_icon,var/new_px=0,var/new_py=0) +/obj/effect/hallucination/simple/update_icon(new_state,new_icon,new_px=0,new_py=0) image_state = new_state if(new_icon) image_icon = new_icon @@ -209,7 +209,7 @@ Gunshots/explosions/opening doors/less rare audio (done) src.throwing = 0 src.throw_impact(get_turf(src)) - + return 1 /obj/effect/hallucination/simple/xeno/throw_impact(A) @@ -407,7 +407,7 @@ Gunshots/explosions/opening doors/less rare audio (done) var/health = 100 -/obj/effect/fake_attacker/attackby(var/obj/item/weapon/P as obj, mob/living/user as mob, params) +/obj/effect/fake_attacker/attackby(obj/item/weapon/P, mob/living/user, params) step_away(src,my_target,2) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) @@ -418,7 +418,7 @@ Gunshots/explosions/opening doors/less rare audio (done) src.health -= P.force return -/obj/effect/fake_attacker/Crossed(var/mob/M, somenumber) +/obj/effect/fake_attacker/Crossed(mob/M, somenumber) if(M == my_target) step_away(src,my_target,2) if(prob(30)) @@ -489,7 +489,7 @@ Gunshots/explosions/opening doors/less rare audio (done) collapse = 1 updateimage() -/obj/effect/fake_attacker/proc/fake_blood(var/mob/target) +/obj/effect/fake_attacker/proc/fake_blood(mob/target) var/obj/effect/overlay/O = new/obj/effect/overlay(target.loc) O.name = "blood" var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1) @@ -581,7 +581,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite target << chosen qdel(src) -/mob/living/carbon/proc/hallucinate(var/hal_type) // Todo -> proc / defines +/mob/living/carbon/proc/hallucinate(hal_type) // Todo -> proc / defines switch(hal_type) if("xeno") new /obj/effect/hallucination/xeno_attack(src.loc,src) diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index a99e0c6a6b0..ff06642aa2d 100644 --- a/code/modules/food&drinks/drinks/drinks.dm +++ b/code/modules/food&drinks/drinks/drinks.dm @@ -21,10 +21,10 @@ if (gulp_size < 5) gulp_size = 5 else gulp_size = max(round(reagents.total_volume / 5), 5) -/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user) return -/obj/item/weapon/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/reagent_containers/food/drinks/attack(mob/M, mob/user, def_zone) if(!reagents || !reagents.total_volume) user << "[src] is empty!" @@ -85,7 +85,7 @@ return -/obj/item/weapon/reagent_containers/food/drinks/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird return if(is_hot(I)) diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm index 7b806842aab..df99e5dc3eb 100644 --- a/code/modules/food&drinks/drinks/drinks/bottle.dm +++ b/code/modules/food&drinks/drinks/drinks/bottle.dm @@ -11,7 +11,7 @@ var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets) var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it -/obj/item/weapon/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target as mob, mob/living/user as mob) +/obj/item/weapon/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user) //Creates a shattering noise and replaces the bottle with a broken_bottle user.drop_item() @@ -32,7 +32,7 @@ qdel(src) -/obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target as mob, mob/living/user as mob) +/obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user) if(!target) return diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm index 440c8224b86..c595ab5bc77 100644 --- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm @@ -593,7 +593,7 @@ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola list_reagents = list("cola" = 50) -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/egg)) //breaking eggs var/obj/item/weapon/reagent_containers/food/snacks/egg/E = I if(reagents) diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm index de98ecda990..9f4e49345e1 100644 --- a/code/modules/food&drinks/food/condiment.dm +++ b/code/modules/food&drinks/food/condiment.dm @@ -26,10 +26,10 @@ "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!")) -/obj/item/weapon/reagent_containers/food/condiment/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/condiment/attack_self(mob/user) return -/obj/item/weapon/reagent_containers/food/condiment/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone) if(!reagents || !reagents.total_volume) user << "None of [src] left, oh no!" diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm index 1ea60e2531c..51203df2505 100644 --- a/code/modules/food&drinks/food/snacks.dm +++ b/code/modules/food&drinks/food/snacks.dm @@ -162,7 +162,7 @@ var/amount = bonus_reagents[r_id] reagents.add_reagent(r_id, amount) -/obj/item/weapon/reagent_containers/food/snacks/proc/slice(var/accuracy, obj/item/weapon/W, mob/user) +/obj/item/weapon/reagent_containers/food/snacks/proc/slice(accuracy, obj/item/weapon/W, mob/user) if((slices_num <= 0 || !slices_num) || !slice_path) //is the food sliceable? return 0 diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm index 08e3076e190..6a17202d6f0 100644 --- a/code/modules/food&drinks/food/snacks_egg.dm +++ b/code/modules/food&drinks/food/snacks_egg.dm @@ -23,7 +23,7 @@ reagents.reaction(hit_atom, TOUCH) del(src) // Not qdel, because it'll hit other mobs then the floor for runtimes. -/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W, mob/user, params) if(istype( W, /obj/item/toy/crayon )) var/obj/item/toy/crayon/C = W var/clr = C.colourName diff --git a/code/modules/food&drinks/kitchen machinery/food_cart.dm b/code/modules/food&drinks/kitchen machinery/food_cart.dm index 1cff6be4b82..e1d411e4538 100644 --- a/code/modules/food&drinks/kitchen machinery/food_cart.dm +++ b/code/modules/food&drinks/kitchen machinery/food_cart.dm @@ -24,11 +24,11 @@ mixer = new /obj/item/weapon/reagent_containers(src, MIXER_CAPACITY) mixer.name = "Mixer" -/obj/machinery/food_cart/attack_hand(mob/user as mob) +/obj/machinery/food_cart/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/food_cart/interact(mob/user as mob) +/obj/machinery/food_cart/interact(mob/user) var/dat dat += "
    STORED INGREDIENTS AND DRINKS
    " dat += "Remaining glasses: [glasses]
    " @@ -59,7 +59,7 @@ /obj/machinery/food_cart/proc/isFull() return food_stored >= STORAGE_CAPACITY -/obj/machinery/food_cart/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/food_cart/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) var/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/DG = O if(!DG.reagents.total_volume) //glass is empty diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm index ca40eb15486..1e0b4a791a2 100644 --- a/code/modules/food&drinks/kitchen machinery/gibber.dm +++ b/code/modules/food&drinks/kitchen machinery/gibber.dm @@ -35,7 +35,7 @@ diary << "a [src] didn't find an input plate." return -/obj/machinery/gibber/autogibber/Bumped(var/atom/A) +/obj/machinery/gibber/autogibber/Bumped(atom/A) if(!input_plate) return if(ismob(A)) @@ -78,14 +78,14 @@ else src.overlays += image('icons/obj/kitchen.dmi', "gridle") -/obj/machinery/gibber/attack_paw(mob/user as mob) +/obj/machinery/gibber/attack_paw(mob/user) return src.attack_hand(user) /obj/machinery/gibber/container_resist() src.go_out() return -/obj/machinery/gibber/attack_hand(mob/user as mob) +/obj/machinery/gibber/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return if(operating) @@ -94,7 +94,7 @@ else src.startgibbing(user) -/obj/machinery/gibber/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/gibber/attackby(obj/item/P, mob/user, params) if (istype(P, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = P if(!istype(G.affecting, /mob/living/carbon/)) @@ -148,7 +148,7 @@ dropContents() update_icon() -/obj/machinery/gibber/proc/startgibbing(mob/user as mob) +/obj/machinery/gibber/proc/startgibbing(mob/user) if(src.operating) return if(!src.occupant) diff --git a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm index a42158fca57..97fc97d5e47 100644 --- a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm +++ b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm @@ -19,7 +19,7 @@ flags = OPENCONTAINER | NOREACT reagents = new() -/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type) +/obj/machinery/icecream_vat/proc/get_ingredient_list(type) switch(type) if(ICECREAM_CHOCOLATE) return list("milk", "ice", "cocoa") @@ -35,7 +35,7 @@ return list("milk", "ice") -/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type) +/obj/machinery/icecream_vat/proc/get_flavour_name(flavour_type) switch(flavour_type) if(ICECREAM_CHOCOLATE) return "chocolate" @@ -61,11 +61,11 @@ reagents.add_reagent("sugar", 5) reagents.add_reagent("ice", 5) -/obj/machinery/icecream_vat/attack_hand(mob/user as mob) +/obj/machinery/icecream_vat/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/icecream_vat/interact(mob/user as mob) +/obj/machinery/icecream_vat/interact(mob/user) var/dat dat += "ICECREAM
    " dat += "Dispensing: [flavour_name] icecream

    " @@ -87,7 +87,7 @@ popup.set_content(dat) popup.open() -/obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/icecream_vat/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/icecream)) var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O if(!I.ice_creamed) @@ -110,7 +110,7 @@ else ..() -/obj/machinery/icecream_vat/proc/make(var/mob/user, var/make_type, var/amount) +/obj/machinery/icecream_vat/proc/make(mob/user, make_type, amount) for(var/R in get_ingredient_list(make_type)) if(reagents.has_reagent(R, amount)) continue diff --git a/code/modules/food&drinks/kitchen machinery/juicer.dm b/code/modules/food&drinks/kitchen machinery/juicer.dm index 4894af742f3..e688b2ee575 100644 --- a/code/modules/food&drinks/kitchen machinery/juicer.dm +++ b/code/modules/food&drinks/kitchen machinery/juicer.dm @@ -35,7 +35,7 @@ return -/obj/machinery/juicer/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/juicer/attackby(obj/item/O, mob/user, params) if(default_unfasten_wrench(user, O)) return if (istype(O,/obj/item/weapon/reagent_containers/glass) || \ @@ -62,17 +62,17 @@ src.updateUsrDialog() return 0 -/obj/machinery/juicer/attack_paw(mob/user as mob) +/obj/machinery/juicer/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/juicer/attack_ai(mob/user as mob) +/obj/machinery/juicer/attack_ai(mob/user) return 0 -/obj/machinery/juicer/attack_hand(mob/user as mob) +/obj/machinery/juicer/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/juicer/interact(mob/user as mob) // The microwave Menu +/obj/machinery/juicer/interact(mob/user) // The microwave Menu var/is_chamber_empty = 0 var/is_beaker_ready = 0 var/processing_chamber = "" @@ -138,12 +138,12 @@ beaker = null update_icon() -/obj/machinery/juicer/proc/get_juice_id(var/obj/item/weapon/reagent_containers/food/snacks/grown/O) +/obj/machinery/juicer/proc/get_juice_id(obj/item/weapon/reagent_containers/food/snacks/grown/O) for (var/i in allowed_items) if (istype(O, i)) return allowed_items[i] -/obj/machinery/juicer/proc/get_juice_amount(var/obj/item/weapon/reagent_containers/food/snacks/grown/O) +/obj/machinery/juicer/proc/get_juice_amount(obj/item/weapon/reagent_containers/food/snacks/grown/O) if (!istype(O)) return 5 else if (O.potency == -1) diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm index 2bfe5e836ce..ff512b49687 100644 --- a/code/modules/food&drinks/kitchen machinery/microwave.dm +++ b/code/modules/food&drinks/kitchen machinery/microwave.dm @@ -47,7 +47,7 @@ * Item Adding ********************/ -/obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/microwave/attackby(obj/item/O, mob/user, params) if(operating) return if(!broken && dirty<100) @@ -162,13 +162,13 @@ ..() updateUsrDialog() -/obj/machinery/microwave/attack_paw(mob/user as mob) +/obj/machinery/microwave/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/microwave/attack_ai(mob/user as mob) +/obj/machinery/microwave/attack_ai(mob/user) return 0 -/obj/machinery/microwave/attack_hand(mob/user as mob) +/obj/machinery/microwave/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -178,7 +178,7 @@ * Microwave Menu ********************/ -/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu +/obj/machinery/microwave/interact(mob/user) // The microwave Menu if(panel_open || !anchored) return var/dat = "
    " @@ -260,7 +260,7 @@ return -/obj/machinery/microwave/proc/microwaving(var/seconds as num) +/obj/machinery/microwave/proc/microwaving(seconds as num) for (var/i=1 to seconds) if (stat & (NOPOWER|BROKEN)) return 0 diff --git a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm index fc6a899f5b0..84902910ba1 100644 --- a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm +++ b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm @@ -32,7 +32,7 @@ cube_production = cubes_made required_grind = req_grind -/obj/machinery/monkey_recycler/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O)) return @@ -77,7 +77,7 @@ user << "The machine only accepts monkeys!" return -/obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob) +/obj/machinery/monkey_recycler/attack_hand(mob/user) if (src.stat != 0) //NOPOWER etc return if(grinded >= required_grind) diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/food&drinks/kitchen machinery/processor.dm index 78038266d98..431dee34309 100644 --- a/code/modules/food&drinks/kitchen machinery/processor.dm +++ b/code/modules/food&drinks/kitchen machinery/processor.dm @@ -33,7 +33,7 @@ var/input var/output var/time = 40 -/datum/food_processor_process/proc/process_food(loc, what, var/obj/machinery/processor/processor) +/datum/food_processor_process/proc/process_food(loc, what, obj/machinery/processor/processor) if (src.output && loc && processor) for(var/i = 0, i < processor.rating_amount, i++) new src.output(loc) @@ -79,7 +79,7 @@ ..() -/datum/food_processor_process/mob/slime/process_food(loc, what, var/obj/machinery/processor/processor) +/datum/food_processor_process/mob/slime/process_food(loc, what, obj/machinery/processor/processor) var/mob/living/simple_animal/slime/S = what var/C = S.cores if(S.stat != DEAD) @@ -126,7 +126,7 @@ /datum/food_processor_process/mob/monkey/input = /mob/living/carbon/monkey /datum/food_processor_process/mob/monkey/output = null -/obj/machinery/processor/proc/select_recipe(var/X) +/obj/machinery/processor/proc/select_recipe(X) for (var/Type in typesof(/datum/food_processor_process) - /datum/food_processor_process - /datum/food_processor_process/mob) var/datum/food_processor_process/P = new Type() if (!istype(X, P.input)) @@ -134,7 +134,7 @@ return P return 0 -/obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/processor/attackby(obj/item/O, mob/user, params) if(src.processing) user << "The processor is in the process of processing!" return 1 @@ -169,7 +169,7 @@ what:loc = src return -/obj/machinery/processor/attack_hand(var/mob/user as mob) +/obj/machinery/processor/attack_hand(mob/user) if (src.stat != 0) //NOPOWER etc return if(src.processing) diff --git a/code/modules/food&drinks/kitchen machinery/smartfridge.dm b/code/modules/food&drinks/kitchen machinery/smartfridge.dm index 9365a4e9703..1e83c706d99 100644 --- a/code/modules/food&drinks/kitchen machinery/smartfridge.dm +++ b/code/modules/food&drinks/kitchen machinery/smartfridge.dm @@ -54,7 +54,7 @@ * Item Adding ********************/ -/obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/smartfridge/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, "smartfridge_open", "smartfridge", O)) return @@ -118,12 +118,12 @@ -/obj/machinery/smartfridge/proc/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/proc/accept_check(obj/item/O) if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/)) return 1 return 0 -/obj/machinery/smartfridge/proc/load(var/obj/item/O as obj) +/obj/machinery/smartfridge/proc/load(obj/item/O) if(istype(O.loc,/mob)) var/mob/M = O.loc if(!M.unEquip(O)) @@ -142,13 +142,13 @@ item_quants[n] = 1 sortList(item_quants) -/obj/machinery/smartfridge/attack_paw(mob/user as mob) +/obj/machinery/smartfridge/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/smartfridge/attack_ai(mob/user as mob) +/obj/machinery/smartfridge/attack_ai(mob/user) return 0 -/obj/machinery/smartfridge/attack_hand(mob/user as mob) +/obj/machinery/smartfridge/attack_hand(mob/user) user.set_machine(src) interact(user) @@ -156,7 +156,7 @@ * SmartFridge Menu ********************/ -/obj/machinery/smartfridge/interact(mob/user as mob) +/obj/machinery/smartfridge/interact(mob/user) if(stat) return 0 @@ -227,7 +227,7 @@ icon_off = "drying_rack" var/drying = 0 -/obj/machinery/smartfridge/drying_rack/interact(mob/user as mob) +/obj/machinery/smartfridge/drying_rack/interact(mob/user) var/dat = ..() if(dat) dat += "
    " @@ -235,7 +235,7 @@ user << browse("[src] supplies[dat]", "window=smartfridge") onclose(user, "smartfridge") -/obj/machinery/smartfridge/drying_rack/Topic(var/href, var/list/href_list) +/obj/machinery/smartfridge/drying_rack/Topic(href, list/href_list) ..() if(href_list["dry"]) toggle_drying() @@ -267,14 +267,14 @@ if(rack_dry())//no need to update unless something got dried update_icon() -/obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O) if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/)) var/obj/item/weapon/reagent_containers/food/snacks/S = O if(S.dried_type) return 1 return 0 -/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(var/forceoff = 0) +/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(forceoff = 0) if(drying || forceoff) drying = 0 use_power = 1 @@ -308,7 +308,7 @@ name = "drink showcase" desc = "A refrigerated storage unit for tasty tasty alcohol." -/obj/machinery/smartfridge/drinks/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/drinks/accept_check(obj/item/O) if(!istype(O,/obj/item/weapon/reagent_containers) || !O.reagents || !O.reagents.reagent_list.len) return 0 if(istype(O,/obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks) || istype(O,/obj/item/weapon/reagent_containers/food/condiment)) @@ -322,7 +322,7 @@ name = "smart slime extract storage" desc = "A refrigerated storage unit for slime extracts." -/obj/machinery/smartfridge/extract/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/extract/accept_check(obj/item/O) if(istype(O,/obj/item/slime_extract)) return 1 if(istype(O,/obj/item/device/slime_scanner)) @@ -355,7 +355,7 @@ load(I) amount-- -/obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/chemistry/accept_check(obj/item/O) if(istype(O,/obj/item/weapon/storage/pill_bottle)) if(O.contents.len) for(var/obj/item/I in O) diff --git a/code/modules/food&drinks/recipes/food_mixtures.dm b/code/modules/food&drinks/recipes/food_mixtures.dm index f6d4bf2145f..39ad0b66acd 100644 --- a/code/modules/food&drinks/recipes/food_mixtures.dm +++ b/code/modules/food&drinks/recipes/food_mixtures.dm @@ -10,7 +10,7 @@ result_amount = 1 mob_react=1 -/datum/chemical_reaction/tofu/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/tofu(location) @@ -23,7 +23,7 @@ required_reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2) result_amount = 1 -/datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) @@ -37,7 +37,7 @@ required_reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2) result_amount = 1 mob_react = 1 -/datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) @@ -87,7 +87,7 @@ required_catalysts = list("enzyme" = 5) result_amount = 1 -/datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) new /obj/item/weapon/reagent_containers/food/snacks/store/cheesewheel(location) return @@ -100,7 +100,7 @@ result_amount = 1 mob_react = 1 -/datum/chemical_reaction/synthmeat/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat(location) return @@ -129,7 +129,7 @@ required_container = /obj/item/weapon/reagent_containers/food/snacks/tofu mix_message = "The mixture becomes similar to carp meat." -/datum/chemical_reaction/imitationcarpmeat/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/imitationcarpmeat/on_reaction(datum/reagents/holder) var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation S.loc = get_turf(holder.my_atom) if(holder && holder.my_atom) @@ -143,7 +143,7 @@ result_amount = 1 mix_message = "The ingredients form a dough." -/datum/chemical_reaction/dough/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/dough(location) @@ -156,7 +156,7 @@ result_amount = 1 mix_message = "The ingredients form a cake batter." -/datum/chemical_reaction/cakebatter/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/cakebatter/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/cakebatter(location) @@ -174,7 +174,7 @@ required_container = /obj/item/weapon/reagent_containers/glass/bowl mix_message = "The rice absorbs the water." -/datum/chemical_reaction/ricebowl/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/ricebowl/on_reaction(datum/reagents/holder) var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/salad/ricebowl S.loc = get_turf(holder.my_atom) if(holder && holder.my_atom) diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 6058b09be26..0efe72640e1 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -52,7 +52,7 @@ src.cards.Add(card) -/obj/item/weapon/deck/attackby(obj/O as obj, mob/user as mob) +/obj/item/weapon/deck/attackby(obj/O, mob/user) if (istype(O,/obj/item/weapon/hand)) var/obj/item/weapon/hand/H = O @@ -63,7 +63,7 @@ user.show_message("You place your cards on the bottom of the deck.") else return ..() -/obj/item/weapon/deck/attack_self(var/mob/user as mob) +/obj/item/weapon/deck/attack_self(mob/user) var/list/newcards = list() var/datum/playingcard/card @@ -82,7 +82,7 @@ if (istype(A, /mob/living)) src.dealTo(A, user) else return ..() -/obj/item/weapon/deck/attack(mob/living/M as mob, mob/living/user as mob, def_zone) +/obj/item/weapon/deck/attack(mob/living/M, mob/living/user, def_zone) if (istype(M)) src.dealTo(M, user) else return ..() @@ -130,7 +130,7 @@ return ..() -/obj/item/weapon/hand/attackby(obj/O as obj, mob/user as mob) +/obj/item/weapon/hand/attackby(obj/O, mob/user) if(istype(O,/obj/item/weapon/hand)) var/obj/item/weapon/hand/H = O @@ -178,7 +178,7 @@ src.update_icon() -/obj/item/weapon/hand/attack_self(var/mob/user as mob) +/obj/item/weapon/hand/attack_self(mob/user) src.hi.show(user) /obj/item/weapon/hand/examine() diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 6c5fa4ba2c2..f70dbf3dee4 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -116,7 +116,7 @@ icon_state = "egg-[color]" item_color = "[color]" -/obj/item/weapon/reagent_containers/food/snacks/egg/proc/dispensePrize(var/turf/where) +/obj/item/weapon/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where) var/won = pick(/obj/item/clothing/head/bunnyhead, /obj/item/clothing/suit/bunnysuit, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, @@ -133,7 +133,7 @@ new won(where) new/obj/item/weapon/reagent_containers/food/snacks/chocolateegg(where) -/obj/item/weapon/reagent_containers/food/snacks/egg/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/egg/attack_self(mob/user) ..() if(containsPrize) user << "You unwrap the [src] and find a prize inside!" diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index 5f83a701ac6..6f187ea2ae9 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -276,7 +276,7 @@ if(prob(5)) playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1) -/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(var/obj/item/O as obj, var/mob/user as mob) +/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(obj/item/O, mob/user) if(istype(O,/obj/item/weapon/nullrod)) if(prob(5)) visible_message("[src] finally found the peace it deserves. You hear honks echoing off into the distance.") diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index bec34b1c197..28784576f31 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -53,7 +53,7 @@ icon_state = "biogen-work" return -/obj/machinery/biogenerator/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/biogenerator/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/glass) && !panel_open) if(beaker) user << "A container is already loaded into the machine." @@ -113,7 +113,7 @@ update_icon() return -/obj/machinery/biogenerator/interact(mob/user as mob) +/obj/machinery/biogenerator/interact(mob/user) if(stat & BROKEN || panel_open) return user.set_machine(src) @@ -179,7 +179,7 @@ popup.open() return -/obj/machinery/biogenerator/attack_hand(mob/user as mob) +/obj/machinery/biogenerator/attack_hand(mob/user) interact(user) /obj/machinery/biogenerator/proc/activate() @@ -210,7 +210,7 @@ menustat = "void" return -/obj/machinery/biogenerator/proc/check_cost(var/cost) +/obj/machinery/biogenerator/proc/check_cost(cost) if (cost > points) menustat = "nopoints" return 1 @@ -221,12 +221,12 @@ updateUsrDialog() return 0 -/obj/machinery/biogenerator/proc/check_container_volume(var/reagent_amount) +/obj/machinery/biogenerator/proc/check_container_volume(reagent_amount) if(beaker.reagents.total_volume + reagent_amount > beaker.reagents.maximum_volume) menustat = "nobeakerspace" return 1 -/obj/machinery/biogenerator/proc/create_product(var/create) +/obj/machinery/biogenerator/proc/create_product(create) switch(create) if("milk") if(check_container_volume(10)) return 0 diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 8fe33dc7e58..6c11a41934e 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -49,7 +49,7 @@ return 1 return 0 -/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params) ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) var/msg @@ -73,7 +73,7 @@ return return -/obj/item/weapon/grown/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/grown/attackby(obj/item/O, mob/user, params) ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) var/msg @@ -193,7 +193,7 @@ reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = reagents.total_volume -/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W @@ -646,7 +646,7 @@ reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Capsaicin: [reagents.get_reagent_amount("capsaicin")]%" @@ -666,7 +666,7 @@ reagents.add_reagent("frostoil", 3+round(potency / 5, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Frost Oil: [reagents.get_reagent_amount("frostoil")]%" @@ -687,12 +687,12 @@ reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1)) bitesize = 1 + round(reagents.total_volume / 4, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Capsaicin: [reagents.get_reagent_amount("capsaicin")]%" -/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user) ..() if( istype(src.loc, /mob) ) held_mob = src.loc @@ -832,7 +832,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() return ..() -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user) if(awakening || istype(user.loc,/turf/space)) return user << "You begin to awaken the Killer Tomato..." @@ -861,7 +861,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() splat = /obj/effect/gibspawner/generic filling_color = "#FF0000" -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood/add_juice(var/loc, var/potency = 10) +/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood/add_juice(loc, potency = 10) ..() reagents.add_reagent("blood", 1 + round((potency / 5), 1)) @@ -896,7 +896,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() ..() reagents.add_reagent("singulo", 1 + round((potency / 5), 1)) -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(var/mob/user) +/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(mob/user) squish(user) user.unEquip(src) src.visible_message("[user] squashes the [src.name].","You hear a smack.") @@ -961,7 +961,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user) user << "You prepare the astroturf." var/grassAmt = 1 + round(potency / 50) // The grass we're holding for(var/obj/item/weapon/reagent_containers/food/snacks/grown/grass/G in user.loc) // The grass on the floor @@ -986,7 +986,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() desc = "The textile industry's dark secret." icon_state = "carpetclump" -/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/attack_self(mob/user) user << "You roll out the red carpet." var/carpetAmt = 1 + round(potency / 50) // The carpet we're holding for(var/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/C in user.loc) // The carpet on the floor @@ -1051,7 +1051,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("morphine", 3+round(potency / 3, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Anti-Toxin: [reagents.get_reagent_amount("charcoal")]%" @@ -1071,7 +1071,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("mushroomhallucinogen", 1 + round(potency / 25, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Amatoxins: [reagents.get_reagent_amount("amatoxin")]%" @@ -1091,7 +1091,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("mushroomhallucinogen", 1 + round(potency / 25, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Amatoxins: [reagents.get_reagent_amount("amatoxin")]%" @@ -1104,13 +1104,13 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "libertycap" filling_color = "#DAA520" -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/add_juice(var/loc, var/potency = 15) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/add_juice(loc, potency = 15) ..() reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) reagents.add_reagent("mushroomhallucinogen", 3+round(potency / 5, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Mushroom Hallucinogen: [reagents.get_reagent_amount("mushroomhallucinogen")]%" @@ -1141,7 +1141,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("nutriment", 2+round((potency / 10), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user) if(istype(user.loc,/turf/space)) return var/mob/living/simple_animal/hostile/mushroom/M = new /mob/living/simple_animal/hostile/mushroom(user.loc) @@ -1194,7 +1194,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("radium", 1 + round((potency / 20), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user) if(istype(user.loc,/turf/space)) return var/obj/effect/glowshroom/planted = new /obj/effect/glowshroom(user.loc) @@ -1290,7 +1290,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() desc = "Dry them out to make coffee." icon_state = "coffee_robusta" -/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta/add_juice(var/loc, var/potency = 20) +/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta/add_juice(loc, potency = 20) ..() reagents.add_reagent("morphine", 1 + round((potency / 20), 1)) diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 3a925b8e4c4..10af706e393 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -66,7 +66,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) -/obj/item/weapon/grown/log/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/grown/log/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || (istype(W, /obj/item/weapon/twohanded/fireaxe) && W:wielded) || istype(W, /obj/item/weapon/melee/energy)) user.show_message("You make [plank_name] out of \the [src]!", 1) @@ -114,7 +114,7 @@ throw_speed = 1 throw_range = 3 -/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/grown/sunflower/attack(mob/M, mob/user) M << " [user] smacks you with a sunflower!FLOWER POWER" user << "Your sunflower's FLOWER POWERstrikes [M]" @@ -141,14 +141,14 @@ reagents.add_reagent("condensedcapsaicin", round((potency / 4), 1)) force = round((5 + potency / 5), 1) -/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob) +/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M, mob/user) if(!..()) return if(istype(M, /mob/living)) M << "You are lit on fire from the intense heat of the [name]!" M.adjust_fire_stacks(potency / 20) M.IgniteMob() -/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user as mob,proximity) +/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) if(!proximity) return if(endurance > 0) endurance -= rand(1, (endurance / 3) + 1) @@ -157,7 +157,7 @@ usr.unEquip(src) qdel(src) -/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob) +/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user) if(!user.gloves) user << "The [name] burns your bare hand!" user.adjustFireLoss(rand(1, 5)) @@ -183,7 +183,7 @@ user.visible_message("[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.") return (BRUTELOSS|TOXLOSS) -/obj/item/weapon/grown/nettle/pickup(mob/living/user as mob) +/obj/item/weapon/grown/nettle/pickup(mob/living/user) if(!iscarbon(user)) return 0 var/mob/living/carbon/C = user @@ -200,7 +200,7 @@ C << "The nettle burns your bare hand!" return 1 -/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user as mob,proximity) +/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity) if(!proximity) return if(force > 0) force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off @@ -233,13 +233,13 @@ reagents.add_reagent("facid", round((potency / 2), 1)) force = round((5 + potency / 2.5), 1) -/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user as mob) +/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user) if(..()) if(prob(50)) user.Paralyse(5) user << "You are stunned by the Deathnettle when you try picking it up!" -/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M as mob, mob/user as mob) +/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M, mob/user) if(!..()) return if(istype(M, /mob/living)) M << "You are stunned by the powerful acid of the Deathnettle!" @@ -300,7 +300,7 @@ throw_speed = 3 throw_range = 7 -/obj/item/weapon/grown/corncob/attackby(obj/item/weapon/grown/W as obj, mob/user as mob, params) +/obj/item/weapon/grown/corncob/attackby(obj/item/weapon/grown/W, mob/user, params) ..() if(is_sharp(W)) user << "You use [W] to fashion a pipe out of the corn cob!" @@ -324,7 +324,7 @@ ..() snap_pops = max(round(potency/8), 1) -/obj/item/weapon/grown/snapcorn/attack_self(mob/user as mob) +/obj/item/weapon/grown/snapcorn/attack_self(mob/user) ..() user << "You pick up a snap pops from the cob." var/obj/item/toy/snappop/S = new /obj/item/toy/snappop(user.loc) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index f44d54f78b9..46c56442345 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -7,7 +7,7 @@ item_state = "analyzer" origin_tech = "magnets=1;biotech=1" -/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user as mob) +/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user) return 0 // ************************************* diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index bb6cf6c74af..fe1602b92b1 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -94,7 +94,7 @@ return connected -/obj/machinery/hydroponics/bullet_act(var/obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables. +/obj/machinery/hydroponics/bullet_act(obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables. if(!planted) ..() return @@ -335,7 +335,7 @@ visible_message("[oldPlantName] overtaken by [myseed.plantname].") -/obj/machinery/hydroponics/proc/mutate(var/lifemut = 2, var/endmut = 5, var/productmut = 1, var/yieldmut = 2, var/potmut = 25) // Mutates the current seed +/obj/machinery/hydroponics/proc/mutate(lifemut = 2, endmut = 5, productmut = 1, yieldmut = 2, potmut = 25) // Mutates the current seed if(!planted) return adjustSLife(rand(-lifemut,lifemut)) @@ -416,7 +416,7 @@ else usr << "The pests seem to behave oddly, but quickly settle down..." -/obj/machinery/hydroponics/proc/applyChemicals(var/datum/reagents/S) +/obj/machinery/hydroponics/proc/applyChemicals(datum/reagents/S) if(myseed) myseed.on_chem_reaction(S) //In case seeds have some special interactions with special chems, currently only used by vines @@ -590,7 +590,7 @@ if(1 to 32) mutatepest() else usr << "Nothing happens..." -/obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/hydroponics/attackby(obj/item/O, mob/user, params) //Called when mob user "attacks" it with object O if(istype(O, /obj/item/weapon/reagent_containers) ) // Syringe stuff (and other reagent containers now too) @@ -765,7 +765,7 @@ return -/obj/machinery/hydroponics/attack_hand(mob/user as mob) +/obj/machinery/hydroponics/attack_hand(mob/user) if(istype(user, /mob/living/silicon)) //How does AI know what plant is? return if(harvest) @@ -899,41 +899,41 @@ update_icon() /// Tray Setters - The following procs adjust the tray or plants variables, and make sure that the stat doesn't go out of bounds./// -/obj/machinery/hydroponics/proc/adjustNutri(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustNutri(adjustamt) nutrilevel += adjustamt nutrilevel = max(nutrilevel, 0) nutrilevel = min(nutrilevel, maxnutri) -/obj/machinery/hydroponics/proc/adjustWater(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustWater(adjustamt) waterlevel += adjustamt waterlevel = max(waterlevel, 0) waterlevel = min(waterlevel, maxwater) if(adjustamt>0) adjustToxic(-round(adjustamt/4))//Toxicity dilutation code. The more water you put in, the lesser the toxin concentration. -/obj/machinery/hydroponics/proc/adjustHealth(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustHealth(adjustamt) if(planted && !dead) health += adjustamt health = max(health, 0) health = min(health, myseed.endurance) -/obj/machinery/hydroponics/proc/adjustToxic(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustToxic(adjustamt) toxic += adjustamt toxic = max(toxic, 0) toxic = min(toxic, 100) -/obj/machinery/hydroponics/proc/adjustPests(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustPests(adjustamt) pestlevel += adjustamt pestlevel = max(pestlevel, 0) pestlevel = min(pestlevel, 10) -/obj/machinery/hydroponics/proc/adjustWeeds(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustWeeds(adjustamt) weedlevel += adjustamt weedlevel = max(weedlevel, 0) weedlevel = min(weedlevel, 10) /// Seed Setters /// -/obj/machinery/hydroponics/proc/adjustSYield(var/adjustamt)//0,10 +/obj/machinery/hydroponics/proc/adjustSYield(adjustamt)//0,10 if(myseed && myseed.yield != -1) // Unharvestable shouldn't suddenly turn harvestable myseed.yield += adjustamt myseed.yield = max(myseed.yield, 0) @@ -941,25 +941,25 @@ if(myseed.yield <= 0 && myseed.plant_type == 2) myseed.yield = 1 // Mushrooms always have a minimum yield of 1. -/obj/machinery/hydroponics/proc/adjustSLife(var/adjustamt)//10,100 +/obj/machinery/hydroponics/proc/adjustSLife(adjustamt)//10,100 if(myseed) myseed.lifespan += adjustamt myseed.lifespan = max(myseed.lifespan, 10) myseed.lifespan = min(myseed.lifespan, 100) -/obj/machinery/hydroponics/proc/adjustSEnd(var/adjustamt)//10,100 +/obj/machinery/hydroponics/proc/adjustSEnd(adjustamt)//10,100 if(myseed) myseed.endurance += adjustamt myseed.endurance = max(myseed.endurance, 10) myseed.endurance = min(myseed.endurance, 100) -/obj/machinery/hydroponics/proc/adjustSProduct(var/adjustamt)//2,10 +/obj/machinery/hydroponics/proc/adjustSProduct(adjustamt)//2,10 if(myseed) myseed.production += adjustamt myseed.production = max(myseed.production, 2) myseed.production = min(myseed.production, 10) -/obj/machinery/hydroponics/proc/adjustSPot(var/adjustamt)//0,100 +/obj/machinery/hydroponics/proc/adjustSPot(adjustamt)//0,100 if(myseed && myseed.potency != -1) //Not all plants have a potency myseed.potency += adjustamt myseed.potency = max(myseed.potency, 0) @@ -1000,7 +1000,7 @@ SetLuminosity(0) return -/obj/machinery/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/hydroponics/soil/attackby(obj/item/O, mob/user, params) ..() if(istype(O, /obj/item/weapon/shovel)) user << "You clear up [src]!" diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 0ad83aeb190..b8eec1a9ba8 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -1,4 +1,4 @@ -/proc/seedify(var/obj/item/O as obj, var/t_max, var/obj/machinery/seed_extractor/extractor) +/proc/seedify(obj/item/O, t_max, obj/machinery/seed_extractor/extractor) var/t_amount = 0 if(t_max == -1) if(extractor) @@ -71,7 +71,7 @@ for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) seed_multiplier = M.rating -/obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/seed_extractor/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, "sextractor_open", "sextractor", O)) return @@ -142,11 +142,11 @@ src.potency = poten src.amount = am -/obj/machinery/seed_extractor/attack_hand(mob/user as mob) +/obj/machinery/seed_extractor/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/seed_extractor/interact(mob/user as mob) +/obj/machinery/seed_extractor/interact(mob/user) if (stat) return 0 @@ -197,7 +197,7 @@ src.updateUsrDialog() return -/obj/machinery/seed_extractor/proc/add(var/obj/item/seeds/O as obj) +/obj/machinery/seed_extractor/proc/add(obj/item/seeds/O) if(contents.len >= 999) usr << "\The [src] is full." return 0 diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 662f76cb686..7334590239e 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -31,10 +31,10 @@ /obj/item/seeds/proc/get_analyzer_text() //in case seeds have something special to tell to the analyzer return -/obj/item/seeds/proc/on_chem_reaction(var/datum/reagents/S) //in case seeds have some special interaction with special chems +/obj/item/seeds/proc/on_chem_reaction(datum/reagents/S) //in case seeds have some special interaction with special chems return -/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/seeds/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "*** [plantname] ***" user << "-Plant Endurance: [endurance]" @@ -95,7 +95,7 @@ var/factions = null var/contains_sample = 0 -/obj/item/seeds/replicapod/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/seeds/replicapod/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/reagent_containers/syringe)) if(!contains_sample) for(var/datum/reagent/blood/bloodSample in W.reagents.reagent_list) @@ -1344,7 +1344,7 @@ for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod) K.mutations = mutations -/obj/item/seeds/kudzuseed/attack_self(mob/user as mob) +/obj/item/seeds/kudzuseed/attack_self(mob/user) if(istype(user.loc,/turf/space)) return var/turf/T = get_turf(src) @@ -1362,7 +1362,7 @@ mut_text += "-Plant Mutations: [(text_string == "") ? "None" : text_string]" return mut_text -/obj/item/seeds/kudzuseed/on_chem_reaction(var/datum/reagents/S) +/obj/item/seeds/kudzuseed/on_chem_reaction(datum/reagents/S) var/list/temp_mut_list = list() diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index f5dc638ee49..fd0ce010d97 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -26,7 +26,7 @@ var/author var/SQLquery -/obj/machinery/computer/libraryconsole/attack_hand(var/mob/user as mob) +/obj/machinery/computer/libraryconsole/attack_hand(mob/user) if(..()) return interact(user) @@ -290,7 +290,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() -/obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/barcodescanner)) var/obj/item/weapon/barcodescanner/scanner = W scanner.computer = src @@ -299,7 +299,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums else ..() -/obj/machinery/computer/libraryconsole/bookmanagement/emag_act(mob/user as mob) +/obj/machinery/computer/libraryconsole/bookmanagement/emag_act(mob/user) if(density && !emagged) emagged = 1 @@ -445,13 +445,13 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums density = 1 var/obj/item/weapon/book/cache // Last scanned book -/obj/machinery/libraryscanner/attackby(var/obj/O as obj, var/mob/user as mob, params) +/obj/machinery/libraryscanner/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/weapon/book)) if(!user.drop_item()) return O.loc = src -/obj/machinery/libraryscanner/attack_hand(var/mob/user as mob) +/obj/machinery/libraryscanner/attack_hand(mob/user) usr.set_machine(src) var/dat = "" // if(cache) @@ -501,7 +501,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums density = 1 var/busy = 0 -/obj/machinery/bookbinder/attackby(var/obj/O as obj, var/mob/user as mob, params) +/obj/machinery/bookbinder/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/weapon/paper)) if(busy) user << "The book binder is busy. Please wait for completion of previous operation." diff --git a/code/modules/lighting/lighting_system.dm b/code/modules/lighting/lighting_system.dm index 19f61193cf3..9a97bc52b5b 100644 --- a/code/modules/lighting/lighting_system.dm +++ b/code/modules/lighting/lighting_system.dm @@ -235,7 +235,7 @@ var/atom/movable/light/lighting_object //Will be null for space turfs and anything in a static lighting area var/list/affecting_lights //not initialised until used (even empty lists reserve a fair bit of memory) -/turf/ChangeTurf(var/path) +/turf/ChangeTurf(path) if(!path || path == type) //Sucks this is here but it would cause problems otherwise. return ..() @@ -295,7 +295,7 @@ if(config.starlight) update_starlight() -/turf/proc/redraw_lighting(var/instantly = 0) +/turf/proc/redraw_lighting(instantly = 0) if(lighting_object) var/newalpha if(lighting_lumcount <= 0) diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 1e38491439f..b7552f60814 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -154,7 +154,7 @@ if(100) new /obj/item/clothing/head/bearpelt(src) -/obj/structure/closet/crate/secure/loot/attack_hand(mob/user as mob) +/obj/structure/closet/crate/secure/loot/attack_hand(mob/user) if(locked) user << "The crate is locked with a Deca-code lock." var/input = input(usr, "Enter [codelen] digits.", "Deca-Code Lock", "") as text @@ -179,7 +179,7 @@ else return ..() -/obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W, mob/user) if(locked) if (istype(W, /obj/item/weapon/card/emag)) user << "The crate's anti-tamper system activates!" diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 8cce76294b6..85d0eaa50f0 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -85,7 +85,7 @@ else break -/obj/machinery/mineral/ore_redemption/attackby(var/obj/item/weapon/W, var/mob/user, params) +/obj/machinery/mineral/ore_redemption/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/card/id)) var/obj/item/weapon/card/id/I = usr.get_active_hand() if(istype(I) && !istype(inserted_id)) @@ -113,7 +113,7 @@ return 1 ..() -/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(var/obj/item/weapon/ore/O) +/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(obj/item/weapon/ore/O) if(O.refined_type) var/obj/item/stack/sheet/M = O.refined_type points += O.points * point_upgrade @@ -121,7 +121,7 @@ qdel(O)//No refined type? Purge it. return -/obj/machinery/mineral/ore_redemption/attack_hand(user as mob) +/obj/machinery/mineral/ore_redemption/attack_hand(mob/user) if(..()) return interact(user) @@ -300,7 +300,7 @@ component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() -/obj/machinery/mineral/equipment_vendor/attack_hand(user as mob) +/obj/machinery/mineral/equipment_vendor/attack_hand(mob/user) if(..()) return interact(user) @@ -352,7 +352,7 @@ updateUsrDialog() return -/obj/machinery/mineral/equipment_vendor/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/mineral/equipment_vendor/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/mining_voucher)) RedeemVoucher(I, user) return @@ -416,7 +416,7 @@ icon_state = "data" var/points = 500 -/obj/item/weapon/card/mining_point_card/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/card/mining_point_card/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) if(points) var/obj/item/weapon/card/id/C = I @@ -445,7 +445,7 @@ throw_range = 5 origin_tech = "bluespace=2" -/obj/item/device/wormhole_jaunter/attack_self(mob/user as mob) +/obj/item/device/wormhole_jaunter/attack_self(mob/user) var/turf/device_turf = get_turf(user) if(!device_turf||device_turf.z==2||device_turf.z>=7) user << "You're having difficulties getting the [src.name] to work." @@ -508,7 +508,7 @@ var/burst_time = 50 var/fieldlimit = 3 -/obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator) +/obj/item/weapon/resonator/proc/CreateResonance(target, creator) var/turf/T = get_turf(target) if(locate(/obj/effect/resonance) in T) return @@ -519,7 +519,7 @@ spawn(burst_time) fieldsactive-- -/obj/item/weapon/resonator/attack_self(mob/user as mob) +/obj/item/weapon/resonator/attack_self(mob/user) if(burst_time == 50) burst_time = 30 user << "You set the resonator's fields to detonate after 3 seconds." @@ -619,7 +619,7 @@ /obj/item/weapon/ore/plasma, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/iron, /obj/item/weapon/ore/bananium) -/mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I as obj, mob/user as mob, params) +/mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = I if(W.welding && !stat) diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 366ade4a6de..64da738a5ef 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -36,7 +36,7 @@ return (istype(inserted_id) && inserted_id.points >= inserted_id.goal) //Otherwise, only let them out if the prisoner's reached his quota. -/obj/machinery/mineral/labor_claim_console/attack_hand(user as mob) +/obj/machinery/mineral/labor_claim_console/attack_hand(mob/user) var/dat dat += text("Point Claim Console

    ") if(emagged) //Shit's broken @@ -58,12 +58,12 @@ user << browse("[dat]", "window=console_stacking_machine") -/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) return attack_hand(user) ..() -/obj/machinery/mineral/labor_claim_console/emag_act(mob/user as mob) +/obj/machinery/mineral/labor_claim_console/emag_act(mob/user) if(!emagged) emagged = 1 user << "PZZTTPFFFT" @@ -159,7 +159,7 @@ /obj/machinery/mineral/labor_points_checker/attack_hand(mob/user) user.examinate(src) -/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) if(istype(I, /obj/item/weapon/card/id/prisoner)) var/obj/item/weapon/card/id/prisoner/prisoner_id = I diff --git a/code/modules/mining/machine_input_output_plates.dm b/code/modules/mining/machine_input_output_plates.dm index 7d28cedb3da..2c9d289a9cf 100644 --- a/code/modules/mining/machine_input_output_plates.dm +++ b/code/modules/mining/machine_input_output_plates.dm @@ -22,7 +22,7 @@ var/input_dir = NORTH var/output_dir = SOUTH -/obj/machinery/mineral/proc/unload_mineral(var/atom/movable/S) +/obj/machinery/mineral/proc/unload_mineral(atom/movable/S) S.loc = loc var/turf/T = get_step(src,output_dir) if(T) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 9aacac2f023..2274a61b20b 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -18,7 +18,7 @@ else qdel(src) -/obj/machinery/mineral/processing_unit_console/attack_hand(user as mob) +/obj/machinery/mineral/processing_unit_console/attack_hand(mob/user) var/dat = "Smelter control console

    " //iron @@ -392,6 +392,6 @@ unload_mineral(O) -/obj/machinery/mineral/processing_unit/proc/generate_mineral(var/P) +/obj/machinery/mineral/processing_unit/proc/generate_mineral(P) var/O = new P(src) unload_mineral(O) \ No newline at end of file diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index c1f1474eeb4..aec2fce7f5a 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -18,7 +18,7 @@ else qdel(src) -/obj/machinery/mineral/stacking_unit_console/attack_hand(user as mob) +/obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user) var/obj/item/stack/sheet/s var/dat diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 2f3218f4e27..6e67f71e3ba 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -81,7 +81,7 @@ var/global/list/rockTurfEdgeCache icon_state = "rock" return -/turf/simulated/mineral/proc/Spread(var/turf/T) +/turf/simulated/mineral/proc/Spread(turf/T) new src.type(T) /turf/simulated/mineral/random @@ -246,7 +246,7 @@ var/global/list/rockTurfEdgeCache defuse() ..() -/turf/simulated/mineral/gibtonite/proc/explosive_reaction(var/mob/user = null, triggered_by_explosion = 0) +/turf/simulated/mineral/gibtonite/proc/explosive_reaction(mob/user = null, triggered_by_explosion = 0) if(stage == 0) icon_state = "rock_Gibtonite_active" name = "gibtonite deposit" @@ -292,7 +292,7 @@ var/global/list/rockTurfEdgeCache det_time = 0 visible_message("The chain reaction was stopped! The gibtonite had [src.det_time] reactions left till the explosion!") -/turf/simulated/mineral/gibtonite/gets_drilled(var/mob/user, triggered_by_explosion = 0) +/turf/simulated/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0) if(stage == 0 && mineralAmt >= 1) //Gibtonite deposit is activated playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1) explosive_reaction(user, triggered_by_explosion) @@ -344,7 +344,7 @@ var/global/list/rockTurfEdgeCache SpawnFloor(src) ..() -/turf/simulated/floor/plating/asteroid/airless/cave/proc/make_tunnel(var/dir) +/turf/simulated/floor/plating/asteroid/airless/cave/proc/make_tunnel(dir) var/turf/simulated/mineral/tunnel = src var/next_angle = pick(45, -45) @@ -382,7 +382,7 @@ var/global/list/rockTurfEdgeCache dir = angle2dir(dir2angle(dir) + next_angle) -/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnFloor(var/turf/T) +/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnFloor(turf/T) for(var/turf/S in range(2,T)) if(istype(S, /turf/space) || istype(S.loc, /area/mine/explored)) sanity = 0 @@ -395,7 +395,7 @@ var/global/list/rockTurfEdgeCache spawn(2) t.fullUpdateMineralOverlays() -/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnMonster(var/turf/T) +/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnMonster(turf/T) if(prob(30)) if(istype(loc, /area/mine/explored)) return @@ -414,7 +414,7 @@ var/global/list/rockTurfEdgeCache new /mob/living/simple_animal/hostile/asteroid/hivelord(T) return -/turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob, params) +/turf/simulated/mineral/attackby(obj/item/weapon/pickaxe/P, mob/user, params) if (!user.IsAdvancedToolUser()) usr << "You don't have the dexterity to do this!" @@ -452,7 +452,7 @@ var/global/list/rockTurfEdgeCache N.fullUpdateMineralOverlays() return -/turf/simulated/mineral/attack_animal(mob/living/simple_animal/user as mob) +/turf/simulated/mineral/attack_animal(mob/living/simple_animal/user) if(user.environment_smash >= 2) gets_drilled() ..() @@ -537,7 +537,7 @@ var/global/list/rockTurfEdgeCache src.gets_dug() return -/turf/simulated/floor/plating/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/floor/plating/asteroid/attackby(obj/item/weapon/W, mob/user, params) //note that this proc does not call ..() if(!W || !user) return 0 diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index b7d3df5920b..9285f95aa1d 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -52,7 +52,7 @@ return -/obj/machinery/mineral/mint/attack_hand(user as mob) //TODO: Adamantine coins! -Durandan +/obj/machinery/mineral/mint/attack_hand(mob/user) //TODO: Adamantine coins! -Durandan var/dat = "Coin Press
    " @@ -206,7 +206,7 @@ src.updateUsrDialog() return -/obj/machinery/mineral/mint/proc/create_coins(var/P) +/obj/machinery/mineral/mint/proc/create_coins(P) var/turf/T = get_step(src,output_dir) if(T) var/obj/item/O = new P(src) diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index a8eefeb5bfc..ed6056c382a 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -11,7 +11,7 @@ burn_state = 0 //Burnable burntime = 20 -/obj/item/weapon/moneybag/attack_hand(user as mob) +/obj/item/weapon/moneybag/attack_hand(mob/user) var/amt_gold = 0 var/amt_silver = 0 var/amt_diamond = 0 @@ -58,7 +58,7 @@ dat += text("Adamantine coins: [amt_adamantine] Remove one
    ") user << browse("[dat]", "window=moneybag") -/obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/moneybag/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/coin)) var/obj/item/weapon/coin/C = W diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 52e97f3a423..e1089f54ac3 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -7,7 +7,7 @@ var/points = 0 //How many points this ore gets you from the ore redemption machine var/refined_type = null //What this ore defaults to being refined into -/obj/item/weapon/ore/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/ore/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(15)) @@ -38,7 +38,7 @@ points = 1 refined_type = /obj/item/stack/sheet/glass -/obj/item/weapon/ore/glass/attack_self(mob/living/user as mob) +/obj/item/weapon/ore/glass/attack_self(mob/living/user) user << "You use the sand to make sandstone." var/sandAmt = 1 for(var/obj/item/weapon/ore/glass/G in user.loc) // The sand on the floor @@ -64,7 +64,7 @@ points = 36 refined_type = /obj/item/stack/sheet/mineral/plasma -/obj/item/weapon/ore/plasma/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/ore/plasma/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = I if(W.welding) @@ -153,7 +153,7 @@ else ..() -/obj/item/weapon/twohanded/required/gibtonite/bullet_act(var/obj/item/projectile/P) +/obj/item/weapon/twohanded/required/gibtonite/bullet_act(obj/item/projectile/P) GibtoniteReaction(P.firer) ..() @@ -291,7 +291,7 @@ /obj/item/weapon/coin/antagtoken/New() return -/obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/coin/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(string_attached) @@ -319,7 +319,7 @@ user << "You detach the string from the coin." else ..() -/obj/item/weapon/coin/attack_self(mob/user as mob) +/obj/item/weapon/coin/attack_self(mob/user) if(cooldown < world.time - 15) var/coinflip = pick(sideslist) cooldown = world.time diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index edb420703b4..7daf6f2adf2 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -22,7 +22,7 @@ user << "You empty the satchel into the box." return -/obj/structure/ore_box/attack_hand(mob/user as mob) +/obj/structure/ore_box/attack_hand(mob/user) var/amt_gold = 0 var/amt_silver = 0 var/amt_diamond = 0 diff --git a/code/modules/mob/dead/death.dm b/code/modules/mob/dead/death.dm index 784b114690f..bd968c6b708 100644 --- a/code/modules/mob/dead/death.dm +++ b/code/modules/mob/dead/death.dm @@ -1,5 +1,5 @@ /mob/dead/dust() //ghosts can't be vaporised. return -/mob/dead/gib(var/animation = 1) //ghosts can't be gibbed. +/mob/dead/gib(animation = 1) //ghosts can't be gibbed. return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 81c39b3beb4..51f948910c1 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -78,7 +78,7 @@ Transfer_mind is there to check if mob is being deleted/not going to have a body Works together with spawning an observer, noted above. */ -/mob/proc/ghostize(var/can_reenter_corpse = 1) +/mob/proc/ghostize(can_reenter_corpse = 1) if(key) if(!cmptext(copytext(key,1,2),"@")) //aghost var/mob/dead/observer/ghost = new(src) //Transfer safety to observer spawning proc. @@ -202,7 +202,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp ManualFollow(target) // This is the ghost's follow verb with an argument -/mob/dead/observer/proc/ManualFollow(var/atom/movable/target) +/mob/dead/observer/proc/ManualFollow(atom/movable/target) if(target && target != src) if(following && following == target) return diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index bab94a00cac..bcef00b711b 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -1,4 +1,4 @@ -/mob/dead/observer/say(var/message) +/mob/dead/observer/say(message) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) if (!message) diff --git a/code/modules/mob/interactive.dm b/code/modules/mob/interactive.dm index b10f1dbb313..12d822561f4 100644 --- a/code/modules/mob/interactive.dm +++ b/code/modules/mob/interactive.dm @@ -60,7 +60,7 @@ var/list/functions = list("nearbyscan","combat","doorscan","shitcurity","chatter") //botPool funcs -/mob/living/carbon/human/interactive/proc/takeDelegate(var/mob/living/carbon/human/interactive/from,var/doReset=TRUE) +/mob/living/carbon/human/interactive/proc/takeDelegate(mob/living/carbon/human/interactive/from,doReset=TRUE) eye_color = "red" if(from == src) return FALSE @@ -106,7 +106,7 @@ myjob.equip(src) myjob.apply_fingerprints(src) -/mob/living/carbon/human/interactive/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) +/mob/living/carbon/human/interactive/attacked_by(obj/item/I, mob/living/user, def_zone) ..() retal = 1 retal_target = user @@ -200,7 +200,7 @@ SSbp.insertBot(src) -/mob/living/carbon/human/interactive/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/human/interactive/attack_hand(mob/living/carbon/human/M) ..() if (health > 0) if(M.a_intent == "help") @@ -210,7 +210,7 @@ retal_target = M //THESE EXIST FOR DEBUGGING OF THE DOING/INTEREST SYSTEM EASILY -/mob/living/carbon/human/interactive/proc/doing2string(var/doin) +/mob/living/carbon/human/interactive/proc/doing2string(doin) var/toReturn = "" if(!doin) toReturn = "not doing anything" @@ -222,7 +222,7 @@ toReturn += "and going somewhere" return toReturn -/mob/living/carbon/human/interactive/proc/interest2string(var/inter) +/mob/living/carbon/human/interactive/proc/interest2string(inter) var/toReturn = "Flatlined" if(inter >= 0 && inter <= 25) toReturn = "Very Bored" @@ -234,7 +234,7 @@ toReturn = "Excited" return toReturn //END DEBUG -/mob/living/carbon/human/interactive/proc/isnotfunc(var/checkDead = TRUE) +/mob/living/carbon/human/interactive/proc/isnotfunc(checkDead = TRUE) if(!canmove) return 1 if(health <= 0 && checkDead) @@ -269,7 +269,7 @@ main_hand = other_hand other_hand = T -/mob/living/carbon/human/interactive/proc/take_to_slot(var/obj/item/G) +/mob/living/carbon/human/interactive/proc/take_to_slot(obj/item/G) var/list/slots = list ("left pocket" = slot_l_store,"right pocket" = slot_r_store,"left hand" = slot_l_hand,"right hand" = slot_r_hand) G.loc = src if(G.force && G.force > best_force) @@ -288,7 +288,7 @@ unEquip(I,TRUE) update_hands = 1 -/mob/living/carbon/human/interactive/proc/targetRange(var/towhere) +/mob/living/carbon/human/interactive/proc/targetRange(towhere) return get_dist(get_turf(towhere), get_turf(src)) /mob/living/carbon/human/interactive/Life() @@ -427,7 +427,7 @@ tryWalk(TARGET) LAST_TARGET = TARGET -/mob/living/carbon/human/interactive/proc/tryWalk(var/turf/TARGET) +/mob/living/carbon/human/interactive/proc/tryWalk(turf/TARGET) if(!isnotfunc()) if(!walk2derpless(TARGET)) timeout++ @@ -435,7 +435,7 @@ timeout++ -/mob/living/carbon/human/interactive/proc/walk2derpless(var/target) +/mob/living/carbon/human/interactive/proc/walk2derpless(target) set background = 1 var/turf/T = get_turf(target) var/turf/D = get_step(src,dir) @@ -452,7 +452,7 @@ doing = doing & ~TRAVEL return 0 -/mob/living/carbon/human/interactive/proc/job2area(var/target) +/mob/living/carbon/human/interactive/proc/job2area(target) var/datum/job/T = target if(T.title == "Assistant") return /area/hallway/primary @@ -471,14 +471,14 @@ else return pick(/area/hallway,/area/crew_quarters) -/mob/living/carbon/human/interactive/proc/target_filter(var/target) +/mob/living/carbon/human/interactive/proc/target_filter(target) var/list/L = target for(var/atom/A in target) if(istype(A,/area) || istype(A,/turf/space)) L -= A return L -/mob/living/carbon/human/interactive/proc/denied_filter(var/target) +/mob/living/carbon/human/interactive/proc/denied_filter(target) var/list/denied = list(/obj/structure/window,/obj/structure/table) //expand me for(var/a in denied) if(istype(target,a)) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 5ba04b78a2d..4e0a620168d 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -19,7 +19,7 @@ return 0 //Puts the item into your l_hand if possible and calls all necessary triggers/updates. returns 1 on success. -/mob/proc/put_in_l_hand(var/obj/item/W) +/mob/proc/put_in_l_hand(obj/item/W) if(!put_in_hand_check(W)) return 0 if(!l_hand) @@ -38,7 +38,7 @@ //Puts the item into your r_hand if possible and calls all necessary triggers/updates. returns 1 on success. -/mob/proc/put_in_r_hand(var/obj/item/W) +/mob/proc/put_in_r_hand(obj/item/W) if(!put_in_hand_check(W)) return 0 if(!r_hand) @@ -55,19 +55,19 @@ return 1 return 0 -/mob/proc/put_in_hand_check(var/obj/item/W) +/mob/proc/put_in_hand_check(obj/item/W) if(lying && !(W.flags&ABSTRACT)) return 0 if(!istype(W)) return 0 return 1 //Puts the item into our active hand if possible. returns 1 on success. -/mob/proc/put_in_active_hand(var/obj/item/W) +/mob/proc/put_in_active_hand(obj/item/W) if(hand) return put_in_l_hand(W) else return put_in_r_hand(W) //Puts the item into our inactive hand if possible. returns 1 on success. -/mob/proc/put_in_inactive_hand(var/obj/item/W) +/mob/proc/put_in_inactive_hand(obj/item/W) if(hand) return put_in_r_hand(W) else return put_in_l_hand(W) @@ -75,7 +75,7 @@ //Puts the item our active hand if possible. Failing that it tries our inactive hand. Returns 1 on success. //If both fail it drops it on the floor and returns 0. //This is probably the main one you need to know :) -/mob/proc/put_in_hands(var/obj/item/W) +/mob/proc/put_in_hands(obj/item/W) if(!W) return 0 if(put_in_active_hand(W)) return 1 else if(put_in_inactive_hand(W)) return 1 diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 02d7cc2a8e2..f4e3a3a3573 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -59,7 +59,7 @@ /mob/living/carbon/alien/getToxLoss() return 0 -/mob/living/carbon/alien/handle_environment(var/datum/gas_mixture/environment) +/mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment) //If there are alien weeds on the ground then heal if needed or give some toxins if(locate(/obj/structure/alien/weeds) in loc) @@ -132,7 +132,7 @@ bodytemperature += BODYTEMP_HEATING_MAX //If you're on fire, you heat up! return -/mob/living/carbon/alien/reagent_check(var/datum/reagent/R) //can metabolize all reagents +/mob/living/carbon/alien/reagent_check(datum/reagent/R) //can metabolize all reagents return 0 /mob/living/carbon/alien/IsAdvancedToolUser() @@ -148,7 +148,7 @@ add_abilities_to_panel() -/mob/living/carbon/alien/proc/AddAbility(var/obj/effect/proc_holder/alien/A) +/mob/living/carbon/alien/proc/AddAbility(obj/effect/proc_holder/alien/A) abilities.Add(A) A.on_gain(src) if(A.has_action) diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index 73c9fbe573c..fa0f58d7f07 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -6,7 +6,7 @@ As such, they can either help or harm other aliens. Help works like the human help command while harm is a simple nibble. In all, this is a lot like the monkey code. /N */ -/mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M as mob) +/mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M) if (!ticker) M << "You cannot attack people before the game has started." return @@ -43,11 +43,11 @@ In all, this is a lot like the monkey code. /N return -/mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L) return attack_alien(L) -/mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M) if(..()) //to allow surgery to return properly. return 0 @@ -62,7 +62,7 @@ In all, this is a lot like the monkey code. /N return 0 -/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M) if(..()) if (stat != DEAD) adjustBruteLoss(rand(1, 3)) @@ -70,13 +70,13 @@ In all, this is a lot like the monkey code. /N return -/mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) updatehealth() -/mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack var/damage = rand(5, 35) if(M.is_adult) diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm index e8c0ac96c79..131ba6e65e0 100644 --- a/code/modules/mob/living/carbon/alien/death.dm +++ b/code/modules/mob/living/carbon/alien/death.dm @@ -1,7 +1,7 @@ /mob/living/carbon/alien/spawn_gibs() xgibs(loc, viruses) -/mob/living/carbon/alien/gib_animation(var/animate) +/mob/living/carbon/alien/gib_animation(animate) ..(animate, "gibbed-a") /mob/living/carbon/alien/spawn_dust() @@ -10,7 +10,7 @@ /mob/living/carbon/alien/spawn_dust() new /obj/effect/decal/remains/xeno(loc) -/mob/living/carbon/alien/dust_animation(var/animate) +/mob/living/carbon/alien/dust_animation(animate) ..(animate, "dust-a") /mob/living/carbon/alien/dust(var/animation = 1) diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index 8b27de42f94..08e276eb289 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -48,13 +48,13 @@ Doesn't work on other aliens/AI.*/ user.adjustToxLoss(-plasma_cost) return 1 -/obj/effect/proc_holder/alien/proc/on_gain(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/proc/on_gain(mob/living/carbon/alien/user) return -/obj/effect/proc_holder/alien/proc/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/proc/fire(mob/living/carbon/alien/user) return 1 -/obj/effect/proc_holder/alien/proc/cost_check(check_turf=0,var/mob/living/carbon/alien/user,var/silent = 0) +/obj/effect/proc_holder/alien/proc/cost_check(check_turf=0,mob/living/carbon/alien/user,silent = 0) if(user.stat) if(!silent) user << "You must be conscious to do this." @@ -77,7 +77,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_plant" -/obj/effect/proc_holder/alien/plant/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/plant/fire(mob/living/carbon/alien/user) if(locate(/obj/structure/alien/weeds/node) in get_turf(user)) src << "There's already a weed node here." return 0 @@ -93,7 +93,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_whisper" -/obj/effect/proc_holder/alien/whisper/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/whisper/fire(mob/living/carbon/alien/user) var/mob/M = input("Select who to whisper to:","Whisper to?",null) as mob in oview(user) if(!M) return 0 @@ -113,7 +113,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_transfer" -/obj/effect/proc_holder/alien/transfer/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/transfer/fire(mob/living/carbon/alien/user) var/list/mob/living/carbon/alien/aliens_around = list() for(var/mob/living/carbon/alien/A in oview(user)) aliens_around.Add(A) @@ -141,10 +141,10 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_acid" -/obj/effect/proc_holder/alien/acid/on_gain(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/acid/on_gain(mob/living/carbon/alien/user) user.verbs.Add(/mob/living/carbon/alien/humanoid/proc/corrosive_acid) -/obj/effect/proc_holder/alien/acid/proc/corrode(var/target,var/mob/living/carbon/alien/user = usr) +/obj/effect/proc_holder/alien/acid/proc/corrode(target,mob/living/carbon/alien/user = usr) if(target in oview(1,user)) // OBJ CHECK if(isobj(target)) @@ -173,7 +173,7 @@ Doesn't work on other aliens/AI.*/ return 0 -/obj/effect/proc_holder/alien/acid/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/acid/fire(mob/living/carbon/alien/user) var/O = input("Select what to dissolve:","Dissolve",null) as obj|turf in oview(1,user) if(!O) return 0 @@ -199,7 +199,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_neurotoxin" -/obj/effect/proc_holder/alien/neurotoxin/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/neurotoxin/fire(mob/living/carbon/alien/user) user.visible_message("[user] spits neurotoxin!", "You spit neurotoxin.") var/turf/T = user.loc @@ -224,7 +224,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_resin" -/obj/effect/proc_holder/alien/resin/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/resin/fire(mob/living/carbon/alien/user) if(locate(/obj/structure/alien/resin) in user.loc.contents) user << "There is already a resin structure there." return 0 @@ -252,7 +252,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_barf" -/obj/effect/proc_holder/alien/regurgitate/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/regurgitate/fire(mob/living/carbon/alien/user) if(user.stomach_contents.len) for(var/atom/movable/A in user.stomach_contents) user.stomach_contents.Remove(A) @@ -268,7 +268,7 @@ Doesn't work on other aliens/AI.*/ has_action = 0 // Has dedicated GUI button already -/obj/effect/proc_holder/alien/nightvisiontoggle/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/nightvisiontoggle/fire(mob/living/carbon/alien/user) if(!user.nightvision) user.see_in_dark = 8 diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm index a18f4b2ee00..ac8b2f4405d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -31,7 +31,7 @@ action_icon_state = "alien_evolve_drone" -/obj/effect/proc_holder/alien/evolve/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/evolve/fire(mob/living/carbon/alien/user) var/no_queen = 1 for(var/mob/living/carbon/alien/humanoid/queen/Q in living_mob_list) if(!Q.key || !Q.getorgan(/obj/item/organ/brain)) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index a34c6337786..68fda08c934 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -44,7 +44,7 @@ //Hunter verbs -/mob/living/carbon/alien/humanoid/hunter/proc/toggle_leap(var/message = 1) +/mob/living/carbon/alien/humanoid/hunter/proc/toggle_leap(message = 1) leap_on_click = !leap_on_click leap_icon.icon_state = "leap_[leap_on_click ? "on":"off"]" update_icons() @@ -54,7 +54,7 @@ return -/mob/living/carbon/alien/humanoid/hunter/ClickOn(var/atom/A, var/params) +/mob/living/carbon/alien/humanoid/hunter/ClickOn(atom/A, params) face_atom(A) if(leap_on_click) leap_at(A) @@ -64,7 +64,7 @@ #define MAX_ALIEN_LEAP_DIST 7 -/mob/living/carbon/alien/humanoid/hunter/proc/leap_at(var/atom/A) +/mob/living/carbon/alien/humanoid/hunter/proc/leap_at(atom/A) if(pounce_cooldown) src << "You are too fatigued to pounce right now!" return diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 73157d41c63..fd46ca92087 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/alien/humanoid/emote(var/act) +/mob/living/carbon/alien/humanoid/emote(act) var/param = null if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index cc695822032..4c27150e481 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -46,7 +46,7 @@ step_away(src,user,15) return 1 -/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M) if(..()) switch(M.a_intent) if ("harm") diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 1b58d61fb27..90e2fd474c8 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -65,7 +65,7 @@ action_icon_state = "alien_egg" -/obj/effect/proc_holder/alien/lay_egg/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/lay_egg/fire(mob/living/carbon/alien/user) if(locate(/obj/structure/alien/egg) in get_turf(user)) user << "There's already an egg here." return 0 diff --git a/code/modules/mob/living/carbon/alien/larva/inventory.dm b/code/modules/mob/living/carbon/alien/larva/inventory.dm index 99298e50bbe..3cb46a54b2e 100644 --- a/code/modules/mob/living/carbon/alien/larva/inventory.dm +++ b/code/modules/mob/living/carbon/alien/larva/inventory.dm @@ -1,3 +1,3 @@ //can't unequip since it can't equip anything -/mob/living/carbon/alien/larva/unEquip(obj/item/W as obj) +/mob/living/carbon/alien/larva/unEquip(obj/item/W) return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 74c786143a7..d1b46a70481 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -52,7 +52,7 @@ step_away(src,user,15) return 1 -/mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M) if(..()) var/damage = rand(1, 9) if (prob(90)) diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 093c727edc5..3bc9e44a910 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -5,7 +5,7 @@ action_icon_state = "alien_hide" -/obj/effect/proc_holder/alien/hide/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/hide/fire(mob/living/carbon/alien/user) if(user.stat != CONSCIOUS) return @@ -27,7 +27,7 @@ action_icon_state = "alien_evolve_larva" -/obj/effect/proc_holder/alien/larva_evolve/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/larva_evolve/fire(mob/living/carbon/alien/user) if(!islarva(user)) return var/mob/living/carbon/alien/larva/L = user diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm index 3bf5ead3260..03aea6db380 100644 --- a/code/modules/mob/living/carbon/alien/say.dm +++ b/code/modules/mob/living/carbon/alien/say.dm @@ -1,9 +1,9 @@ -/mob/living/carbon/alien/say(var/message) +/mob/living/carbon/alien/say(message) . = ..(message, "A") if(.) playsound(loc, "hiss", 25, 1, 1) //erp just isn't the same without sound feedback -/mob/living/proc/alien_talk(var/message) +/mob/living/proc/alien_talk(message) log_say("[key_name(src)] : [message]") message = trim(message) diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index d7c223124b6..57db5c8890b 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -50,7 +50,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds -/obj/item/body_egg/alien_embryo/proc/AttemptGrow(var/gib_on_success = 1) +/obj/item/body_egg/alien_embryo/proc/AttemptGrow(gib_on_success = 1) var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET) var/client/C = null diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index c053d20c090..04dfc223b1a 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -28,17 +28,17 @@ var/const/MAX_ACTIVE_TIME = 400 var/attached = 0 -/obj/item/clothing/mask/facehugger/attack_alien(user as mob) //can be picked up by aliens +/obj/item/clothing/mask/facehugger/attack_alien(mob/user) //can be picked up by aliens attack_hand(user) return -/obj/item/clothing/mask/facehugger/attack_hand(user as mob) +/obj/item/clothing/mask/facehugger/attack_hand(mob/user) if((stat == CONSCIOUS && !sterile) && !isalien(user)) if(Attach(user)) return ..() -/obj/item/clothing/mask/facehugger/attack(mob/living/M as mob, mob/user as mob) +/obj/item/clothing/mask/facehugger/attack(mob/living/M, mob/user) ..() user.unEquip(src) Attach(M) @@ -55,12 +55,12 @@ var/const/MAX_ACTIVE_TIME = 400 if (sterile) user << "It looks like the proboscis has been removed." -/obj/item/clothing/mask/facehugger/attackby(var/obj/item/O,var/mob/m, params) +/obj/item/clothing/mask/facehugger/attackby(obj/item/O,mob/m, params) if(O.force) Die() return -/obj/item/clothing/mask/facehugger/bullet_act(var/obj/item/projectile/P) +/obj/item/clothing/mask/facehugger/bullet_act(obj/item/projectile/P) if(P.damage) Die() return @@ -77,7 +77,7 @@ var/const/MAX_ACTIVE_TIME = 400 HasProximity(target) return -/obj/item/clothing/mask/facehugger/on_found(mob/finder as mob) +/obj/item/clothing/mask/facehugger/on_found(mob/finder) if(stat == CONSCIOUS) return HasProximity(finder) return 0 @@ -102,7 +102,7 @@ var/const/MAX_ACTIVE_TIME = 400 icon_state = "[initial(icon_state)]" Attach(hit_atom) -/obj/item/clothing/mask/facehugger/proc/Attach(M as mob) +/obj/item/clothing/mask/facehugger/proc/Attach(mob/M) if( (!iscorgi(M) && !iscarbon(M)) || isalien(M)) return 0 if(attached) @@ -158,7 +158,7 @@ var/const/MAX_ACTIVE_TIME = 400 return 1 -/obj/item/clothing/mask/facehugger/proc/Impregnate(mob/living/target as mob) +/obj/item/clothing/mask/facehugger/proc/Impregnate(mob/living/target) if(!target || target.stat == DEAD) //was taken off or something return @@ -229,7 +229,7 @@ var/const/MAX_ACTIVE_TIME = 400 return -/proc/CanHug(var/mob/M) +/proc/CanHug(mob/M) if(!istype(M)) return 0 if(M.stat == DEAD) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 4bca8132157..3655e7a183c 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -31,7 +31,7 @@ else icon_state = "mmi_empty" -/obj/item/device/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/device/mmi/attackby(obj/item/O, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) if(istype(O,/obj/item/organ/brain)) //Time to stick a brain in it --NEO var/obj/item/organ/brain/newbrain = O @@ -85,7 +85,7 @@ return ..() -/obj/item/device/mmi/attack_self(mob/user as mob) +/obj/item/device/mmi/attack_self(mob/user) if(!brain) user << "You upend the MMI, but there's nothing in it!" else if(locked) @@ -105,7 +105,7 @@ update_icon() name = "Man-Machine Interface" -/obj/item/device/mmi/proc/transfer_identity(var/mob/living/carbon/human/H) //Same deal as the regular brain proc. Used for human-->robot people. +/obj/item/device/mmi/proc/transfer_identity(mob/living/carbon/human/H) //Same deal as the regular brain proc. Used for human-->robot people. brainmob = new(src) brainmob.name = H.real_name brainmob.real_name = H.real_name diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 2197876bc1c..3eec0aa657d 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -33,12 +33,12 @@ /mob/living/carbon/brain/blob_act() return -/mob/living/carbon/brain/on_forcemove(var/atom/newloc) +/mob/living/carbon/brain/on_forcemove(atom/newloc) if(container) container.loc = newloc else //something went very wrong. CRASH("Brainmob without container.") loc = container -/mob/living/carbon/brain/UnarmedAttack(var/atom/A)//Stops runtimes due to attack_animal being the default +/mob/living/carbon/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default return diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm index 5490d786297..f97ddb1a3db 100644 --- a/code/modules/mob/living/carbon/brain/death.dm +++ b/code/modules/mob/living/carbon/brain/death.dm @@ -19,7 +19,7 @@ return ..(gibbed) -/mob/living/carbon/brain/gib(var/animation = 0) +/mob/living/carbon/brain/gib(animation = 0) if(container && istype(container, /obj/item/device/mmi)) qdel(container)//Gets rid of the MMI if there is one if(loc) diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 4a75b2765fe..c9feda102b4 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/brain/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/brain/emote(act,m_type=1,message = null) if(!(container && istype(container, /obj/item/device/mmi)))//No MMI, no emotes return diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 37a596ab08a..f2d90fdc84d 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -21,14 +21,14 @@ var/global/posibrain_notif_cooldown = 0 if(istype(ghost)) activate(ghost) -/obj/item/device/mmi/posibrain/proc/ping_ghosts(var/msg) +/obj/item/device/mmi/posibrain/proc/ping_ghosts(msg) if(!posibrain_notif_cooldown) notify_ghosts("Positronic Brain [msg] in [get_area(src)]. (Enter)") posibrain_notif_cooldown = 1 spawn(askDelay) //Global one minute cooldown to avoid spam. posibrain_notif_cooldown = 0 -/obj/item/device/mmi/posibrain/attack_self(mob/user as mob) +/obj/item/device/mmi/posibrain/attack_self(mob/user) if(brainmob && !brainmob.key && !notified) //Start the process of notified for a new user. user << "You carefully locate the manual activation switch and start the positronic brain's boot process." @@ -56,7 +56,7 @@ var/global/posibrain_notif_cooldown = 0 return transfer_personality(user) -/obj/item/device/mmi/posibrain/transfer_identity(var/mob/living/carbon/H) +/obj/item/device/mmi/posibrain/transfer_identity(mob/living/carbon/H) name = "positronic brain ([H])" brainmob.name = H.real_name brainmob.real_name = H.real_name @@ -77,7 +77,7 @@ var/global/posibrain_notif_cooldown = 0 update_icon() return -/obj/item/device/mmi/posibrain/proc/transfer_personality(var/mob/candidate) +/obj/item/device/mmi/posibrain/proc/transfer_personality(mob/candidate) if(brainmob && brainmob.key) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain. candidate << "This brain has already been taken! Please try your possesion again later!" return @@ -135,7 +135,7 @@ var/global/posibrain_notif_cooldown = 0 ..() -/obj/item/device/mmi/posibrain/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/item/device/mmi/posibrain/attackby(obj/item/O, mob/user) return diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index ac45baaf338..1086ba0ef1d 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/brain/say(var/message) +/mob/living/carbon/brain/say(message) if(!(container && istype(container, /obj/item/device/mmi))) return //No MMI, can't speak, bucko./N else diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index c3c789b3b9d..83f2425156a 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -35,7 +35,7 @@ if(legcuffed) . += legcuffed.slowdown -/mob/living/carbon/relaymove(var/mob/user, direction) +/mob/living/carbon/relaymove(mob/user, direction) if(user in src.stomach_contents) if(prob(40)) if(prob(25)) @@ -65,7 +65,7 @@ stomach_contents.Remove(A) src.gib() -/mob/living/carbon/gib(var/animation = 1) +/mob/living/carbon/gib(animation = 1) for(var/mob/M in src) if(M in stomach_contents) stomach_contents.Remove(M) @@ -74,7 +74,7 @@ . = ..() -/mob/living/carbon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0) +/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0) shock_damage *= siemens_coeff if (shock_damage<1) return 0 @@ -119,7 +119,7 @@ src.hands.dir = SOUTH*/ return -/mob/living/carbon/activate_hand(var/selhand) //0 or "r" or "right" for right hand; 1 or "l" or "left" for left hand. +/mob/living/carbon/activate_hand(selhand) //0 or "r" or "right" for right hand; 1 or "l" or "left" for left hand. if(istext(selhand)) selhand = lowertext(selhand) @@ -360,10 +360,10 @@ var/const/NO_SLIP_WHEN_WALKING = 1 var/const/STEP = 2 var/const/SLIDE = 4 var/const/GALOSHES_DONT_HELP = 8 -/mob/living/carbon/slip(var/s_amount, var/w_amount, var/obj/O, var/lube) +/mob/living/carbon/slip(s_amount, w_amount, obj/O, lube) loc.handle_slip(src, s_amount, w_amount, O, lube) -/mob/living/carbon/fall(var/forced) +/mob/living/carbon/fall(forced) loc.handle_fall(src, forced)//it's loc so it doesn't call the mob's handle_fall which does nothing /mob/living/carbon/is_muzzled() @@ -435,7 +435,7 @@ var/const/GALOSHES_DONT_HELP = 8 cuff_resist(I) -/mob/living/carbon/proc/cuff_resist(obj/item/I, var/breakouttime = 600, cuff_break = 0) +/mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0) if(istype(I, /obj/item/weapon/restraints)) var/obj/item/weapon/restraints/R = I breakouttime = R.breakouttime @@ -526,7 +526,7 @@ var/const/GALOSHES_DONT_HELP = 8 if(head && (head.flags & HEADBANGPROTECT)) return 1 -/mob/living/carbon/proc/accident(var/obj/item/I) +/mob/living/carbon/proc/accident(obj/item/I) if(!I || (I.flags & NODROP)) return diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 65cdef581b1..7ef10003c95 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -43,7 +43,7 @@ return 0 -/mob/living/carbon/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/carbon/attack_paw(mob/living/carbon/monkey/M) if(!istype(M, /mob/living/carbon)) return 0 diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index cdbb56ad240..320ae709bc3 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -2,7 +2,7 @@ //Things like airguitar can be done without arms, and the flap thing makes so little sense it's a keeper. //Intended to be called by a higher up emote proc if the requested emote isn't in the custom emotes. -/mob/living/carbon/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/emote(act,m_type=1,message = null) var/param = null if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index 289fb8e5ee8..d03805d7d22 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -32,7 +32,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 if(B.id == "blood") B.data = list("donor"=src,"viruses"=null,"blood_DNA"=dna.unique_enzymes,"blood_type"=dna.blood_type,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"features"=null, "factions"=null) -/mob/living/carbon/human/proc/suppress_bloodloss(var/amount) +/mob/living/carbon/human/proc/suppress_bloodloss(amount) if(bleedsuppress) return else @@ -124,7 +124,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 drip(blood_max) //Makes a blood drop, leaking amt units of blood from the mob -/mob/living/carbon/human/proc/drip(var/amt as num) +/mob/living/carbon/human/proc/drip(amt as num) if(!amt) return @@ -138,7 +138,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 ****************************************************/ //Gets blood from mob to the container, preserving all data in it. -/mob/living/carbon/proc/take_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/proc/take_blood(obj/item/weapon/reagent_containers/container, amount) var/datum/reagent/B = get_blood(container.reagents) if(!B) B = new /datum/reagent/blood @@ -177,7 +177,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 return B //For humans, blood does not appear from blue, it comes from vessels. -/mob/living/carbon/human/take_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/human/take_blood(obj/item/weapon/reagent_containers/container, amount) if(NOBLOOD in dna.species.specflags) return null @@ -189,7 +189,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 vessel.remove_reagent("blood",amount) // Removes blood if human //Transfers blood from container to vessels -/mob/living/carbon/proc/inject_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/proc/inject_blood(obj/item/weapon/reagent_containers/container, amount) var/datum/reagent/blood/injected = get_blood(container.reagents) @@ -205,7 +205,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 container.reagents.remove_reagent("blood", amount) //Transfers blood from container to vessels, respecting blood types compatibility. -/mob/living/carbon/human/inject_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/human/inject_blood(obj/item/weapon/reagent_containers/container, amount) var/datum/reagent/blood/injected = get_blood(container.reagents) @@ -261,7 +261,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 //AB is a universal receiver. return 0 -/proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large) +/proc/blood_splatter(target,datum/reagent/blood/source,large) var/obj/effect/decal/cleanable/blood/B var/decal_type = /obj/effect/decal/cleanable/blood/splatter diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 2f84b03bd20..0e91f3f1d66 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -1,10 +1,10 @@ -/mob/living/carbon/human/gib_animation(var/animate) +/mob/living/carbon/human/gib_animation(animate) ..(animate, "gibbed-h") -/mob/living/carbon/human/dust_animation(var/animate) +/mob/living/carbon/human/dust_animation(animate) ..(animate, "dust-h") -/mob/living/carbon/human/dust(var/animation = 1) +/mob/living/carbon/human/dust(animation = 1) ..() /mob/living/carbon/human/spawn_gibs() diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 0c274d56ebf..5fc5e054f69 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/human/emote(act,m_type=1,message = null) var/param = null if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1f5f0b11935..84cf8e339e1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -259,7 +259,7 @@ // called when something steps onto a human // this could be made more general, but for now just handle mulebot -/mob/living/carbon/human/Crossed(var/atom/movable/AM) +/mob/living/carbon/human/Crossed(atom/movable/AM) var/obj/machinery/bot/mulebot/MB = AM if(istype(MB)) MB.RunOver(src) @@ -267,7 +267,7 @@ spreadFire(AM) //Added a safety check in case you want to shock a human mob directly through electrocute_act. -/mob/living/carbon/human/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/safety = 0) +/mob/living/carbon/human/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, safety = 0) if(!safety) if(gloves) var/obj/item/clothing/gloves/G = gloves @@ -533,7 +533,7 @@ /mob/living/carbon/human/proc/canUseHUD() return !(src.stat || src.weakened || src.stunned || src.restrained()) -/mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone) +/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone) . = 1 // Default to returning true. if(user && !target_zone) target_zone = user.zone_sel.selecting @@ -575,7 +575,7 @@ else return null -/mob/living/carbon/human/assess_threat(var/obj/machinery/bot/secbot/judgebot, var/lasercolor) +/mob/living/carbon/human/assess_threat(obj/machinery/bot/secbot/judgebot, lasercolor) if(judgebot.emagged == 2) return 10 //Everyone is a criminal! diff --git a/code/modules/mob/living/carbon/human/human_attackalien.dm b/code/modules/mob/living/carbon/human/human_attackalien.dm index 31c04c06b2f..30e03e615cb 100644 --- a/code/modules/mob/living/carbon/human/human_attackalien.dm +++ b/code/modules/mob/living/carbon/human/human_attackalien.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M) if(check_shields(0, M.name)) visible_message("[M] attempted to touch [src]!") return 0 diff --git a/code/modules/mob/living/carbon/human/human_attackpaw.dm b/code/modules/mob/living/carbon/human/human_attackpaw.dm index c8372f814d6..54c47761514 100644 --- a/code/modules/mob/living/carbon/human/human_attackpaw.dm +++ b/code/modules/mob/living/carbon/human/human_attackpaw.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M) var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") var/obj/item/organ/limb/affecting = get_organ(ran_zone(dam_zone)) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 48250417654..af0c7205b31 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -33,13 +33,13 @@ return amount -/mob/living/carbon/human/adjustBruteLoss(var/amount) +/mob/living/carbon/human/adjustBruteLoss(amount) if(amount > 0) take_overall_damage(amount, 0) else heal_overall_damage(-amount, 0) -/mob/living/carbon/human/adjustFireLoss(var/amount) +/mob/living/carbon/human/adjustFireLoss(amount) if(amount > 0) take_overall_damage(0, amount) else @@ -58,7 +58,7 @@ //////////////////////////////////////////// //Returns a list of damaged organs -/mob/living/carbon/human/proc/get_damaged_organs(var/brute, var/burn) +/mob/living/carbon/human/proc/get_damaged_organs(brute, burn) var/list/obj/item/organ/limb/parts = list() for(var/obj/item/organ/limb/O in organs) if((brute && O.brute_dam) || (burn && O.burn_dam)) @@ -76,7 +76,7 @@ //Heals ONE external organ, organ gets randomly selected from damaged ones. //It automatically updates damage overlays if necesary //It automatically updates health status -/mob/living/carbon/human/heal_organ_damage(var/brute, var/burn) +/mob/living/carbon/human/heal_organ_damage(brute, burn) var/list/obj/item/organ/limb/parts = get_damaged_organs(brute,burn) if(!parts.len) return var/obj/item/organ/limb/picked = pick(parts) @@ -87,7 +87,7 @@ //Damages ONE external organ, organ gets randomly selected from damagable ones. //It automatically updates damage overlays if necesary //It automatically updates health status -/mob/living/carbon/human/take_organ_damage(var/brute, var/burn) +/mob/living/carbon/human/take_organ_damage(brute, burn) var/list/obj/item/organ/limb/parts = get_damageable_organs() if(!parts.len) return var/obj/item/organ/limb/picked = pick(parts) @@ -98,7 +98,7 @@ //Heal MANY external organs, in random order -/mob/living/carbon/human/heal_overall_damage(var/brute, var/burn) +/mob/living/carbon/human/heal_overall_damage(brute, burn) var/list/obj/item/organ/limb/parts = get_damaged_organs(brute,burn) var/update = 0 @@ -118,7 +118,7 @@ if(update) update_damage_overlays(0) // damage MANY external organs, in random order -/mob/living/carbon/human/take_overall_damage(var/brute, var/burn) +/mob/living/carbon/human/take_overall_damage(brute, burn) if(status_flags & GODMODE) return //godmode var/list/obj/item/organ/limb/parts = get_damageable_organs() @@ -151,7 +151,7 @@ //////////////////////////////////////////// -/mob/living/carbon/human/proc/get_organ(var/zone) +/mob/living/carbon/human/proc/get_organ(zone) if(!zone) zone = "chest" for(var/obj/item/organ/limb/O in organs) if(O.name == zone) @@ -159,7 +159,7 @@ return null -/mob/living/carbon/human/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0) +/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0) if(dna) // if you have a species, it will run the apply_damage code there instead dna.species.apply_damage(damage, damagetype, def_zone, blocked, src) else diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 7e143f1baa0..72a5d682d0c 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -6,7 +6,7 @@ emp_act */ -/mob/living/carbon/human/getarmor(var/def_zone, var/type) +/mob/living/carbon/human/getarmor(def_zone, type) var/armorval = 0 var/organnum = 0 @@ -24,7 +24,7 @@ emp_act return (armorval/max(organnum, 1)) -/mob/living/carbon/human/proc/checkarmor(var/obj/item/organ/limb/def_zone, var/type) +/mob/living/carbon/human/proc/checkarmor(obj/item/organ/limb/def_zone, type) if(!type) return 0 var/protection = 0 var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform) @@ -41,7 +41,7 @@ emp_act dna.species.on_hit(proj_type, src) return -/mob/living/carbon/human/bullet_act(var/obj/item/projectile/P, var/def_zone) +/mob/living/carbon/human/bullet_act(obj/item/projectile/P, def_zone) if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) if(check_reflect(def_zone)) // Checks if you've passed a reflection% check visible_message("The [P.name] gets reflected by [src]!", \ @@ -67,7 +67,7 @@ emp_act return 2 return (..(P , def_zone)) -/mob/living/carbon/human/proc/check_reflect(var/def_zone) //Reflection checks for anything in your l_hand, r_hand, or wear_suit based on the reflection chance of the object +/mob/living/carbon/human/proc/check_reflect(def_zone) //Reflection checks for anything in your l_hand, r_hand, or wear_suit based on the reflection chance of the object if(wear_suit && istype(wear_suit, /obj/item/)) var/obj/item/I = wear_suit if(I.IsReflect(def_zone) == 1) @@ -85,7 +85,7 @@ emp_act //End Here -/mob/living/carbon/human/proc/check_shields(var/damage = 0, var/attack_text = "the attack", var/obj/item/O) +/mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", obj/item/O) if(O) if(O.flags & NOSHIELD) //weapon ignores shields altogether return 0 @@ -122,7 +122,7 @@ emp_act return 0 -/mob/living/carbon/human/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) +/mob/living/carbon/human/attacked_by(obj/item/I, mob/living/user, def_zone) if(!I || !user) return 0 var/obj/item/organ/limb/target_limb = get_organ(check_zone(user.zone_sel.selecting)) @@ -235,7 +235,7 @@ emp_act src.Stun(5) ..() -/mob/living/carbon/human/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/mob/living/carbon/human/acid_act(acidpwr, toxpwr, acid_volume) var/list/damaged = list() var/list/inventory_items_to_kill = list() var/acidity = min(acidpwr*acid_volume/200, toxpwr) @@ -382,7 +382,7 @@ emp_act ..() -/mob/living/carbon/human/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/carbon/human/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) if(check_shields(damage, "the [M.name]")) @@ -394,7 +394,7 @@ emp_act updatehealth() -/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L) if(..()) //successful larva bite. var/damage = rand(1, 3) @@ -408,7 +408,7 @@ emp_act updatehealth() -/mob/living/carbon/human/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/carbon/human/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack var/damage = rand(5, 25) if(M.is_adult) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index e163fb158e0..3e512e7b825 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -11,7 +11,7 @@ //gets assignment from ID or ID inside PDA or PDA itself //Useful when player do something with computers -/mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job") +/mob/living/carbon/human/proc/get_assignment(if_no_id = "No id", if_no_job = "No job") var/obj/item/weapon/card/id/id = get_idcard() if(id) . = id.assignment @@ -26,7 +26,7 @@ //gets name from ID or ID inside PDA or PDA itself //Useful when player do something with computers -/mob/living/carbon/human/proc/get_authentification_name(var/if_no_id = "Unknown") +/mob/living/carbon/human/proc/get_authentification_name(if_no_id = "Unknown") var/obj/item/weapon/card/id/id = get_idcard() if(id) return id.registered_name @@ -62,7 +62,7 @@ //gets name from ID or PDA itself, ID inside PDA doesn't matter //Useful when player is being seen by other mobs -/mob/living/carbon/human/proc/get_id_name(var/if_no_id = "Unknown") +/mob/living/carbon/human/proc/get_id_name(if_no_id = "Unknown") var/obj/item/weapon/storage/wallet/wallet = wear_id var/obj/item/device/pda/pda = wear_id var/obj/item/weapon/card/id/id = wear_id @@ -115,7 +115,7 @@ tinted += MT.tint return tinted -/mob/living/carbon/human/abiotic(var/full_body = 0) +/mob/living/carbon/human/abiotic(full_body = 0) if(full_body && ((src.l_hand && !( src.l_hand.flags&ABSTRACT )) || (src.r_hand && !( src.r_hand.flags&ABSTRACT )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.ears || src.gloves))) return 1 diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 5dc30d5535a..b0078a13719 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -5,7 +5,7 @@ . += ..() . += config.human_delay -/mob/living/carbon/human/Process_Spacemove(var/movement_dir = 0) +/mob/living/carbon/human/Process_Spacemove(movement_dir = 0) if(..()) return 1 @@ -24,7 +24,7 @@ return 0 -/mob/living/carbon/human/slip(var/s_amount, var/w_amount, var/obj/O, var/lube) +/mob/living/carbon/human/slip(s_amount, w_amount, obj/O, lube) if(isobj(shoes) && (shoes.flags&NOSLIP) && !(lube&GALOSHES_DONT_HELP)) return 0 .=..() diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 46a203afc1b..a86275539aa 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -391,7 +391,7 @@ return //Cycles through all clothing slots and tests them for destruction -/mob/living/carbon/human/proc/shred_clothing(var/bomb,var/shock) +/mob/living/carbon/human/proc/shred_clothing(bomb,shock) var/covered_parts = 0 //The body parts that are protected by exterior clothing/armor var/head_absorbed = 0 //How much of the shock the headgear absorbs when it is shredded. -1=it survives var/suit_absorbed = 0 //How much of the shock the exosuit absorbs when it is shredded. -1=it survives @@ -439,7 +439,7 @@ if(absorbed >= 0) w_uniform.shred(bomb,shock-20-absorbed,src) //Uniforms are also annoying to get shredded -/obj/item/proc/shred(var/bomb,var/shock,var/mob/living/carbon/human/Human) +/obj/item/proc/shred(bomb,shock,mob/living/carbon/human/Human) if(flags & ABSTRACT) return -1 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index bfa438e032f..7da4365cf22 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -54,7 +54,7 @@ dna.species.spec_life(src) // for mutantraces -/mob/living/carbon/human/calculate_affecting_pressure(var/pressure) +/mob/living/carbon/human/calculate_affecting_pressure(pressure) if((wear_suit && (wear_suit.flags & STOPSPRESSUREDMAGE)) && (head && (head.flags & STOPSPRESSUREDMAGE))) return ONE_ATMOSPHERE else diff --git a/code/modules/mob/living/carbon/human/mutantrace.dm b/code/modules/mob/living/carbon/human/mutantrace.dm index 30615bb624c..32ad63444b5 100644 --- a/code/modules/mob/living/carbon/human/mutantrace.dm +++ b/code/modules/mob/living/carbon/human/mutantrace.dm @@ -14,7 +14,7 @@ var/global/list/mutants_with_eyes = list( // these mutantraces have eyes "jelly", ) -/mob/living/carbon/human/proc/check_mutrace(var/mutneeded = "mut1", var/mutneededalt = "mut2") +/mob/living/carbon/human/proc/check_mutrace(mutneeded = "mut1", mutneededalt = "mut2") if(dna) if(dna.mutantrace == mutneeded || dna.mutantrace == mutneededalt) return 1 diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 491f878b2ec..8b0fdbe16d5 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -54,7 +54,7 @@ return !mind.miming return 1 -/mob/living/carbon/human/proc/SetSpecialVoice(var/new_voice) +/mob/living/carbon/human/proc/SetSpecialVoice(new_voice) if(new_voice) special_voice = new_voice return diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e5e7060002d..f0bb401c317 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -103,10 +103,10 @@ //Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced. -/datum/species/proc/qualifies_for_rank(var/rank, var/list/features) +/datum/species/proc/qualifies_for_rank(rank, list/features) return 1 -/datum/species/proc/update_base_icon_state(var/mob/living/carbon/human/H) +/datum/species/proc/update_base_icon_state(mob/living/carbon/human/H) if(H.disabilities & HUSK) H.remove_overlay(SPECIES_LAYER) // races lose their color return "husk" @@ -118,7 +118,7 @@ else return "[id]" -/datum/species/proc/update_color(var/mob/living/carbon/human/H) +/datum/species/proc/update_color(mob/living/carbon/human/H) H.remove_overlay(SPECIES_LAYER) var/image/standing @@ -143,7 +143,7 @@ H.apply_overlay(SPECIES_LAYER) -/datum/species/proc/handle_hair(var/mob/living/carbon/human/H) +/datum/species/proc/handle_hair(mob/living/carbon/human/H) H.remove_overlay(HAIR_LAYER) var/datum/sprite_accessory/S @@ -201,7 +201,7 @@ H.apply_overlay(HAIR_LAYER) return -/datum/species/proc/handle_body(var/mob/living/carbon/human/H) +/datum/species/proc/handle_body(mob/living/carbon/human/H) H.remove_overlay(BODY_LAYER) var/list/standing = list() @@ -246,7 +246,7 @@ return -/datum/species/proc/handle_mutant_bodyparts(var/mob/living/carbon/human/H) +/datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/H) var/list/bodyparts_to_add = mutant_bodyparts.Copy() var/list/relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) var/list/standing = list() @@ -390,17 +390,17 @@ H.apply_overlay(BODY_ADJ_LAYER) H.apply_overlay(BODY_FRONT_LAYER) -/datum/species/proc/spec_life(var/mob/living/carbon/human/H) +/datum/species/proc/spec_life(mob/living/carbon/human/H) return -/datum/species/proc/spec_death(var/gibbed, var/mob/living/carbon/human/H) +/datum/species/proc/spec_death(gibbed, mob/living/carbon/human/H) return -/datum/species/proc/auto_equip(var/mob/living/carbon/human/H) +/datum/species/proc/auto_equip(mob/living/carbon/human/H) // handles the equipping of species-specific gear return -/datum/species/proc/can_equip(var/obj/item/I, var/slot, var/disable_warning, var/mob/living/carbon/human/H) +/datum/species/proc/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H) if(slot in no_equip) if(!(type in I.species_exception)) return 0 @@ -555,23 +555,23 @@ return 0 return 0 //Unsupported slot -/datum/species/proc/before_equip_job(var/datum/job/J, var/mob/living/carbon/human/H) +/datum/species/proc/before_equip_job(datum/job/J, mob/living/carbon/human/H) return -/datum/species/proc/after_equip_job(var/datum/job/J, var/mob/living/carbon/human/H) +/datum/species/proc/after_equip_job(datum/job/J, mob/living/carbon/human/H) return -/datum/species/proc/handle_chemicals(var/datum/reagent/chem, var/mob/living/carbon/human/H) +/datum/species/proc/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) return 0 -/datum/species/proc/handle_speech(var/message, var/mob/living/carbon/human/H) +/datum/species/proc/handle_speech(message, mob/living/carbon/human/H) return message //////// //LIFE// //////// -/datum/species/proc/handle_chemicals_in_body(var/mob/living/carbon/human/H) +/datum/species/proc/handle_chemicals_in_body(mob/living/carbon/human/H) //The fucking FAT mutation is the dumbest shit ever. It makes the code so difficult to work with if(H.disabilities & FAT) @@ -627,7 +627,7 @@ return -/datum/species/proc/handle_vision(var/mob/living/carbon/human/H) +/datum/species/proc/handle_vision(mob/living/carbon/human/H) if( H.stat == DEAD ) H.sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS) H.see_in_dark = 8 @@ -699,7 +699,7 @@ return 1 -/datum/species/proc/handle_hud_icons(var/mob/living/carbon/human/H) +/datum/species/proc/handle_hud_icons(mob/living/carbon/human/H) if(H.healths) if(H.stat == DEAD) H.healths.icon_state = "health7" @@ -752,7 +752,7 @@ return 1 -/datum/species/proc/handle_mutations_and_radiation(var/mob/living/carbon/human/H) +/datum/species/proc/handle_mutations_and_radiation(mob/living/carbon/human/H) if(!(RADIMMUNE in specflags)) if(H.radiation) @@ -789,7 +789,7 @@ // MOVE SPEED // //////////////// -/datum/species/proc/movement_delay(var/mob/living/carbon/human/H) +/datum/species/proc/movement_delay(mob/living/carbon/human/H) var/mspeed = 0 if(!(H.status_flags & IGNORESLOWDOWN)) @@ -850,7 +850,7 @@ // ATTACK PROCS // ////////////////// -/datum/species/proc/spec_attack_hand(var/mob/living/carbon/human/M, var/mob/living/carbon/human/H) +/datum/species/proc/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H) if(!istype(M)) //sanity check for drones. return if((M != H) && H.check_shields(0, M.name)) @@ -982,7 +982,7 @@ "[M] attemped to disarm [H]!") return -/datum/species/proc/spec_attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone, var/obj/item/organ/limb/affecting, var/hit_area, var/intent, var/obj/item/organ/limb/target_limb, target_area, var/mob/living/carbon/human/H) +/datum/species/proc/spec_attacked_by(obj/item/I, mob/living/user, def_zone, obj/item/organ/limb/affecting, hit_area, intent, obj/item/organ/limb/target_limb, target_area, mob/living/carbon/human/H) // Allows you to put in item-specific reactions based on species if(user != src) user.do_attack_animation(H) @@ -1068,7 +1068,7 @@ H.forcesay(hit_appends) //forcesay checks stat already. return -/datum/species/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone, var/mob/living/carbon/human/H) +/datum/species/proc/attacked_by(obj/item/I, mob/living/user, def_zone, mob/living/carbon/human/H) H.apply_damage(I.force, I.damtype) if(I.damtype == "brute") if(prob(33) && I.force && !(NOBLOOD in specflags)) @@ -1093,7 +1093,7 @@ return -/datum/species/proc/apply_damage(var/damage, var/damagetype = BRUTE, var/def_zone = null, var/blocked, var/mob/living/carbon/human/H) +/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H) blocked = (100-(blocked+armor))/100 if(blocked <= 0) return 0 @@ -1125,7 +1125,7 @@ if(STAMINA) H.adjustStaminaLoss(damage * blocked) -/datum/species/proc/on_hit(var/obj/item/projectile/proj_type, var/mob/living/carbon/human/H) +/datum/species/proc/on_hit(obj/item/projectile/proj_type, mob/living/carbon/human/H) // called when hit by a projectile switch(proj_type) if(/obj/item/projectile/energy/floramut) // overwritten by plants/pods @@ -1138,7 +1138,7 @@ //BREATHING// ///////////// -/datum/species/proc/breathe(var/mob/living/carbon/human/H) +/datum/species/proc/breathe(mob/living/carbon/human/H) return /datum/species/proc/check_breath(datum/gas_mixture/breath, var/mob/living/carbon/human/H) @@ -1276,7 +1276,7 @@ //Returns the amount of true_pp we breathed -/datum/species/proc/handle_too_little_breath(var/mob/living/carbon/human/H = null,var/breath_pp = 0, var/safe_breath_min = 0, var/true_pp = 0) +/datum/species/proc/handle_too_little_breath(mob/living/carbon/human/H = null,breath_pp = 0, safe_breath_min = 0, true_pp = 0) . = 0 if(!H || !safe_breath_min) //the other args are either: Ok being 0 or Specifically handled. return 0 @@ -1295,7 +1295,7 @@ H.failed_last_breath = 1 -/datum/species/proc/handle_breath_temperature(datum/gas_mixture/breath, var/mob/living/carbon/human/H) // called by human/life, handles temperatures +/datum/species/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/H) // called by human/life, handles temperatures if(abs(310.15 - breath.temperature) > 50) if(!(mutations_list[COLDRES] in H.dna.mutations)) // COLD DAMAGE @@ -1316,7 +1316,7 @@ if(1000 to INFINITY) H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head") -/datum/species/proc/handle_environment(datum/gas_mixture/environment, var/mob/living/carbon/human/H) +/datum/species/proc/handle_environment(datum/gas_mixture/environment, mob/living/carbon/human/H) if(!environment) return @@ -1403,15 +1403,15 @@ // FIRE // ////////// -/datum/species/proc/handle_fire(var/mob/living/carbon/human/H) +/datum/species/proc/handle_fire(mob/living/carbon/human/H) if((HEATRES in specflags) || (NOFIRE in specflags)) return 1 -/datum/species/proc/IgniteMob(var/mob/living/carbon/human/H) +/datum/species/proc/IgniteMob(mob/living/carbon/human/H) if((HEATRES in specflags) || (NOFIRE in specflags)) return 1 -/datum/species/proc/ExtinguishMob(var/mob/living/carbon/human/H) +/datum/species/proc/ExtinguishMob(mob/living/carbon/human/H) return #undef HUMAN_MAX_OXYLOSS diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index c8fa08fab3c..2549b1635bf 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -12,7 +12,7 @@ default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None") use_skintones = 1 -/datum/species/human/qualifies_for_rank(var/rank, var/list/features) +/datum/species/human/qualifies_for_rank(rank, list/features) if(!config.mutant_humans) //No mutie scum here return 1 @@ -45,7 +45,7 @@ return 1 //Curiosity killed the cat's wagging tail. -datum/species/human/spec_death(var/gibbed, var/mob/living/carbon/human/H) +datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) if(H) H.endTailWag() @@ -79,7 +79,7 @@ datum/species/human/spec_death(var/gibbed, var/mob/living/carbon/human/H) return randname -/datum/species/lizard/qualifies_for_rank(var/rank, var/list/features) +/datum/species/lizard/qualifies_for_rank(rank, list/features) if(rank in command_positions) return 0 return 1 @@ -92,7 +92,7 @@ datum/species/human/spec_death(var/gibbed, var/mob/living/carbon/human/H) return message //I wag in death -/datum/species/lizard/spec_death(var/gibbed, var/mob/living/carbon/human/H) +/datum/species/lizard/spec_death(gibbed, mob/living/carbon/human/H) if(H) H.endTailWag() @@ -419,13 +419,13 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_ name = "Skinbone" skin = 1 -/datum/species/plasmaman/update_base_icon_state(var/mob/living/carbon/human/H) +/datum/species/plasmaman/update_base_icon_state(mob/living/carbon/human/H) var/base = ..() if(base == id) base = "[base][skin]" return base -/datum/species/plasmaman/spec_life(var/mob/living/carbon/human/H) +/datum/species/plasmaman/spec_life(mob/living/carbon/human/H) var/datum/gas_mixture/environment = H.loc.return_air() if(!istype(H.wear_suit, /obj/item/clothing/suit/space/eva/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/plasmaman)) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index c33e23bbf8e..aa276babfbd 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -631,7 +631,7 @@ Please contact me on #coderbus IRC. ~Carnie x var/standing = image("icon"=female_clothing_icons["[t_color]_s"], "layer"=-layer) return(standing) -/mob/living/carbon/human/proc/get_overlays_copy(var/list/unwantedLayers) +/mob/living/carbon/human/proc/get_overlays_copy(list/unwantedLayers) var/list/out = new for(var/i=1;i<=TOTAL_LAYERS;i++) if(overlays_standing[i]) diff --git a/code/modules/mob/living/carbon/monkey/death.dm b/code/modules/mob/living/carbon/monkey/death.dm index cecda79cfc9..7e90fb4d386 100644 --- a/code/modules/mob/living/carbon/monkey/death.dm +++ b/code/modules/mob/living/carbon/monkey/death.dm @@ -1,7 +1,7 @@ -/mob/living/carbon/monkey/gib_animation(var/animate) +/mob/living/carbon/monkey/gib_animation(animate) ..(animate, "gibbed-m") -/mob/living/carbon/monkey/dust_animation(var/animate) +/mob/living/carbon/monkey/dust_animation(animate) ..(animate, "dust-m") /mob/living/carbon/monkey/dust(var/animation = 1) diff --git a/code/modules/mob/living/carbon/monkey/emote.dm b/code/modules/mob/living/carbon/monkey/emote.dm index eef8f22fcd1..e21d3a48bb7 100644 --- a/code/modules/mob/living/carbon/monkey/emote.dm +++ b/code/modules/mob/living/carbon/monkey/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/monkey/emote(var/act) +/mob/living/carbon/monkey/emote(act) var/param = null if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index da95fd25fdf..1d1bbcc64d5 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -48,7 +48,7 @@ tally += (283.222 - bodytemperature) / 10 * 1.75 return tally+config.monkey_delay -/mob/living/carbon/monkey/attack_paw(mob/living/M as mob) +/mob/living/carbon/monkey/attack_paw(mob/living/M) if(..()) //successful monkey bite. var/damage = rand(1, 5) if (stat != DEAD) @@ -56,7 +56,7 @@ updatehealth() return -/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L) if(..()) //successful larva bite. var/damage = rand(1, 3) if(stat != DEAD) @@ -64,7 +64,7 @@ adjustBruteLoss(damage) updatehealth() -/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M) if(..()) //To allow surgery to return properly. return @@ -113,7 +113,7 @@ "[M] has disarmed [src]!") return -/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. if (M.a_intent == "harm") if ((prob(95) && health > 0)) @@ -152,14 +152,14 @@ updatehealth() return -/mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) updatehealth() -/mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack var/damage = rand(5, 35) if(M.is_adult) @@ -207,13 +207,13 @@ /mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools return 0 -/mob/living/carbon/monkey/reagent_check(var/datum/reagent/R) //can metabolize all reagents +/mob/living/carbon/monkey/reagent_check(datum/reagent/R) //can metabolize all reagents return 0 /mob/living/carbon/monkey/canBeHandcuffed() return 1 -/mob/living/carbon/monkey/assess_threat(var/obj/machinery/bot/secbot/judgebot, var/lasercolor) +/mob/living/carbon/monkey/assess_threat(obj/machinery/bot/secbot/judgebot, lasercolor) if(judgebot.emagged == 2) return 10 //Everyone is a criminal! var/threatcount = 0 @@ -247,7 +247,7 @@ return threatcount -/mob/living/carbon/monkey/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/mob/living/carbon/monkey/acid_act(acidpwr, toxpwr, acid_volume) if(wear_mask) if(!wear_mask.unacidable) wear_mask.acid_act(acidpwr) diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm index 5be5fbc43b8..3e47c990d9d 100644 --- a/code/modules/mob/living/carbon/monkey/update_icons.dm +++ b/code/modules/mob/living/carbon/monkey/update_icons.dm @@ -35,7 +35,7 @@ overlays += I //////// -/mob/living/carbon/monkey/update_inv_wear_mask(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_wear_mask(update_icons=1) if(wear_mask && istype(wear_mask, /obj/item/clothing/mask) ) wear_mask.screen_loc = ui_monkey_mask if(client && hud_used) @@ -52,7 +52,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_head(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_head(update_icons=1) if(head) head.screen_loc = ui_monkey_head if(client && hud_used) @@ -67,7 +67,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_r_hand(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_r_hand(update_icons=1) if (handcuffed) drop_r_hand() return @@ -88,7 +88,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_l_hand(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_l_hand(update_icons=1) if (handcuffed) drop_l_hand() return @@ -109,7 +109,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_back(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_back(update_icons=1) if(back) back.screen_loc = ui_monkey_back if(client && hud_used) @@ -123,7 +123,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_handcuffed(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_handcuffed(update_icons=1) if(handcuffed) drop_r_hand() drop_l_hand() diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 89a35a4e605..2afbf5c033b 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -8,7 +8,7 @@ Returns standard 0 if fail */ -/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0) +/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0) blocked = (100-blocked)/100 if(!damage || (blocked <= 0)) return 0 switch(damagetype) @@ -28,7 +28,7 @@ return 1 -/mob/living/proc/apply_damages(var/brute = 0, var/burn = 0, var/tox = 0, var/oxy = 0, var/clone = 0, var/def_zone = null, var/blocked = 0, var/stamina = 0) +/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = 0, stamina = 0) if(blocked >= 100) return 0 if(brute) apply_damage(brute, BRUTE, def_zone, blocked) if(burn) apply_damage(burn, BURN, def_zone, blocked) @@ -40,7 +40,7 @@ -/mob/living/proc/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0) +/mob/living/proc/apply_effect(effect = 0,effecttype = STUN, blocked = 0) blocked = (100-blocked)/100 if(!effect || (blocked <= 0)) return 0 switch(effecttype) @@ -68,7 +68,7 @@ return 1 -/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/slur = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0, var/stamina = 0, var/jitter = 0) +/mob/living/proc/apply_effects(stun = 0, weaken = 0, paralyze = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = 0, stamina = 0, jitter = 0) if(blocked >= 100) return 0 if(stun) apply_effect(stun, STUN, blocked) if(weaken) apply_effect(weaken, WEAKEN, blocked) diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index a0c1a8a3762..3d34f72f240 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -1,4 +1,4 @@ -/mob/living/gib(var/animation = 1) +/mob/living/gib(animation = 1) var/prev_lying = lying death(1) @@ -16,10 +16,10 @@ /mob/living/proc/spawn_gibs() gibs(loc, viruses) -/mob/living/proc/gib_animation(var/animate, var/flick_name = "gibbed") +/mob/living/proc/gib_animation(animate, flick_name = "gibbed") flick(flick_name, animate) -/mob/living/dust(var/animation = 0) +/mob/living/dust(animation = 0) death(1) var/atom/movable/overlay/animate = setup_animation(animation, 0) if(animate) @@ -31,7 +31,7 @@ /mob/living/proc/spawn_dust() new /obj/effect/decal/cleanable/ash(loc) -/mob/living/proc/dust_animation(var/animate, var/flick_name = "") +/mob/living/proc/dust_animation(animate, flick_name = "") flick(flick_name, animate) /mob/living/death(gibbed) @@ -45,7 +45,7 @@ buckled.unbuckle_mob() -/mob/living/proc/setup_animation(var/animation, var/prev_lying) +/mob/living/proc/setup_animation(animation, prev_lying) var/atom/movable/overlay/animate = null notransform = 1 canmove = 0 @@ -60,7 +60,7 @@ animate.master = src return animate -/mob/living/proc/end_animation(var/animate) +/mob/living/proc/end_animation(animate) if(!animate) qdel(src) else diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 08ffb07c7d9..ef8a6b82680 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -2,7 +2,7 @@ //Things like airguitar can be done without arms, and the flap thing makes so little sense it's a keeper. //Intended to be called by a higher up emote proc if the requested emote isn't in the custom emotes. -/mob/living/emote(var/act, var/m_type=1, var/message = null) +/mob/living/emote(act, m_type=1, message = null) if(stat) return diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index bdd6bd4119a..43198f5700c 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -74,7 +74,7 @@ /mob/living/proc/handle_random_events() return -/mob/living/proc/handle_environment(var/datum/gas_mixture/environment) +/mob/living/proc/handle_environment(datum/gas_mixture/environment) return /mob/living/proc/handle_stomach() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index dceb94a9f96..46fb3469ab3 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -166,7 +166,7 @@ Sorry Giacom. Please don't be mad :( visible_message("[src] points to [A]") return 1 -/mob/living/verb/succumb(var/whispered as null) +/mob/living/verb/succumb(whispered as null) set hidden = 1 if (InCritical()) src.attack_log += "[src] has [whispered ? "whispered his final words" : "succumbed to death"] with [round(health, 0.1)] points of health!" @@ -194,7 +194,7 @@ Sorry Giacom. Please don't be mad :( //This proc is used for mobs which are affected by pressure to calculate the amount of pressure that actually //affects them once clothing is factored in. ~Errorage -/mob/living/proc/calculate_affecting_pressure(var/pressure) +/mob/living/proc/calculate_affecting_pressure(pressure) return pressure @@ -244,7 +244,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getBruteLoss() return bruteloss -/mob/living/proc/adjustBruteLoss(var/amount) +/mob/living/proc/adjustBruteLoss(amount) if(status_flags & GODMODE) return 0 bruteloss = min(max(bruteloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() //we update our health right away. @@ -252,12 +252,12 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getOxyLoss() return oxyloss -/mob/living/proc/adjustOxyLoss(var/amount) +/mob/living/proc/adjustOxyLoss(amount) if(status_flags & GODMODE) return 0 oxyloss = min(max(oxyloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() -/mob/living/proc/setOxyLoss(var/amount) +/mob/living/proc/setOxyLoss(amount) if(status_flags & GODMODE) return 0 oxyloss = amount handle_regular_status_updates() @@ -265,12 +265,12 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getToxLoss() return toxloss -/mob/living/proc/adjustToxLoss(var/amount) +/mob/living/proc/adjustToxLoss(amount) if(status_flags & GODMODE) return 0 toxloss = min(max(toxloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() -/mob/living/proc/setToxLoss(var/amount) +/mob/living/proc/setToxLoss(amount) if(status_flags & GODMODE) return 0 toxloss = amount handle_regular_status_updates() @@ -278,7 +278,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getFireLoss() return fireloss -/mob/living/proc/adjustFireLoss(var/amount) +/mob/living/proc/adjustFireLoss(amount) if(status_flags & GODMODE) return 0 fireloss = min(max(fireloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() //we update our health right away. @@ -286,12 +286,12 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getCloneLoss() return cloneloss -/mob/living/proc/adjustCloneLoss(var/amount) +/mob/living/proc/adjustCloneLoss(amount) if(status_flags & GODMODE) return 0 cloneloss = min(max(cloneloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() -/mob/living/proc/setCloneLoss(var/amount) +/mob/living/proc/setCloneLoss(amount) if(status_flags & GODMODE) return 0 cloneloss = amount handle_regular_status_updates() @@ -299,12 +299,12 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getBrainLoss() return brainloss -/mob/living/proc/adjustBrainLoss(var/amount) +/mob/living/proc/adjustBrainLoss(amount) if(status_flags & GODMODE) return 0 brainloss = min(max(brainloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() -/mob/living/proc/setBrainLoss(var/amount) +/mob/living/proc/setBrainLoss(amount) if(status_flags & GODMODE) return 0 brainloss = amount handle_regular_status_updates() //we update our health right away. @@ -312,18 +312,18 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getStaminaLoss() return staminaloss -/mob/living/proc/adjustStaminaLoss(var/amount) +/mob/living/proc/adjustStaminaLoss(amount) if(status_flags & GODMODE) return 0 staminaloss = min(max(staminaloss + amount, 0),(maxHealth*2)) -/mob/living/proc/setStaminaLoss(var/amount) +/mob/living/proc/setStaminaLoss(amount) if(status_flags & GODMODE) return 0 staminaloss = amount /mob/living/proc/getMaxHealth() return maxHealth -/mob/living/proc/setMaxHealth(var/newMaxHealth) +/mob/living/proc/setMaxHealth(newMaxHealth) maxHealth = newMaxHealth // MOB PROCS //END @@ -351,7 +351,7 @@ Sorry Giacom. Please don't be mad :( update_canmove() //Recursive function to find everything a mob is holding. -/mob/living/get_contents(var/obj/item/weapon/storage/Storage = null) +/mob/living/get_contents(obj/item/weapon/storage/Storage = null) var/list/L = list() if(Storage) //If it called itself @@ -376,7 +376,7 @@ Sorry Giacom. Please don't be mad :( return 0 -/mob/living/proc/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0) +/mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0) return 0 //only carbon liveforms have this proc /mob/living/emp_act(severity) @@ -397,37 +397,37 @@ Sorry Giacom. Please don't be mad :( return def_zone //damage/heal the mob ears and adjust the deaf amount -/mob/living/adjustEarDamage(var/damage, var/deaf) +/mob/living/adjustEarDamage(damage, deaf) ear_damage = max(0, ear_damage + damage) ear_deaf = max(0, ear_deaf + deaf) //pass a negative argument to skip one of the variable -/mob/living/setEarDamage(var/damage, var/deaf) +/mob/living/setEarDamage(damage, deaf) if(damage >= 0) ear_damage = damage if(deaf >= 0) ear_deaf = deaf // heal ONE external organ, organ gets randomly selected from damaged ones. -/mob/living/proc/heal_organ_damage(var/brute, var/burn) +/mob/living/proc/heal_organ_damage(brute, burn) adjustBruteLoss(-brute) adjustFireLoss(-burn) src.updatehealth() // damage ONE external organ, organ gets randomly selected from damaged ones. -/mob/living/proc/take_organ_damage(var/brute, var/burn) +/mob/living/proc/take_organ_damage(brute, burn) adjustBruteLoss(brute) adjustFireLoss(burn) src.updatehealth() // heal MANY external organs, in random order -/mob/living/proc/heal_overall_damage(var/brute, var/burn) +/mob/living/proc/heal_overall_damage(brute, burn) adjustBruteLoss(-brute) adjustFireLoss(-burn) src.updatehealth() // damage MANY external organs, in random order -/mob/living/proc/take_overall_damage(var/brute, var/burn) +/mob/living/proc/take_overall_damage(brute, burn) adjustBruteLoss(brute) adjustFireLoss(burn) src.updatehealth() @@ -570,7 +570,7 @@ Sorry Giacom. Please don't be mad :( for(var/mob/living/simple_animal/slime/M in oview(1,src)) M.UpdateFeed(src) -/mob/living/proc/makeTrail(var/turf/T, var/mob/living/M) +/mob/living/proc/makeTrail(turf/T, mob/living/M) if(ishuman(M)) var/mob/living/carbon/human/H = M if((NOBLOOD in H.dna.species.specflags) || (!H.blood_max) || (H.bleedsuppress)) @@ -814,7 +814,7 @@ Sorry Giacom. Please don't be mad :( animate(pixel_x = final_pixel_x , pixel_y = final_pixel_y , time = 2) floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure to restart it in next life(). -/mob/living/proc/get_temperature(var/datum/gas_mixture/environment) +/mob/living/proc/get_temperature(datum/gas_mixture/environment) var/loc_temp = T0C if(istype(loc, /obj/mecha)) var/obj/mecha/M = loc diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 978df4d981d..c620bda6767 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -1,4 +1,4 @@ -/mob/living/proc/run_armor_check(def_zone = null, attack_flag = "melee", absorb_text = null, soften_text = null, var/armour_penetration, var/penetrated_text) +/mob/living/proc/run_armor_check(def_zone = null, attack_flag = "melee", absorb_text = null, soften_text = null, armour_penetration, penetrated_text) var/armor = getarmor(def_zone, attack_flag) //the if "armor" check is because this is used for everything on /living, including humans @@ -22,10 +22,10 @@ return armor -/mob/living/proc/getarmor(var/def_zone, var/type) +/mob/living/proc/getarmor(def_zone, type) return 0 -/mob/living/proc/on_hit(var/obj/item/projectile/proj_type) +/mob/living/proc/on_hit(obj/item/projectile/proj_type) return /mob/living/bullet_act(obj/item/projectile/P, def_zone) @@ -34,7 +34,7 @@ apply_damage(P.damage, P.damage_type, def_zone, armor) return P.on_hit(src, armor, def_zone) -/proc/vol_by_throwforce_and_or_w_class(var/obj/item/I) +/proc/vol_by_throwforce_and_or_w_class(obj/item/I) if(!I) return 0 if(I.throwforce && I.w_class) @@ -149,7 +149,7 @@ //Share fire evenly between the two mobs //Called in MobBump() and Crossed() -/mob/living/proc/spreadFire(var/mob/living/L) +/mob/living/proc/spreadFire(mob/living/L) if(!istype(L)) return var/L_old_on_fire = L.on_fire @@ -167,10 +167,10 @@ //Mobs on Fire end -/mob/living/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/mob/living/acid_act(acidpwr, toxpwr, acid_volume) take_organ_damage(min(10*toxpwr, acid_volume * toxpwr)) -/mob/living/proc/grabbedby(mob/living/carbon/user,var/supress_message = 0) +/mob/living/proc/grabbedby(mob/living/carbon/user,supress_message = 0) if(user == src || anchored) return 0 if(!(status_flags & CANPUSH)) @@ -192,7 +192,7 @@ visible_message("[user] has grabbed [src] passively!") -/mob/living/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/attack_slime(mob/living/simple_animal/slime/M) if (!ticker) M << "You cannot attack people before the game has started." return @@ -207,7 +207,7 @@ "The [M.name] glomps [src]!") return 1 -/mob/living/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/attack_animal(mob/living/simple_animal/M) if(M.melee_damage_upper == 0) M.visible_message("\The [M] [M.friendly] [src]!") return 0 @@ -221,7 +221,7 @@ return 1 -/mob/living/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/attack_paw(mob/living/carbon/monkey/M) if (!ticker) M << "You cannot attack people before the game has started." return 0 @@ -246,7 +246,7 @@ "[M.name] has attempted to bite [src]!") return 0 -/mob/living/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/attack_larva(mob/living/carbon/alien/larva/L) switch(L.a_intent) if("help") @@ -266,7 +266,7 @@ "[L.name] has attempted to bite [src]!") return 0 -/mob/living/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/attack_alien(mob/living/carbon/alien/humanoid/M) if (!ticker) M << "You cannot attack people before the game has started." return 0 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 4f2c3b17000..cac929c3681 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -351,7 +351,7 @@ var/list/ai_list = list() SSshuttle.cancelEvac(src) return -/mob/living/silicon/ai/check_eye(var/mob/user as mob) +/mob/living/silicon/ai/check_eye(mob/user) if (!current) return null user.reset_view(current) @@ -463,13 +463,13 @@ var/list/ai_list = list() if(M) M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself. -/mob/living/silicon/ai/bullet_act(var/obj/item/projectile/Proj) +/mob/living/silicon/ai/bullet_act(obj/item/projectile/Proj) ..(Proj) updatehealth() return 2 -/mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M) if (!ticker) M << "You cannot attack people before the game has started." return @@ -485,7 +485,7 @@ var/list/ai_list = list() ..() -/mob/living/silicon/ai/proc/switchCamera(var/obj/machinery/camera/C) +/mob/living/silicon/ai/proc/switchCamera(obj/machinery/camera/C) if(!tracking) cameraFollow = null @@ -536,7 +536,7 @@ var/list/ai_list = list() popup.set_content(d) popup.open() -/mob/living/silicon/ai/proc/set_waypoint(var/atom/A) +/mob/living/silicon/ai/proc/set_waypoint(atom/A) var/turf/turf_check = get_turf(A) //The target must be in view of a camera or near the core. if(turf_check in range(get_turf(src))) @@ -546,7 +546,7 @@ var/list/ai_list = list() else src << "Selected location is not visible." -/mob/living/silicon/ai/proc/call_bot(var/turf/waypoint) +/mob/living/silicon/ai/proc/call_bot(turf/waypoint) if(!Bot) return @@ -557,7 +557,7 @@ var/list/ai_list = list() Bot.call_bot(src, waypoint) -/mob/living/silicon/ai/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) +/mob/living/silicon/ai/triggerAlarm(class, area/A, O, obj/alarmsource) if(alarmsource.z != z) return if (stat == 2) @@ -596,7 +596,7 @@ var/list/ai_list = list() if (viewalerts) ai_alerts() return 1 -/mob/living/silicon/ai/cancelAlarm(var/class, area/A as area, obj/origin) +/mob/living/silicon/ai/cancelAlarm(class, area/A, obj/origin) var/list/L = alarms[class] var/cleared = 0 for (var/I in L) @@ -806,7 +806,7 @@ var/list/ai_list = list() /mob/living/silicon/ai/attack_slime(mob/living/simple_animal/slime/user) return -/mob/living/silicon/ai/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +/mob/living/silicon/ai/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) return if(interaction == AI_TRANS_TO_CARD)//The only possible interaction. Upload AI mob to a card. diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm index f9da2399c9a..dfa2e7bb970 100644 --- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm +++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm @@ -59,7 +59,7 @@ var/datum/cameranet/cameranet = new() // Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open. -/datum/cameranet/proc/updateVisibility(atom/A, var/opacity_check = 1) +/datum/cameranet/proc/updateVisibility(atom/A, opacity_check = 1) if(!ticker || (opacity_check && !A.opacity)) return @@ -98,7 +98,7 @@ var/datum/cameranet/cameranet = new() // Setting the choice to 0 will remove the camera from the chunks. // If you want to update the chunks around an object, without adding/removing a camera, use choice 2. -/datum/cameranet/proc/majorChunkChange(atom/c, var/choice) +/datum/cameranet/proc/majorChunkChange(atom/c, choice) // 0xf = 15 if(!c) return @@ -126,14 +126,14 @@ var/datum/cameranet/cameranet = new() // Will check if a mob is on a viewable turf. Returns 1 if it is, otherwise returns 0. -/datum/cameranet/proc/checkCameraVis(mob/living/target as mob) +/datum/cameranet/proc/checkCameraVis(mob/living/target) // 0xf = 15 var/turf/position = get_turf(target) return checkTurfVis(position) -/datum/cameranet/proc/checkTurfVis(var/turf/position) +/datum/cameranet/proc/checkTurfVis(turf/position) var/datum/camerachunk/chunk = getCameraChunk(position.x, position.y, position.z) if(chunk) if(chunk.changed) diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm index 62edcd7bd03..e36a3df9bd3 100644 --- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm +++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm @@ -52,7 +52,7 @@ // Updates the chunk, makes sure that it doesn't update too much. If the chunk isn't being watched it will // instead be flagged to update the next time an AI Eye moves near it. -/datum/camerachunk/proc/hasChanged(var/update_now = 0) +/datum/camerachunk/proc/hasChanged(update_now = 0) if(visible || update_now) if(!updating) updating = 1 diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index dd38dac92d1..30918bbcec3 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -13,7 +13,7 @@ // Use this when setting the aiEye's location. // It will also stream the chunk that the new loc is in. -/mob/camera/aiEye/proc/setLoc(var/T) +/mob/camera/aiEye/proc/setLoc(T) if(ai) if(!isturf(ai.loc)) @@ -51,7 +51,7 @@ // This will move the AIEye. It will also cause lights near the eye to light up, if toggled. // This is handled in the proc below this one. -/client/proc/AIMove(n, direct, var/mob/living/silicon/ai/user) +/client/proc/AIMove(n, direct, mob/living/silicon/ai/user) var/initial = initial(user.sprint) var/max_sprint = 50 diff --git a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm index f67578c5286..2b69c20cd65 100644 --- a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm +++ b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm @@ -78,7 +78,7 @@ // An addition to deactivate which removes/adds the camera from the chunk list based on if it works or not. -/obj/machinery/camera/deactivate(user as mob, var/choice = 1) +/obj/machinery/camera/deactivate(mob/user, choice = 1) ..(user, choice) if(src.can_use()) cameranet.addCamera(src) diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm index 6959150a555..8371f6e3021 100644 --- a/code/modules/mob/living/silicon/ai/laws.dm +++ b/code/modules/mob/living/silicon/ai/laws.dm @@ -4,7 +4,7 @@ set name = "Show Laws" src.show_laws() -/mob/living/silicon/ai/show_laws(var/everyone = 0) +/mob/living/silicon/ai/show_laws(everyone = 0) var/who if (everyone) diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 826b823c0ff..86158b3c4f0 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/ai/say(var/message) +/mob/living/silicon/ai/say(message) if(parent && istype(parent) && parent.stat != 2) //If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead. parent.say(message) return @@ -39,7 +39,7 @@ return 1 //For holopads only. Usable by AI. -/mob/living/silicon/ai/proc/holopad_talk(var/message) +/mob/living/silicon/ai/proc/holopad_talk(message) log_say("[key_name(src)] : [message]") message = trim(message) @@ -141,7 +141,7 @@ var/const/VOX_DELAY = 600 */ -/proc/play_vox_word(var/word, var/z_level, var/mob/only_listener) +/proc/play_vox_word(word, z_level, mob/only_listener) word = lowertext(word) diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm index bc3ed069bba..f9c7e78231d 100644 --- a/code/modules/mob/living/silicon/death.dm +++ b/code/modules/mob/living/silicon/death.dm @@ -1,7 +1,7 @@ /mob/living/silicon/spawn_gibs() robogibs(loc, viruses) -/mob/living/silicon/gib(var/animation = 0) // Please don't remove this thinking this proc does nothing, it is changing the default value for animation. +/mob/living/silicon/gib(animation = 0) // Please don't remove this thinking this proc does nothing, it is changing the default value for animation. ..() /mob/living/silicon/spawn_dust() diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index d78b2448e28..a588bd19e1c 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -5,12 +5,12 @@ if (!laws) make_laws() -/mob/living/silicon/proc/set_zeroth_law(var/law, var/law_borg) +/mob/living/silicon/proc/set_zeroth_law(law, law_borg) throw_alert("newlaw") src.laws_sanity_check() src.laws.set_zeroth_law(law, law_borg) -/mob/living/silicon/proc/add_inherent_law(var/law) +/mob/living/silicon/proc/add_inherent_law(law) throw_alert("newlaw") laws_sanity_check() laws.add_inherent_law(law) @@ -20,7 +20,7 @@ laws_sanity_check() laws.clear_inherent_laws() -/mob/living/silicon/proc/add_supplied_law(var/number, var/law) +/mob/living/silicon/proc/add_supplied_law(number, law) throw_alert("newlaw") laws_sanity_check() laws.add_supplied_law(number, law) @@ -30,7 +30,7 @@ laws_sanity_check() laws.clear_supplied_laws() -/mob/living/silicon/proc/add_ion_law(var/law) +/mob/living/silicon/proc/add_ion_law(law) throw_alert("newlaw") laws_sanity_check() laws.add_ion_law(law) @@ -49,6 +49,6 @@ laws = new lawtype() laws.associate(src) -/mob/living/silicon/proc/clear_zeroth_law(var/force) +/mob/living/silicon/proc/clear_zeroth_law(force) laws_sanity_check() laws.clear_zeroth_law(force) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 0e629e59283..858e4f42e97 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -88,7 +88,7 @@ else stat(null, text("Systems nonfunctional")) -/mob/living/silicon/pai/check_eye(var/mob/user as mob) +/mob/living/silicon/pai/check_eye(mob/user) if (!src.current) return null user.reset_view(src.current) @@ -153,7 +153,7 @@ ///mob/living/silicon/pai/attack_hand(mob/living/carbon/M as mob) -/mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C) +/mob/living/silicon/pai/proc/switchCamera(obj/machinery/camera/C) usr:cameraFollow = null if (!C) src.unset_machine() @@ -176,10 +176,10 @@ src.unset_machine() src:cameraFollow = null -/mob/living/silicon/pai/UnarmedAttack(var/atom/A)//Stops runtimes due to attack_animal being the default +/mob/living/silicon/pai/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default return -/mob/living/silicon/pai/on_forcemove(var/atom/newloc) +/mob/living/silicon/pai/on_forcemove(atom/newloc) if(card) card.loc = newloc else //something went very wrong. diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm index c4928878ce9..a3f4f7d8871 100644 --- a/code/modules/mob/living/silicon/pai/personality.dm +++ b/code/modules/mob/living/silicon/pai/personality.dm @@ -31,7 +31,7 @@ // returns 1 if loaded (or file was incompatible) // returns 0 if savefile did not exist -/datum/paiCandidate/proc/savefile_load(mob/user, var/silent = 1) +/datum/paiCandidate/proc/savefile_load(mob/user, silent = 1) if (IsGuestKey(user.key)) return 0 diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm index 6e93366f713..9432ce52a55 100644 --- a/code/modules/mob/living/silicon/pai/say.dm +++ b/code/modules/mob/living/silicon/pai/say.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/pai/say(var/msg) +/mob/living/silicon/pai/say(msg) if(silence_time) src << "Communication circuits remain unitialized." else diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index e12b5db835b..53e979b4031 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -1,13 +1,13 @@ -/mob/living/silicon/robot/gib(var/animation = 1) +/mob/living/silicon/robot/gib(animation = 1) ..() /mob/living/silicon/robot/spawn_gibs() robogibs(loc, viruses) -/mob/living/silicon/robot/gib_animation(var/animate) +/mob/living/silicon/robot/gib_animation(animate) ..(animate, "gibbed-r") -/mob/living/silicon/robot/dust(var/animation = 1) +/mob/living/silicon/robot/dust(animation = 1) if(mmi) qdel(mmi) ..() @@ -15,7 +15,7 @@ /mob/living/silicon/robot/spawn_dust() new /obj/effect/decal/remains/robot(loc) -/mob/living/silicon/robot/dust_animation(var/animate) +/mob/living/silicon/robot/dust_animation(animate) ..(animate, "dust-r") /mob/living/silicon/robot/death(gibbed) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 3cdc1c7008b..d424af7bf41 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/emote(var/act,var/m_type=1,var/message = null) +/mob/living/silicon/emote(act,m_type=1,message = null) var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 496d44d7e04..70a5daa21ee 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -43,7 +43,7 @@ hud_used.update_robot_modules_display() return 1 -/mob/living/silicon/robot/proc/activate_module(var/obj/item/O) +/mob/living/silicon/robot/proc/activate_module(obj/item/O) if(!(locate(O) in src.module.modules) && O != src.module.emag) return if(activated(O)) @@ -95,11 +95,11 @@ //These are hackish but they help clean up code elsewhere. //module_selected(module) - Checks whether the module slot specified by "module" is currently selected. -/mob/living/silicon/robot/proc/module_selected(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/module_selected(module) //Module is 1-3 return module == get_selected_module() //module_active(module) - Checks whether there is a module active in the slot specified by "module". -/mob/living/silicon/robot/proc/module_active(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/module_active(module) //Module is 1-3 if(module < 1 || module > 3) return 0 switch(module) @@ -126,7 +126,7 @@ return 0 //select_module(module) - Selects the module slot specified by "module" -/mob/living/silicon/robot/proc/select_module(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/select_module(module) //Module is 1-3 if(module < 1 || module > 3) return if(!module_active(module)) return @@ -156,7 +156,7 @@ return //deselect_module(module) - Deselects the module slot specified by "module" -/mob/living/silicon/robot/proc/deselect_module(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/deselect_module(module) //Module is 1-3 if(module < 1 || module > 3) return switch(module) @@ -178,7 +178,7 @@ return //toggle_module(module) - Toggles the selection of the module slot specified by "module". -/mob/living/silicon/robot/proc/toggle_module(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/toggle_module(module) //Module is 1-3 if(module < 1 || module > 3) return if(module_selected(module)) diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm index 30ba3143730..337ca2118f0 100644 --- a/code/modules/mob/living/silicon/robot/laws.dm +++ b/code/modules/mob/living/silicon/robot/laws.dm @@ -3,7 +3,7 @@ set name = "Show Laws" show_laws() -/mob/living/silicon/robot/show_laws(var/everyone = 0) +/mob/living/silicon/robot/show_laws(everyone = 0) laws_sanity_check() var/who diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 41ebf4b0440..11ebe6edb27 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -351,7 +351,7 @@ if(prob(75) && Proj.damage > 0) spark_system.start() return 2 -/mob/living/silicon/robot/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) +/mob/living/silicon/robot/triggerAlarm(class, area/A, O, obj/alarmsource) if(alarmsource.z != z) return if (stat == 2) @@ -378,7 +378,7 @@ return 1 -/mob/living/silicon/robot/cancelAlarm(var/class, area/A as area, obj/origin) +/mob/living/silicon/robot/cancelAlarm(class, area/A, obj/origin) var/list/L = alarms[class] var/cleared = 0 for (var/I in L) @@ -396,7 +396,7 @@ return !cleared -/mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/mob/living/silicon/robot/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/restraints/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do return @@ -555,7 +555,7 @@ spark_system.start() return ..() -/mob/living/silicon/robot/emag_act(mob/user as mob) +/mob/living/silicon/robot/emag_act(mob/user) if(user != src)//To prevent syndieborgs from emagging themselves if(!opened)//Cover is closed if(locked) @@ -615,7 +615,7 @@ update_icons() usr << "You unlock your cover." -/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M) if (M.a_intent =="disarm") if(!(lying)) M.do_attack_animation(src) @@ -638,7 +638,7 @@ -/mob/living/silicon/robot/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/silicon/robot/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime shock flick("noise", flash) var/stunprob = M.powerlevel * 7 + 10 @@ -939,7 +939,7 @@ return -/mob/living/silicon/robot/proc/SetLockdown(var/state = 1) +/mob/living/silicon/robot/proc/SetLockdown(state = 1) // They stay locked down if their wire is cut. if(wires.LockedCut()) state = 1 @@ -950,7 +950,7 @@ lockcharge = state update_canmove() -/mob/living/silicon/robot/proc/SetEmagged(var/new_state) +/mob/living/silicon/robot/proc/SetEmagged(new_state) emagged = new_state if(new_state) if(src.module) @@ -1038,7 +1038,7 @@ module = new /obj/item/weapon/robot_module/syndicate(src) laws = new /datum/ai_laws/syndicate_override() -/mob/living/silicon/robot/proc/notify_ai(var/notifytype, var/oldname, var/newname) +/mob/living/silicon/robot/proc/notify_ai(notifytype, oldname, newname) if(!connected_ai) return switch(notifytype) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 59e6475286e..7bbcd4ad3b2 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -40,7 +40,7 @@ return -/obj/item/weapon/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R) return /obj/item/weapon/robot_module/proc/rebuild()//Rebuilds the list so it's possible to add/remove items from the module @@ -272,7 +272,7 @@ energy = max_energy return -/datum/robot_energy_storage/proc/use_charge(var/amount) +/datum/robot_energy_storage/proc/use_charge(amount) if (energy >= amount) energy -= amount if (energy == 0) @@ -281,7 +281,7 @@ else return 0 -/datum/robot_energy_storage/proc/add_charge(var/amount) +/datum/robot_energy_storage/proc/add_charge(amount) energy = min(energy + amount, max_energy) /datum/robot_energy_storage/metal diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index fe89288765e..d459886311c 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/robot/Process_Spacemove(var/movement_dir = 0) +/mob/living/silicon/robot/Process_Spacemove(movement_dir = 0) if(module) for(var/obj/item/weapon/tank/jetpack/J in module.modules) if(J && istype(J, /obj/item/weapon/tank/jetpack)) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index ef2e3041aa1..e022b8991a4 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -1,10 +1,10 @@ -/mob/living/silicon/say(var/message) +/mob/living/silicon/say(message) return ..(message, "R") /mob/living/silicon/get_spans() return ..() | SPAN_ROBOT -/mob/living/proc/robot_talk(var/message) +/mob/living/proc/robot_talk(message) log_say("[key_name(src)] : [message]") var/desig = "Default Cyborg" //ezmode for taters if(istype(src, /mob/living/silicon)) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index dc549c835d1..c3ec3215993 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -37,7 +37,7 @@ /mob/living/silicon/proc/triggerAlarm() return -/mob/living/silicon/proc/queueAlarm(var/message, var/type, var/incoming = 1) +/mob/living/silicon/proc/queueAlarm(message, type, incoming = 1) var/in_cooldown = (alarms_to_show.len > 0 || alarms_to_clear.len > 0) if(incoming) alarms_to_show += message @@ -126,7 +126,7 @@ src << "Warning: Electromagnetic pulse detected." ..() -/mob/living/silicon/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0) +/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0) blocked = (100-blocked)/100 if(!damage || (blocked <= 0)) return 0 switch(damagetype) @@ -139,10 +139,10 @@ updatehealth() return 1 -/mob/living/silicon/proc/damage_mob(var/brute = 0, var/fire = 0, var/tox = 0) +/mob/living/silicon/proc/damage_mob(brute = 0, fire = 0, tox = 0) return -/mob/living/silicon/can_inject(var/mob/user, var/error_msg) +/mob/living/silicon/can_inject(mob/user, error_msg) if(error_msg) user << "Their outer shell is too tough." return 0 @@ -150,13 +150,13 @@ /mob/living/silicon/IsAdvancedToolUser() return 1 -/mob/living/silicon/bullet_act(var/obj/item/projectile/Proj) +/mob/living/silicon/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) adjustBruteLoss(Proj.damage) Proj.on_hit(src,2) return 2 -/mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0) +/mob/living/silicon/apply_effect(effect = 0,effecttype = STUN, blocked = 0) return 0//The only effect that can hit them atm is flashes and they still directly edit so this works for now /* if(!effect || (blocked >= 2)) return 0 @@ -178,7 +178,7 @@ updatehealth() return 1*/ -/proc/islinked(var/mob/living/silicon/robot/bot, var/mob/living/silicon/ai/ai) +/proc/islinked(mob/living/silicon/robot/bot, mob/living/silicon/ai/ai) if(!istype(bot) || !istype(ai)) return 0 if (bot.connected_ai == ai) @@ -359,7 +359,7 @@ src << "Sensor augmentations disabled." -/mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent var/damage = rand(10, 20) if (prob(90)) @@ -378,7 +378,7 @@ "[M] took a swipe at [src]!") return -/mob/living/silicon/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/silicon/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 2e7eb872262..261dad9eaa9 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -49,14 +49,14 @@ user << msg -/mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M) if(istype(M, /mob/living/simple_animal/construct/builder)) adjustBruteLoss(-5) M.emote("me", 1, "mends some of \the [src]'s wounds.") else if(src != M) ..() -/mob/living/simple_animal/construct/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/construct/bullet_act(obj/item/projectile/Proj) if(!Proj) return if(Proj.damage_type == BURN || Proj.damage_type == BRUTE) @@ -94,7 +94,7 @@ playstyle_string = "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \ create shield walls and even deflect energy weapons, and rip apart enemies and walls alike." -/mob/living/simple_animal/construct/armored/bullet_act(var/obj/item/projectile/P) +/mob/living/simple_animal/construct/armored/bullet_act(obj/item/projectile/P) if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) var/reflectchance = 80 - round(P.damage/3) if(prob(reflectchance)) @@ -195,5 +195,5 @@ playstyle_string = "You are a Harvester. You are not strong, but your powers of domination will assist you in your role: \ Bring those who still cling to this world of illusion back to the Geometer so they may know Truth." -/mob/living/simple_animal/construct/harvester/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/construct/harvester/Process_Spacemove(movement_dir = 0) return 1 \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 1462e2b52ed..cffe86460e0 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -38,13 +38,13 @@ ..() regenerate_icons() -/mob/living/simple_animal/pet/corgi/sac_act(var/obj/effect/rune/R, victim) //Still the best thing in this game +/mob/living/simple_animal/pet/corgi/sac_act(obj/effect/rune/R, victim) //Still the best thing in this game usr << "Even dark gods from another plane have standards, sicko." usr.reagents.add_reagent("hell_water", 2) R.stone_or_gib(victim) -/mob/living/simple_animal/pet/corgi/show_inv(mob/user as mob) +/mob/living/simple_animal/pet/corgi/show_inv(mob/user) user.set_machine(src) if(user.stat) return @@ -62,7 +62,7 @@ onclose(user, "mob[real_name]") return -/mob/living/simple_animal/pet/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/pet/corgi/attackby(obj/item/O, mob/user, params) if(inventory_head && inventory_back) //helmet and armor = 100% protection if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) ) @@ -193,7 +193,7 @@ //Corgis are supposed to be simpler, so only a select few objects can actually be put //to be compatible with them. The objects are below. //Many hats added, Some will probably be removed, just want to see which ones are popular. -/mob/living/simple_animal/pet/corgi/proc/place_on_head(obj/item/item_to_add, var/mob/user as mob) +/mob/living/simple_animal/pet/corgi/proc/place_on_head(obj/item/item_to_add, mob/user) if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess item_to_add.afterattack(src,user,1) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 67b2369d341..af1520d2d42 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -141,7 +141,7 @@ src << "HeAV% DA%^MMA+G TO I/O CIR!%UUT!" -/mob/living/simple_animal/drone/proc/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) +/mob/living/simple_animal/drone/proc/triggerAlarm(class, area/A, O, obj/alarmsource) if(alarmsource.z != z) return if(stat != DEAD) @@ -157,7 +157,7 @@ src << "--- [class] alarm detected in [A.name]!" -/mob/living/simple_animal/drone/proc/cancelAlarm(var/class, area/A as area, obj/origin) +/mob/living/simple_animal/drone/proc/cancelAlarm(class, area/A, obj/origin) if(stat != DEAD) var/list/L = alarms[class] var/cleared = 0 diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index d4b664f4536..fe4cbaf4122 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -62,7 +62,7 @@ uncurl() -/obj/item/clothing/head/drone_holder/proc/updateVisualAppearence(var/mob/living/simple_animal/drone/D) +/obj/item/clothing/head/drone_holder/proc/updateVisualAppearence(mob/living/simple_animal/drone/D) if(!D) return icon_state = "[D.visualAppearence]_hat" diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm index c835c1c4e79..faf63c739c4 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm @@ -8,7 +8,7 @@ -/mob/living/simple_animal/drone/activate_hand(var/selhand) +/mob/living/simple_animal/drone/activate_hand(selhand) if(istext(selhand)) selhand = lowertext(selhand) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/say.dm b/code/modules/mob/living/simple_animal/friendly/drone/say.dm index 15dc76f9e16..def3ad69d53 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/say.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/say.dm @@ -6,7 +6,7 @@ //Drone hearing -/mob/living/simple_animal/drone/say(var/message) +/mob/living/simple_animal/drone/say(message) return ..(message, "R") diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 1cc8c6acc9b..96b24a86fe7 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -71,7 +71,7 @@ SV.eat(src) -/mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/hostile/retaliate/goat/attackby(obj/item/O, mob/user, params) if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass)) user.visible_message("[user] milks [src] using \the [O].", "You milk [src] using \the [O].") var/obj/item/weapon/reagent_containers/glass/G = O @@ -111,7 +111,7 @@ udder.my_atom = src ..() -/mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/cow/attackby(obj/item/O, mob/user, params) if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass)) user.visible_message("[user] milks [src] using \the [O].", "You milk [src] using \the [O].") var/obj/item/weapon/reagent_containers/glass/G = O @@ -129,7 +129,7 @@ if(udder && prob(5)) udder.add_reagent("milk", rand(5, 10)) -/mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob) +/mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M) if(!stat && M.a_intent == "disarm" && icon_state != icon_dead) M.visible_message("[M] tips over [src].","You tip over [src].") Weaken(30) @@ -235,7 +235,7 @@ var/global/chicken_count = 0 ..(gibbed) chicken_count -= 1 -/mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/chicken/attackby(obj/item/O, mob/user, params) if(istype(O, food_type)) //feedin' dem chickens if(!stat && eggsleft < 8) var/feedmsg = "[user] feeds [O] to [name]! [pick(feedMessages)]" diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm index 79ddffe3912..47680e97a7b 100644 --- a/code/modules/mob/living/simple_animal/friendly/pet.dm +++ b/code/modules/mob/living/simple_animal/friendly/pet.dm @@ -5,7 +5,7 @@ var/image/collar = null var/image/pettag = null -/mob/living/simple_animal/pet/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/clothing/tie/petcollar) && !pcollar) var/obj/item/clothing/tie/petcollar/P = O pcollar = P diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 9526c66c68b..651d97dcb56 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -47,7 +47,7 @@ else icon_state = "bearfloor" -/mob/living/simple_animal/hostile/bear/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/bear/Process_Spacemove(movement_dir = 0) return 1 //No drifting in space for space bears! diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index a1a0cd68c9f..5c9265578f8 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -26,7 +26,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 -/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(movement_dir = 0) return 1 /mob/living/simple_animal/hostile/poison/bees/New() diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index b98c42e2d7b..dd872f00853 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -32,7 +32,7 @@ faction = list("carp") flying = 1 -/mob/living/simple_animal/hostile/carp/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/carp/Process_Spacemove(movement_dir = 0) return 1 //No drifting in space for space carp! //original comments do not steal /mob/living/simple_animal/hostile/carp/AttackingTarget() diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index ec9e38e6190..c74afd3be1b 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -27,7 +27,7 @@ faction = list("faithless") -/mob/living/simple_animal/hostile/faithless/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/faithless/Process_Spacemove(movement_dir = 0) return 1 /mob/living/simple_animal/hostile/faithless/AttackingTarget() diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 1d3e90fb8e5..e28524867f2 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -92,7 +92,7 @@ stop_automated_movement = 0 walk(src,0) -/mob/living/simple_animal/hostile/poison/giant_spider/nurse/proc/GiveUp(var/C) +/mob/living/simple_animal/hostile/poison/giant_spider/nurse/proc/GiveUp(C) spawn(100) if(busy == MOVING_TO_TARGET) if(cocoon_target == C && get_dist(src,cocoon_target) > 1) diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index c8a84bd520e..1d46890166d 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -21,7 +21,7 @@ var/datum/mind/origin var/egg_lain = 0 -/mob/living/simple_animal/hostile/headcrab/proc/Infect(var/mob/living/carbon/human/victim) +/mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/human/victim) var/obj/item/body_egg/changeling_egg/egg = new(victim) if(origin) egg.owner = origin diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 26fe0a596c2..b70b4418d89 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -97,10 +97,10 @@ GiveTarget(Target) return Target //We now have a target -/mob/living/simple_animal/hostile/proc/Found(var/atom/A)//This is here as a potential override to pick a specific target if available +/mob/living/simple_animal/hostile/proc/Found(atom/A)//This is here as a potential override to pick a specific target if available return -/mob/living/simple_animal/hostile/proc/PickTarget(var/list/Targets)//Step 3, pick amongst the possible, attackable targets +/mob/living/simple_animal/hostile/proc/PickTarget(list/Targets)//Step 3, pick amongst the possible, attackable targets if(target != null)//If we already have a target, but are told to pick again, calculate the lowest distance between all possible, and pick from the lowest distance targets for(var/atom/A in Targets) var/target_dist = get_dist(src, target) @@ -112,7 +112,7 @@ var/chosen_target = pick(Targets)//Pick the remaining targets (if any) at random return chosen_target -/mob/living/simple_animal/hostile/CanAttack(var/atom/the_target)//Can we actually attack a possible target? +/mob/living/simple_animal/hostile/CanAttack(atom/the_target)//Can we actually attack a possible target? if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it return 0 if(search_objects < 2) @@ -146,7 +146,7 @@ return 1 return 0 -/mob/living/simple_animal/hostile/proc/GiveTarget(var/new_target)//Step 4, give us our selected target +/mob/living/simple_animal/hostile/proc/GiveTarget(new_target)//Step 4, give us our selected target target = new_target if(target != null) Aggro() @@ -184,10 +184,10 @@ return LoseTarget() -/mob/living/simple_animal/hostile/proc/Goto(var/target, var/delay, var/minimum_distance) +/mob/living/simple_animal/hostile/proc/Goto(target, delay, minimum_distance) walk_to(src, target, minimum_distance, delay) -/mob/living/simple_animal/hostile/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/adjustBruteLoss(damage) ..(damage) if(!client && !stat && search_objects < 3)//Not unconscious, and we don't ignore mobs if(search_objects)//Turn off item searching and ignore whatever item we were looking at, we're more concerned with fight or flight @@ -241,7 +241,7 @@ ..(gibbed) walk(src, 0) -/mob/living/simple_animal/hostile/proc/OpenFire(var/the_target) +/mob/living/simple_animal/hostile/proc/OpenFire(the_target) var/target = the_target visible_message("[src] [ranged_message] at [target]!") @@ -267,7 +267,7 @@ ranged_cooldown = ranged_cooldown_cap return -/mob/living/simple_animal/hostile/proc/Shoot(var/target, var/start, var/user, var/bullet = 0) +/mob/living/simple_animal/hostile/proc/Shoot(target, start, user, bullet = 0) if(target == start) return @@ -316,7 +316,7 @@ A.attack_animal(src) return 1 -/mob/living/simple_animal/hostile/RangedAttack(var/atom/A, var/params) //Player firing +/mob/living/simple_animal/hostile/RangedAttack(atom/A, params) //Player firing if(ranged && ranged_cooldown <= 0) target = A OpenFire(A) diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index aacc4469640..4c99fd62ca2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -87,7 +87,7 @@ visible_message("[src] starts to move!") attempt_open = 1 -/mob/living/simple_animal/hostile/mimic/crate/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/mimic/crate/adjustBruteLoss(damage) trigger() ..(damage) @@ -147,18 +147,18 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca . = ..() return . - creator -/mob/living/simple_animal/hostile/mimic/copy/proc/ChangeOwner(var/mob/owner) +/mob/living/simple_animal/hostile/mimic/copy/proc/ChangeOwner(mob/owner) if(owner != creator) LoseTarget() creator = owner faction |= "\ref[owner]" -/mob/living/simple_animal/hostile/mimic/copy/proc/CheckObject(var/obj/O) +/mob/living/simple_animal/hostile/mimic/copy/proc/CheckObject(obj/O) if((istype(O, /obj/item) || istype(O, /obj/structure)) && !is_type_in_list(O, protected_objects)) return 1 return 0 -/mob/living/simple_animal/hostile/mimic/copy/proc/CopyObject(var/obj/O, var/mob/living/creator, var/destroy_original = 0) +/mob/living/simple_animal/hostile/mimic/copy/proc/CopyObject(obj/O, mob/living/creator, destroy_original = 0) if(destroy_original || CheckObject(O)) @@ -216,7 +216,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca "My logic is undeniable.", "One of us.", "FLESH IS WEAK", "THIS ISN'T WAR, THIS IS EXTERMINATION!") speak_chance = 15 -/mob/living/simple_animal/hostile/mimic/copy/machine/CanAttack(var/atom/the_target) +/mob/living/simple_animal/hostile/mimic/copy/machine/CanAttack(atom/the_target) if(the_target == creator) // Don't attack our creator AI. return 0 if(isrobot(the_target)) @@ -249,7 +249,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca ..() -/mob/living/simple_animal/hostile/mimic/copy/ranged/CopyObject(var/obj/O, var/mob/living/creator, var/destroy_original = 0) +/mob/living/simple_animal/hostile/mimic/copy/ranged/CopyObject(obj/O, mob/living/creator, destroy_original = 0) if(destroy_original || CheckObject(O)) O.loc = src @@ -298,7 +298,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca return 1 return -/mob/living/simple_animal/hostile/mimic/copy/ranged/OpenFire(var/the_target) +/mob/living/simple_animal/hostile/mimic/copy/ranged/OpenFire(the_target) if(Zapgun) if(Zapgun.power_supply) //sanity var/obj/item/ammo_casing/energy/shot = Zapgun.ammo_type[Zapgun.select] diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 850f307f63b..fffffa30f30 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -23,7 +23,7 @@ ..() icon_state = icon_living -/mob/living/simple_animal/hostile/asteroid/bullet_act(var/obj/item/projectile/P)//Reduces damage from most projectiles to curb off-screen kills +/mob/living/simple_animal/hostile/asteroid/bullet_act(obj/item/projectile/P)//Reduces damage from most projectiles to curb off-screen kills if(!stat) Aggro() if(P.damage < 30 && P.damage_type != BRUTE) @@ -86,7 +86,7 @@ flag = "energy" temperature = 50 -/mob/living/simple_animal/hostile/asteroid/basilisk/GiveTarget(var/new_target) +/mob/living/simple_animal/hostile/asteroid/basilisk/GiveTarget(new_target) target = new_target if(target != null) Aggro() @@ -149,7 +149,7 @@ var/ore_eaten = 1 var/chase_time = 100 -/mob/living/simple_animal/hostile/asteroid/goldgrub/GiveTarget(var/new_target) +/mob/living/simple_animal/hostile/asteroid/goldgrub/GiveTarget(new_target) target = new_target if(target != null) if(istype(target, /obj/item/weapon/ore)) @@ -172,7 +172,7 @@ return ..() -/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/EatOre(var/atom/targeted_ore) +/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/EatOre(atom/targeted_ore) for(var/obj/item/weapon/ore/O in targeted_ore.loc) ore_eaten++ if(!(O.type in ore_types_eaten)) @@ -202,7 +202,7 @@ ore_eaten = 0 -/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(var/obj/item/projectile/P) +/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/item/projectile/P) visible_message("The [P.name] was repelled by [src.name]'s girth!") return @@ -211,7 +211,7 @@ Reward() ..(gibbed) -/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustBruteLoss(damage) idle_vision_range = 9 ..() @@ -247,7 +247,7 @@ minimum_distance = 3 pass_flags = PASSTABLE -/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(var/the_target) +/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(the_target) var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new /mob/living/simple_animal/hostile/asteroid/hivelordbrood(src.loc) A.GiveTarget(target) A.friends = friends @@ -274,7 +274,7 @@ inert = 1 desc = "The remains of a hivelord that have become useless, having been left alone too long after being harvested." -/obj/item/asteroid/hivelord_core/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/asteroid/hivelord_core/attack(mob/living/M, mob/living/user) if(ishuman(M)) var/mob/living/carbon/human/H = M if(inert) @@ -388,7 +388,7 @@ pre_attack = 0 return -/mob/living/simple_animal/hostile/asteroid/goliath/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/asteroid/goliath/adjustBruteLoss(damage) ranged_cooldown-- handle_preattack() ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 8b9eaecaecc..8f082395c4c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -59,14 +59,14 @@ health = maxHealth ..() -/mob/living/simple_animal/hostile/mushroom/adjustBruteLoss(var/damage)//Possibility to flee from a fight just to make it more visually interesting +/mob/living/simple_animal/hostile/mushroom/adjustBruteLoss(damage)//Possibility to flee from a fight just to make it more visually interesting if(!retreat_distance && prob(33)) retreat_distance = 5 spawn(30) retreat_distance = null ..() -/mob/living/simple_animal/hostile/mushroom/attack_animal(var/mob/living/L) +/mob/living/simple_animal/hostile/mushroom/attack_animal(mob/living/L) if(istype(L, /mob/living/simple_animal/hostile/mushroom) && stat == DEAD) var/mob/living/simple_animal/hostile/mushroom/M = L if(faint_ticker < 2) @@ -110,7 +110,7 @@ spawn(300) recovery_cooldown = 0 -/mob/living/simple_animal/hostile/mushroom/proc/LevelUp(var/level_gain) +/mob/living/simple_animal/hostile/mushroom/proc/LevelUp(level_gain) if(powerlevel <= 9) powerlevel += level_gain if(prob(25)) @@ -125,7 +125,7 @@ src.visible_message("The [src.name] was bruised!") bruised = 1 -/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params) +/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom)) if(stat == DEAD && !recovery_cooldown) Recover() @@ -137,7 +137,7 @@ Bruise() ..() -/mob/living/simple_animal/hostile/mushroom/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/simple_animal/hostile/mushroom/attack_hand(mob/living/carbon/human/M) ..() if(M.a_intent == "harm") Bruise() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm index 6c76a1520cd..5c4a4621da0 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/retaliate var/list/enemies = list() -/mob/living/simple_animal/hostile/retaliate/Found(var/atom/A) +/mob/living/simple_animal/hostile/retaliate/Found(atom/A) if(isliving(A)) var/mob/living/L = A if(!L.stat) @@ -51,7 +51,7 @@ H.enemies |= enemies return 0 -/mob/living/simple_animal/hostile/retaliate/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/retaliate/adjustBruteLoss(damage) ..(damage) if(stat == CONSCIOUS) Retaliate() diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index d61fbfa6706..9d5fc402615 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -62,7 +62,7 @@ if(creator) src.creator = creator -/mob/living/simple_animal/hostile/statue/Move(var/turf/NewLoc) +/mob/living/simple_animal/hostile/statue/Move(turf/NewLoc) if(can_be_seen(NewLoc)) if(client) src << "You cannot move, there are eyes on you!" @@ -96,7 +96,7 @@ if(!can_be_seen(get_turf(loc))) ..() -/mob/living/simple_animal/hostile/statue/proc/can_be_seen(var/turf/destination) +/mob/living/simple_animal/hostile/statue/proc/can_be_seen(turf/destination) if(!cannot_be_seen) return null // Check for darkness @@ -131,13 +131,13 @@ // Turn to dust when gibbed -/mob/living/simple_animal/hostile/statue/gib(var/animation = 0) +/mob/living/simple_animal/hostile/statue/gib(animation = 0) dust(animation) // Stop attacking clientless mobs -/mob/living/simple_animal/hostile/statue/CanAttack(var/atom/the_target) +/mob/living/simple_animal/hostile/statue/CanAttack(atom/the_target) if(isliving(the_target)) var/mob/living/L = the_target if(!L.client && !L.ckey) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index d01462502f6..38987cf6d27 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -51,7 +51,7 @@ attack_sound = 'sound/weapons/bladeslice.ogg' status_flags = 0 -/mob/living/simple_animal/hostile/syndicate/melee/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/hostile/syndicate/melee/attackby(obj/item/O, mob/user, params) if(O.force) if(prob(80)) var/damage = O.force @@ -67,7 +67,7 @@ visible_message("[user] gently taps [src] with [O].") -/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj) if(!Proj) return if(prob(65)) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) @@ -86,7 +86,7 @@ corpse = /obj/effect/landmark/mobcorpse/syndicatecommando speed = 1 -/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(movement_dir = 0) return /mob/living/simple_animal/hostile/syndicate/ranged @@ -111,7 +111,7 @@ corpse = /obj/effect/landmark/mobcorpse/syndicatecommando speed = 1 -/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(movement_dir = 0) return diff --git a/code/modules/mob/living/simple_animal/morph/morph.dm b/code/modules/mob/living/simple_animal/morph/morph.dm index fb17c943adf..af42538d056 100644 --- a/code/modules/mob/living/simple_animal/morph/morph.dm +++ b/code/modules/mob/living/simple_animal/morph/morph.dm @@ -35,20 +35,20 @@ /mob/living/simple_animal/hostile/morph/examine(mob/user) if(morphed) form.examine(user) // Refactor examine to return desc so it's static? Not sure if worth it - if(get_dist(user,src)<=3) + if(get_dist(user,src)<=3) user << "Looks odd!" else ..() return -/mob/living/simple_animal/hostile/morph/proc/allowed(var/atom/movable/A) // make it into property/proc ? not sure if worth it +/mob/living/simple_animal/hostile/morph/proc/allowed(atom/movable/A) // make it into property/proc ? not sure if worth it if(istype(A,/obj/screen)) return 0 if(istype(A,/obj/singularity)) return 0 return 1 -/mob/living/simple_animal/hostile/morph/ShiftClickOn(var/atom/movable/A) +/mob/living/simple_animal/hostile/morph/ShiftClickOn(atom/movable/A) if(morph_time <= world.time) if(A == src) restore() @@ -58,10 +58,10 @@ else ..() -/mob/living/simple_animal/hostile/morph/proc/assume(var/atom/movable/target) +/mob/living/simple_animal/hostile/morph/proc/assume(atom/movable/target) morphed = 1 form = target - + //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) No effect better than shit effect //Todo : update to .appearance once 508 hits @@ -89,9 +89,9 @@ return morphed = 0 form = null - - //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) - + + //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) + name = initial(name) icon = initial(icon) icon_state = initial(icon_state) @@ -171,7 +171,7 @@ /datum/round_event/morph var/key_of_morph -/datum/round_event/morph/proc/get_morph(var/end_if_fail = 0) +/datum/round_event/morph/proc/get_morph(end_if_fail = 0) key_of_morph = null if(!key_of_morph) var/list/candidates = get_candidates(BE_ALIEN) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 1f6e0713900..41c36669023 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -261,7 +261,7 @@ * Attack responces */ //Humans, monkeys, aliens -/mob/living/simple_animal/parrot/attack_hand(mob/living/carbon/M as mob) +/mob/living/simple_animal/parrot/attack_hand(mob/living/carbon/M) ..() if(client) return @@ -282,14 +282,14 @@ drop_held_item(0) return -/mob/living/simple_animal/parrot/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/simple_animal/parrot/attack_paw(mob/living/carbon/monkey/M) attack_hand(M) -/mob/living/simple_animal/parrot/attack_alien(mob/living/carbon/alien/M as mob) +/mob/living/simple_animal/parrot/attack_alien(mob/living/carbon/alien/M) attack_hand(M) //Simple animals -/mob/living/simple_animal/parrot/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/simple_animal/parrot/attack_animal(mob/living/simple_animal/M) ..() //goodbye immortal parrots if(client) @@ -304,7 +304,7 @@ icon_state = "parrot_fly" //Mobs with objects -/mob/living/simple_animal/parrot/attackby(var/obj/item/O as obj, var/mob/living/user as mob, params) +/mob/living/simple_animal/parrot/attackby(obj/item/O, mob/living/user, params) if(!stat && !client && !istype(O, /obj/item/stack/medical) && !istype(O,/obj/item/weapon/reagent_containers/food/snacks/cracker)) if(O.force) if(parrot_state == PARROT_PERCH) @@ -328,7 +328,7 @@ return //Bullets -/mob/living/simple_animal/parrot/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/parrot/bullet_act(obj/item/projectile/Proj) ..() if(!stat && !client) if(parrot_state == PARROT_PERCH) @@ -729,7 +729,7 @@ return -/mob/living/simple_animal/parrot/proc/drop_held_item(var/drop_gently = 1) +/mob/living/simple_animal/parrot/proc/drop_held_item(drop_gently = 1) set name = "Drop held item" set category = "Parrot" set desc = "Drop the item you're holding." diff --git a/code/modules/mob/living/simple_animal/revenant/revenant.dm b/code/modules/mob/living/simple_animal/revenant/revenant.dm index dc1137e62d5..cb99c234248 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant.dm @@ -54,7 +54,7 @@ /mob/living/simple_animal/revenant/ex_act(severity, target) return 1 //Immune to the effects of explosions. -/mob/living/simple_animal/revenant/ClickOn(var/atom/A, var/params) //Copypaste from ghost code - revenants can't interact with the world directly. +/mob/living/simple_animal/revenant/ClickOn(atom/A, params) //Copypaste from ghost code - revenants can't interact with the world directly. if(client.buildmode) build_click(src, client.buildmode, params, A) return @@ -158,7 +158,7 @@ -/mob/living/simple_animal/revenant/proc/castcheck(var/essence_cost) +/mob/living/simple_animal/revenant/proc/castcheck(essence_cost) var/mob/living/simple_animal/revenant/user = usr if(!istype(user) || !user) return @@ -176,7 +176,7 @@ -/mob/living/simple_animal/revenant/proc/change_essence_amount(var/essence_amt, var/silent = 0, var/source = null) +/mob/living/simple_animal/revenant/proc/change_essence_amount(essence_amt, silent = 0, source = null) var/mob/living/simple_animal/revenant/user = usr if(!istype(usr) || !usr) return @@ -193,7 +193,7 @@ -/mob/living/simple_animal/revenant/proc/reveal(var/time, var/stun) +/mob/living/simple_animal/revenant/proc/reveal(time, stun) var/mob/living/simple_animal/revenant/R = usr if(!istype(usr) || !usr) return diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm index 01f527f2e07..b4f47647871 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm @@ -10,7 +10,7 @@ var/draining var/list/drained_mobs = list() //Cannot harvest the same mob twice -/obj/effect/proc_holder/spell/targeted/revenant_harvest/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr) +/obj/effect/proc_holder/spell/targeted/revenant_harvest/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(!user.castcheck(0)) charge_counter = charge_max return @@ -82,7 +82,7 @@ include_user = 1 var/locked = 1 -/obj/effect/proc_holder/spell/targeted/revenant_transmit/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr) +/obj/effect/proc_holder/spell/targeted/revenant_transmit/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(!user.castcheck(-5)) charge_counter = charge_max return @@ -114,7 +114,7 @@ range = 1 var/locked = 1 -/obj/effect/proc_holder/spell/aoe_turf/revenant_light/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr) +/obj/effect/proc_holder/spell/aoe_turf/revenant_light/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(!user.castcheck(-25)) charge_counter = charge_max return @@ -152,7 +152,7 @@ range = 1 var/locked = 1 -/obj/effect/proc_holder/spell/aoe_turf/revenantDefile/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr) +/obj/effect/proc_holder/spell/aoe_turf/revenantDefile/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(!user.castcheck(-30)) charge_counter = charge_max return diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm index 3d3e7910656..25516b51619 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm @@ -12,7 +12,7 @@ var/key_of_revenant -/datum/round_event/revenant/proc/get_revenant(var/end_if_fail = 0) +/datum/round_event/revenant/proc/get_revenant(end_if_fail = 0) var/deadMobs = 0 for(var/mob/M in dead_mob_list) deadMobs++ diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 2589c79d5c9..cb43847c32c 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -36,7 +36,7 @@ return -/mob/living/simple_animal/shade/attackby(var/obj/item/O as obj, var/mob/user as mob, params) //Marker -Agouri +/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user, params) //Marker -Agouri if(istype(O, /obj/item/device/soulstone)) var/obj/item/device/soulstone/SS = O SS.transfer_soul("SHADE", src, user) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index f20d4c04b8b..dedb7bb3f99 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -214,7 +214,7 @@ else if(bodytemperature > maxbodytemp) adjustBruteLoss(3) -/mob/living/simple_animal/gib(var/animation = 0) +/mob/living/simple_animal/gib(animation = 0) if(icon_gib) flick(icon_gib, src) if(butcher_results) @@ -236,7 +236,7 @@ return "[emote], \"[input]\"" return ..() -/mob/living/simple_animal/emote(var/act, var/m_type=1, var/message = null) +/mob/living/simple_animal/emote(act, m_type=1, message = null) if(stat) return if(act == "scream") @@ -244,26 +244,26 @@ act = "me" ..(act, m_type, message) -/mob/living/simple_animal/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/simple_animal/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) attack_threshold_check(damage) return 1 -/mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/bullet_act(obj/item/projectile/Proj) if(!Proj) return apply_damage(Proj.damage, Proj.damage_type) Proj.on_hit(src, 0) return 0 -/mob/living/simple_animal/adjustFireLoss(var/amount) +/mob/living/simple_animal/adjustFireLoss(amount) adjustBruteLoss(amount) -/mob/living/simple_animal/adjustStaminaLoss(var/amount) +/mob/living/simple_animal/adjustStaminaLoss(amount) return -/mob/living/simple_animal/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/simple_animal/attack_hand(mob/living/carbon/human/M) switch(M.a_intent) if("help") @@ -283,7 +283,7 @@ updatehealth() return 1 -/mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M) if(..()) //successful monkey bite. if(stat != DEAD) var/damage = rand(1, 3) @@ -296,7 +296,7 @@ return -/mob/living/simple_animal/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/simple_animal/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. if(M.a_intent == "disarm") playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) @@ -312,7 +312,7 @@ add_logs(M, src, "attacked") return 1 -/mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L) if(..()) //successful larva bite var/damage = rand(5, 10) if(stat != DEAD) @@ -320,7 +320,7 @@ attack_threshold_check(damage) return 1 -/mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack var/damage = rand(15, 25) if(M.is_adult) @@ -328,7 +328,7 @@ attack_threshold_check(damage) return 1 -/mob/living/simple_animal/proc/attack_threshold_check(var/damage) +/mob/living/simple_animal/proc/attack_threshold_check(damage) if(damage <= force_threshold) visible_message("[src] looks unharmed.") else @@ -336,7 +336,7 @@ updatehealth() -/mob/living/simple_animal/attackby(var/obj/item/O as obj, var/mob/living/user as mob, params) //Marker -Agouri +/mob/living/simple_animal/attackby(obj/item/O, mob/living/user, params) //Marker -Agouri if(O.flags & NOBLUDGEON) return @@ -412,7 +412,7 @@ adjustBruteLoss(30) updatehealth() -/mob/living/simple_animal/proc/CanAttack(var/atom/the_target) +/mob/living/simple_animal/proc/CanAttack(atom/the_target) if(see_invisible < the_target.invisibility) return 0 if (isliving(the_target)) diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm index 61f19d51552..cff95221196 100644 --- a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm +++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm @@ -51,7 +51,7 @@ ////////////////////The Powers -/mob/living/simple_animal/slaughter/proc/phaseout(var/obj/effect/decal/cleanable/B) +/mob/living/simple_animal/slaughter/proc/phaseout(obj/effect/decal/cleanable/B) var/turf/mobloc = get_turf(src.loc) var/turf/bloodloc = get_turf(B.loc) if(Adjacent(bloodloc)) @@ -93,7 +93,7 @@ src.eating = FALSE src.notransform = 0 -/mob/living/simple_animal/slaughter/proc/phasein(var/obj/effect/decal/cleanable/B) +/mob/living/simple_animal/slaughter/proc/phasein(obj/effect/decal/cleanable/B) if(src.eating) src << "Finish eating first!" else @@ -104,7 +104,7 @@ playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1) qdel(src.holder) -/obj/effect/decal/cleanable/blood/CtrlClick(var/mob/user) +/obj/effect/decal/cleanable/blood/CtrlClick(mob/user) ..() if(istype(user, /mob/living/simple_animal/slaughter)) var/mob/living/simple_animal/slaughter/S = user @@ -114,7 +114,7 @@ S.phaseout(src) -/obj/effect/decal/cleanable/trail_holder/CtrlClick(var/mob/user) +/obj/effect/decal/cleanable/trail_holder/CtrlClick(mob/user) ..() if(istype(user, /mob/living/simple_animal/slaughter)) var/mob/living/simple_animal/slaughter/S = user @@ -147,7 +147,7 @@ anchored = 1 invisibility = 60 -obj/effect/dummy/slaughter/relaymove(var/mob/user, direction) +obj/effect/dummy/slaughter/relaymove(mob/user, direction) if (!src.canmove || !direction) return var/turf/newLoc = get_step(src,direction) loc = newLoc diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm index 3db4b52bcfd..8e836a74250 100644 --- a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm +++ b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm @@ -12,7 +12,7 @@ var/key_of_slaughter -/datum/round_event/slaughter/proc/get_slaughter(var/end_if_fail = 0) +/datum/round_event/slaughter/proc/get_slaughter(end_if_fail = 0) key_of_slaughter = null if(!key_of_slaughter) var/list/candidates = get_candidates(BE_ALIEN) diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm index 7f8127d3bcf..85a298336a0 100644 --- a/code/modules/mob/living/simple_animal/slime/emote.dm +++ b/code/modules/mob/living/simple_animal/slime/emote.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/slime/emote(var/act) +/mob/living/simple_animal/slime/emote(act) if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 88b876e102e..5531fcd6a85 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -177,7 +177,7 @@ else Evolve() -/mob/living/simple_animal/slime/proc/add_nutrition(var/nutrition_to_add = 0, var/lastnut = 0) +/mob/living/simple_animal/slime/proc/add_nutrition(nutrition_to_add = 0, lastnut = 0) nutrition = min((nutrition + nutrition_to_add), get_max_nutrition()) if(nutrition >= (lastnut + 50)) if(prob(80)) @@ -492,7 +492,7 @@ if(is_adult) return 300 else return 200 -/mob/living/simple_animal/slime/proc/will_hunt(var/hunger = -1) // Check for being stopped from feeding and chasing +/mob/living/simple_animal/slime/proc/will_hunt(hunger = -1) // Check for being stopped from feeding and chasing if (docile) return 0 if (hunger == 2 || rabid || attacked) return 1 if (Leader) return 0 diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm index a2da3fb63d6..d41d71cbbea 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -16,7 +16,7 @@ Feedon(M) return 1 -/mob/living/simple_animal/slime/proc/CanFeedon(var/mob/living/M) +/mob/living/simple_animal/slime/proc/CanFeedon(mob/living/M) if(!Adjacent(M)) return 0 @@ -46,7 +46,7 @@ return 0 return 1 -/mob/living/simple_animal/slime/proc/Feedon(var/mob/living/M) +/mob/living/simple_animal/slime/proc/Feedon(mob/living/M) src << "I have latched onto the subject and begun feeding..." M << "The [name] has latched onto [M.name]!" @@ -138,7 +138,7 @@ Victim << "[src] has let go of your head!" Victim = null -/mob/living/simple_animal/slime/proc/UpdateFeed(var/mob/M) +/mob/living/simple_animal/slime/proc/UpdateFeed(mob/M) if(Victim) if(Victim == M) loc = M.loc // simple "attach to head" effect! diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index d638788ed1d..75da09b542c 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -141,7 +141,7 @@ spawn(45) Atkcool = 0 -/mob/living/simple_animal/slime/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/slime/Process_Spacemove(movement_dir = 0) return 2 /mob/living/simple_animal/slime/Stat() @@ -161,7 +161,7 @@ ..(-abs(amount)) // Heals them return -/mob/living/simple_animal/slime/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/slime/bullet_act(obj/item/projectile/Proj) if(!Proj) return attacked += 10 @@ -176,23 +176,23 @@ powerlevel = 0 // oh no, the power! ..() -/mob/living/simple_animal/slime/MouseDrop(var/atom/movable/A as mob|obj) +/mob/living/simple_animal/slime/MouseDrop(atom/movable/A as mob|obj) if(isliving(A) && A != src) var/mob/living/Food = A if(CanFeedon(Food)) Feedon(Food) ..() -/mob/living/simple_animal/slime/unEquip(obj/item/W as obj) +/mob/living/simple_animal/slime/unEquip(obj/item/W) return -/mob/living/simple_animal/slime/start_pulling(var/atom/movable/AM) +/mob/living/simple_animal/slime/start_pulling(atom/movable/AM) return /mob/living/simple_animal/slime/attack_ui(slot) return -/mob/living/simple_animal/slime/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/simple_animal/slime/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack if(M == src) return @@ -208,16 +208,16 @@ M.adjustBruteLoss(-10 + (-10 * M.is_adult)) M.updatehealth() -/mob/living/simple_animal/slime/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/simple_animal/slime/attack_animal(mob/living/simple_animal/M) if(..()) attacked += 10 -/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/monkey/M) if(..()) //successful monkey bite. attacked += 10 -/mob/living/simple_animal/slime/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/simple_animal/slime/attack_larva(mob/living/carbon/alien/larva/L) if(..()) //successful larva bite. attacked += 10 @@ -227,7 +227,7 @@ discipline_slime(user) -/mob/living/simple_animal/slime/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/simple_animal/slime/attack_hand(mob/living/carbon/human/M) if(Victim) if(Victim == M) if(prob(60)) @@ -260,7 +260,7 @@ if(..()) //successful attack attacked += 10 -/mob/living/simple_animal/slime/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/simple_animal/slime/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. attacked += 10 discipline_slime(M) diff --git a/code/modules/mob/living/simple_animal/slime/subtypes.dm b/code/modules/mob/living/simple_animal/slime/subtypes.dm index 55a6eee734d..a2df855d0b7 100644 --- a/code/modules/mob/living/simple_animal/slime/subtypes.dm +++ b/code/modules/mob/living/simple_animal/slime/subtypes.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/slime/proc/mutation_table(var/colour) +/mob/living/simple_animal/slime/proc/mutation_table(colour) var/list/slime_mutation[4] switch(colour) //Tier 1 diff --git a/code/modules/mob/living/simple_animal/worm.dm b/code/modules/mob/living/simple_animal/worm.dm index 333deb7eb59..273d14d2c90 100644 --- a/code/modules/mob/living/simple_animal/worm.dm +++ b/code/modules/mob/living/simple_animal/worm.dm @@ -133,7 +133,7 @@ return - proc/AttemptToEat(var/atom/target) + proc/AttemptToEat(atom/target) if(istype(target,/turf/simulated/wall)) if((!istype(target,/turf/simulated/wall/r_wall) && eatingDuration >= 100) || eatingDuration >= 200) //need 20 ticks to eat an rwall, 10 for a regular one var/turf/simulated/wall/wall = target @@ -148,7 +148,7 @@ return 0 - proc/Attach(var/mob/living/simple_animal/space_worm/attachement) + proc/Attach(mob/living/simple_animal/space_worm/attachement) if(!attachement) return diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index 5df785e016c..2623c66ff2a 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -3,7 +3,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, //VENTCRAWLING -/mob/living/proc/handle_ventcrawl(var/atom/A) +/mob/living/proc/handle_ventcrawl(atom/A) if(!ventcrawler || !Adjacent(A)) return if(stat) @@ -89,10 +89,10 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, //OOP -/atom/proc/update_pipe_vision(var/atom/new_loc = null) +/atom/proc/update_pipe_vision(atom/new_loc = null) return -/mob/living/update_pipe_vision(var/atom/new_loc = null) +/mob/living/update_pipe_vision(atom/new_loc = null) . = loc if(new_loc) . = new_loc diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 7e1b151a408..6e9e8ccd996 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -10,7 +10,7 @@ ghostize() ..() -/mob/proc/sac_act(var/obj/effect/rune/R, var/mob/victim as mob) +/mob/proc/sac_act(obj/effect/rune/R, mob/victim) return var/next_mob_id = 0 @@ -81,7 +81,7 @@ var/next_mob_id = 0 // self_message (optional) is what the src mob sees e.g. "You do something!" // blind_message (optional) is what blind people will hear e.g. "You hear something!" -/mob/visible_message(var/message, var/self_message, var/blind_message) +/mob/visible_message(message, self_message, blind_message) var/list/mob_viewers = list() var/list/possible_viewers = list() mob_viewers |= src @@ -120,7 +120,7 @@ var/next_mob_id = 0 // message is output to anyone who can see, e.g. "The [src] does something!" // blind_message (optional) is what blind people will hear e.g. "You hear something!" -/atom/proc/visible_message(var/message, var/blind_message) +/atom/proc/visible_message(message, blind_message) var/list/mob_viewers = list() var/list/possible_viewers = list() mob_viewers |= viewers(src) @@ -155,7 +155,7 @@ var/next_mob_id = 0 // deaf_message (optional) is what deaf people will see. // hearing_distance (optional) is the range, how many tiles away the message can be heard. -/mob/audible_message(var/message, var/deaf_message, var/hearing_distance, var/self_message) +/mob/audible_message(message, deaf_message, hearing_distance, self_message) var/range = 7 if(hearing_distance) range = hearing_distance @@ -171,7 +171,7 @@ var/next_mob_id = 0 // deaf_message (optional) is what deaf people will see. // hearing_distance (optional) is the range, how many tiles away the message can be heard. -/atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance) +/atom/proc/audible_message(message, deaf_message, hearing_distance) var/range = 7 if(hearing_distance) range = hearing_distance @@ -192,7 +192,7 @@ var/next_mob_id = 0 return r_hand return null -/mob/proc/ret_grab(obj/effect/list_container/mobl/L as obj, flag) +/mob/proc/ret_grab(obj/effect/list_container/mobl/L, flag) if ((!( istype(l_hand, /obj/item/weapon/grab) ) && !( istype(r_hand, /obj/item/weapon/grab) ))) if (!( L )) return null @@ -248,7 +248,7 @@ var/next_mob_id = 0 return 0 -/mob/proc/put_in_any_hand_if_possible(obj/item/W as obj, qdel_on_fail = 0, disable_warning = 1, redraw_mob = 1) +/mob/proc/put_in_any_hand_if_possible(obj/item/W, qdel_on_fail = 0, disable_warning = 1, redraw_mob = 1) if(equip_to_slot_if_possible(W, slot_l_hand, qdel_on_fail, disable_warning, redraw_mob)) return 1 else if(equip_to_slot_if_possible(W, slot_r_hand, qdel_on_fail, disable_warning, redraw_mob)) @@ -259,7 +259,7 @@ var/next_mob_id = 0 //set qdel_on_fail to have it delete W if it fails to equip //set disable_warning to disable the 'you are unable to equip that' warning. //unset redraw_mob to prevent the mob from being redrawn at the end. -/mob/proc/equip_to_slot_if_possible(obj/item/W as obj, slot, qdel_on_fail = 0, disable_warning = 0, redraw_mob = 1) +/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = 0, disable_warning = 0, redraw_mob = 1) if(!istype(W)) return 0 if(!W.mob_can_equip(src, slot, disable_warning)) if(qdel_on_fail) @@ -273,11 +273,11 @@ var/next_mob_id = 0 //This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on whether you can or can't eqip need to be done before! Use mob_can_equip() for that task. //In most cases you will want to use equip_to_slot_if_possible() -/mob/proc/equip_to_slot(obj/item/W as obj, slot) +/mob/proc/equip_to_slot(obj/item/W, slot) return //This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to equip people when the rounds tarts and when events happen and such. -/mob/proc/equip_to_slot_or_del(obj/item/W as obj, slot) +/mob/proc/equip_to_slot_or_del(obj/item/W, slot) equip_to_slot_if_possible(W, slot, 1, 1, 0) //The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot. @@ -375,7 +375,7 @@ var/list/slot_equipment_priority = list( \ return 1 //this and stop_pulling really ought to be /mob/living procs -/mob/proc/start_pulling(var/atom/movable/AM) +/mob/proc/start_pulling(atom/movable/AM) if ( !AM || !src || src==AM || !isturf(src.loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort! return if (!( AM.anchored )) @@ -743,7 +743,7 @@ var/list/slot_equipment_priority = list( \ add_stings_to_statpanel(mind.changeling.purchasedpowers) add_spells_to_statpanel(mob_spell_list) -/mob/proc/add_spells_to_statpanel(var/list/spells) +/mob/proc/add_spells_to_statpanel(list/spells) for(var/obj/effect/proc_holder/spell/S in spells) if(S.can_be_cast_by(src)) switch(S.charge_type) @@ -754,7 +754,7 @@ var/list/slot_equipment_priority = list( \ if("holdervar") statpanel("[S.panel]","[S.holder_var_type] [S.holder_var_amount]",S) -/mob/proc/add_stings_to_statpanel(var/list/stings) +/mob/proc/add_stings_to_statpanel(list/stings) for(var/obj/effect/proc_holder/changeling/S in stings) if(S.chemical_cost >=0 && S.can_be_used_by(src)) statpanel("[S.panel]",((S.chemical_cost > 0) ? "[S.chemical_cost]" : ""),S) @@ -800,7 +800,7 @@ var/list/slot_equipment_priority = list( \ return canmove -/mob/proc/fall(var/forced) +/mob/proc/fall(forced) drop_l_hand() drop_r_hand() @@ -842,7 +842,7 @@ var/list/slot_equipment_priority = list( \ /mob/proc/swap_hand() return -/mob/proc/activate_hand(var/selhand) +/mob/proc/activate_hand(selhand) return /mob/proc/Jitter(amount) @@ -869,7 +869,7 @@ var/list/slot_equipment_priority = list( \ update_canmove() return -/mob/proc/Weaken(amount, var/ignore_canweaken = 0) +/mob/proc/Weaken(amount, ignore_canweaken = 0) if(status_flags & CANWEAKEN || ignore_canweaken) weakened = max(max(weakened,amount),0) update_canmove() //updates lying, canmove and icons @@ -952,7 +952,7 @@ var/list/slot_equipment_priority = list( \ /mob/proc/setEarDamage() return -/mob/proc/AddSpell(var/obj/effect/proc_holder/spell/spell) +/mob/proc/AddSpell(obj/effect/proc_holder/spell/spell) mob_spell_list += spell if(!spell.action) spell.action = new/datum/action/spell_action diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 3c1906ee7dc..62fb5c75178 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -448,14 +448,14 @@ It's fairly easy to fix if dealing with single letters but not so much with comp return 1 return 0 -/mob/proc/has_mutation(var/mutation) +/mob/proc/has_mutation(mutation) return mutation in src.mutations ? 1 : 0 /proc/get_both_hands(mob/living/carbon/M) var/list/hands = list(M.l_hand, M.r_hand) return hands -/mob/proc/reagent_check(var/datum/reagent/R) // utilized in the species code +/mob/proc/reagent_check(datum/reagent/R) // utilized in the species code return 1 /proc/notify_ghosts(var/message, var/ghost_sound = null) //Easy notification of ghosts. @@ -465,7 +465,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp if(ghost_sound) O << sound(ghost_sound) -/proc/item_heal_robotic(var/mob/living/carbon/human/H, var/mob/user, var/brute, var/burn) +/proc/item_heal_robotic(mob/living/carbon/human/H, mob/user, brute, burn) var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) var/dam //changes repair text based on how much brute/burn was supplied diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index f80afc9d4f8..c5f8a272d8b 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -318,7 +318,7 @@ ///Called by /client/Move() ///For moving in space ///Return 1 for movement 0 for none -/mob/Process_Spacemove(var/movement_dir = 0) +/mob/Process_Spacemove(movement_dir = 0) if(..()) return 1 @@ -363,7 +363,7 @@ /mob/proc/mob_negates_gravity() return 0 -/mob/proc/Move_Pulled(var/atom/A) +/mob/proc/Move_Pulled(atom/A) if (!canmove || restrained() || !pulling) return if (pulling.anchored) @@ -385,7 +385,7 @@ step(pulling, get_dir(pulling.loc, A)) return -/mob/proc/slip(var/s_amount, var/w_amount, var/obj/O, var/lube) +/mob/proc/slip(s_amount, w_amount, obj/O, lube) return /mob/proc/update_gravity() diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index e0b8ca39e86..3b9b6021b15 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -2,7 +2,7 @@ //This proc is the most basic of the procs. All it does is make a new mob on the same tile and transfer over a few variables. //Returns the new mob //Note that this proc does NOT do MMI related stuff! -/mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num) +/mob/proc/change_mob_type(new_type = null, turf/location = null, new_name = null as text, delete_old_mob = 0 as num) if(istype(src,/mob/new_player)) usr << "cannot convert players who have not entered yet." diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index 77477bf3e52..f58f6af7f31 100644 --- a/code/modules/mob/new_player/poll.dm +++ b/code/modules/mob/new_player/poll.dm @@ -35,7 +35,7 @@ -/mob/new_player/proc/poll_player(var/pollid = -1) +/mob/new_player/proc/poll_player(pollid = -1) if(pollid == -1) return establish_db_connection() if(dbcon.IsConnected()) @@ -292,7 +292,7 @@ src << browse(output,"window=playerpoll;size=500x250") return -/mob/new_player/proc/vote_on_poll(var/pollid = -1, var/optionid = -1, var/multichoice = 0) +/mob/new_player/proc/vote_on_poll(pollid = -1, optionid = -1, multichoice = 0) if(pollid == -1 || optionid == -1) return @@ -362,7 +362,7 @@ usr << browse(null,"window=playerpoll") -/mob/new_player/proc/log_text_poll_reply(var/pollid = -1, var/replytext = "") +/mob/new_player/proc/log_text_poll_reply(pollid = -1, replytext = "") if(pollid == -1 || replytext == "") return @@ -420,7 +420,7 @@ usr << browse(null,"window=playerpoll") -/mob/new_player/proc/vote_on_numval_poll(var/pollid = -1, var/optionid = -1, var/rating = null) +/mob/new_player/proc/vote_on_numval_poll(pollid = -1, optionid = -1, rating = null) if(pollid == -1 || optionid == -1) return diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 96f631e6d71..45fe320ce0c 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -290,7 +290,7 @@ //human -> robot -/mob/living/carbon/human/proc/Robotize(var/delete_items = 0) +/mob/living/carbon/human/proc/Robotize(delete_items = 0) if (notransform) return for(var/obj/item/W in src) @@ -497,7 +497,7 @@ * This proc is here to force coders to manually place their mob in this list, hopefully tested. * This also gives a place to explain -why- players shouldnt be turn into certain mobs and hopefully someone can fix them. */ -/mob/proc/safe_animal(var/MP) +/mob/proc/safe_animal(MP) //Bad mobs! - Remember to add a comment explaining what's wrong with the mob if(!MP) diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm index 265629ec4df..52a2fb9d3e3 100644 --- a/code/modules/nano/nanoexternal.dm +++ b/code/modules/nano/nanoexternal.dm @@ -36,7 +36,7 @@ * * @return nothing */ -/atom/movable/proc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/atom/movable/proc/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) return /atom/movable/proc/get_ui_data(mob/user) diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm index 5f47c8da5ca..dbe242e8c08 100644 --- a/code/modules/nano/nanomanager.dm +++ b/code/modules/nano/nanomanager.dm @@ -9,7 +9,7 @@ * * @return /nanoui Returns the new or found ui */ -/datum/subsystem/nano/proc/push_open_or_new_ui(var/mob/user, var/atom/movable/src_object, ui_key, var/datum/nanoui/ui, template, title, width, height, auto_update) +/datum/subsystem/nano/proc/push_open_or_new_ui(mob/user, atom/movable/src_object, ui_key, datum/nanoui/ui, template, title, width, height, auto_update) var/list/data = src_object.get_ui_data(user) if (!data) data = list() @@ -33,7 +33,7 @@ * * @return /nanoui Returns the found ui, for null if none exists */ -/datum/subsystem/nano/proc/try_update_ui(var/mob/user, src_object, ui_key, var/datum/nanoui/ui, data) +/datum/subsystem/nano/proc/try_update_ui(mob/user, src_object, ui_key, datum/nanoui/ui, data) if (isnull(ui)) // no ui has been passed, so we'll search for one ui = get_open_ui(user, src_object, ui_key) @@ -53,7 +53,7 @@ * * @return /nanoui Returns the found ui, or null if none exists */ -/datum/subsystem/nano/proc/get_open_ui(var/mob/user, src_object, ui_key) +/datum/subsystem/nano/proc/get_open_ui(mob/user, src_object, ui_key) var/src_object_key = "\ref[src_object]" if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) return null @@ -95,7 +95,7 @@ * * @return int The number of uis updated */ -/datum/subsystem/nano/proc/update_user_uis(var/mob/user, src_object = null, ui_key = null) +/datum/subsystem/nano/proc/update_user_uis(mob/user, src_object = null, ui_key = null) if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0) return 0 // has no open uis @@ -116,7 +116,7 @@ * * @return int The number of uis closed */ -/datum/subsystem/nano/proc/close_user_uis(var/mob/user, src_object = null, ui_key = null) +/datum/subsystem/nano/proc/close_user_uis(mob/user, src_object = null, ui_key = null) if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0) return 0 // has no open uis @@ -136,7 +136,7 @@ * * @return nothing */ -/datum/subsystem/nano/proc/ui_opened(var/datum/nanoui/ui) +/datum/subsystem/nano/proc/ui_opened(datum/nanoui/ui) var/src_object_key = "\ref[ui.src_object]" if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) open_uis[src_object_key] = list(ui.ui_key = list()) @@ -156,7 +156,7 @@ * * @return int 0 if no ui was removed, 1 if removed successfully */ -/datum/subsystem/nano/proc/ui_closed(var/datum/nanoui/ui) +/datum/subsystem/nano/proc/ui_closed(datum/nanoui/ui) var/src_object_key = "\ref[ui.src_object]" if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) return 0 // wasn't open @@ -179,7 +179,7 @@ */ // -/datum/subsystem/nano/proc/user_logout(var/mob/user) +/datum/subsystem/nano/proc/user_logout(mob/user) return close_user_uis(user) /** @@ -191,7 +191,7 @@ * * @return nothing */ -/datum/subsystem/nano/proc/user_transferred(var/mob/oldMob, var/mob/newMob) +/datum/subsystem/nano/proc/user_transferred(mob/oldMob, mob/newMob) if (isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0) return 0 // has no open uis diff --git a/code/modules/ninja/admin_ninja_verbs.dm b/code/modules/ninja/admin_ninja_verbs.dm index 59baa2c48e9..ddbbca1379e 100644 --- a/code/modules/ninja/admin_ninja_verbs.dm +++ b/code/modules/ninja/admin_ninja_verbs.dm @@ -8,7 +8,7 @@ Contents: //ADMIN CREATE NINJA (From Player) -/client/proc/cmd_admin_ninjafy(var/mob/living/carbon/human/H in player_list) +/client/proc/cmd_admin_ninjafy(mob/living/carbon/human/H in player_list) set category = null set name = "Make Space Ninja" diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 14a871ddf22..62609ee1bc9 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -35,7 +35,7 @@ ..() -/obj/item/weapon/katana/energy/proc/returnToOwner(var/mob/living/carbon/human/user, var/doSpark = 1, var/caught = 0) +/obj/item/weapon/katana/energy/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0) if(!istype(user)) return loc = get_turf(src) diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm index 13d52efec9a..51b18f4c43a 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -37,7 +37,7 @@ var/maxdrain = 400 -/obj/item/clothing/gloves/space_ninja/Touch(var/atom/A,var/proximity) +/obj/item/clothing/gloves/space_ninja/Touch(atom/A,proximity) if(!candrain || draining) return 0 if(!istype(loc, /mob/living/carbon/human)) diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm index 9b2fb90596d..053931b171e 100644 --- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm +++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm @@ -35,7 +35,7 @@ It is possible to destroy the net by the occupant or someone else. -/obj/effect/energy_net/process(var/mob/living/carbon/M as mob) +/obj/effect/energy_net/process(mob/living/carbon/M) var/check = 30//30 seconds before teleportation. Could be extended I guess. var/mob_name = affecting.name//Since they will report as null if terminated before teleport. //The person can still try and attack the net when inside. @@ -95,7 +95,7 @@ It is possible to destroy the net by the occupant or someone else. -/obj/effect/energy_net/bullet_act(var/obj/item/projectile/Proj) +/obj/effect/energy_net/bullet_act(obj/item/projectile/Proj) health -= Proj.damage healthcheck() ..() @@ -151,7 +151,7 @@ It is possible to destroy the net by the occupant or someone else. -/obj/effect/energy_net/attack_alien(mob/living/user as mob) +/obj/effect/energy_net/attack_alien(mob/living/user) user.do_attack_animation(src) if (islarva(user)) return @@ -168,7 +168,7 @@ It is possible to destroy the net by the occupant or someone else. -/obj/effect/energy_net/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/effect/energy_net/attackby(obj/item/weapon/W, mob/user, params) var/aforce = W.force health = max(0, health - aforce) healthcheck() diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index bea7284744c..11d97b7a7c4 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -18,7 +18,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //APC// -/obj/machinery/power/apc/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/machinery/power/apc/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -61,7 +61,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //SMES// -/obj/machinery/power/smes/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/machinery/power/smes/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -96,7 +96,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //CELL// -/obj/item/weapon/stock_parts/cell/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/item/weapon/stock_parts/cell/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -115,7 +115,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //RDCONSOLE// -/obj/machinery/computer/rdconsole/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/machinery/computer/rdconsole/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -146,7 +146,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //RD SERVER// //Shamelessly copypasted from above, since these two used to be the same proc, but with MANY colon operators -/obj/machinery/r_n_d/server/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/machinery/r_n_d/server/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -176,7 +176,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //WIRE// -/obj/structure/cable/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/structure/cable/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -212,7 +212,7 @@ They *could* go in their appropriate files, but this is supposed to be modular S.spark_system.start() //MECH// -/obj/mecha/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/mecha/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -239,7 +239,7 @@ They *could* go in their appropriate files, but this is supposed to be modular break //BORG// -/mob/living/silicon/robot/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/mob/living/silicon/robot/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -268,7 +268,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //CARBON MOBS// -/mob/living/carbon/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/mob/living/carbon/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index a1273f10498..810e9058165 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -108,7 +108,7 @@ Contents: //This proc prevents the suit from being taken off. -/obj/item/clothing/suit/space/space_ninja/proc/lock_suit(mob/living/carbon/human/H, var/checkIcons = 0) +/obj/item/clothing/suit/space/space_ninja/proc/lock_suit(mob/living/carbon/human/H, checkIcons = 0) if(!istype(H)) return 0 if(checkIcons) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index bd947c4b7a3..09a345c0b3c 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -52,7 +52,7 @@ else user << "You turn off [src]." -/obj/item/weapon/hand_labeler/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/hand_labeler/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/hand_labeler_refill)) if(!user.unEquip(I)) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index dc20fd83997..6e0f9b5e979 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -44,7 +44,7 @@ colour = "white" -/obj/item/weapon/pen/attack(mob/living/M, mob/user,var/stealth) +/obj/item/weapon/pen/attack(mob/living/M, mob/user,stealth) if(!istype(M)) return diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 8e9e3135496..770673d47bb 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -79,7 +79,7 @@ name = "photo[(n_name ? text("- '[n_name]'") : null)]" add_fingerprint(usr) -/obj/item/weapon/photo/proc/photocreate(var/inicon, var/inimg, var/indesc, var/inblueprints) +/obj/item/weapon/photo/proc/photocreate(inicon, inimg, indesc, inblueprints) icon = inicon img = inimg desc = indesc @@ -299,7 +299,7 @@ var/list/fields = list() -/obj/item/device/camera/proc/injectaialbum(var/icon, var/img, var/desc, var/pixel_x, var/pixel_y, var/blueprintsinject) //stores image information to a list similar to that of the datacore +/obj/item/device/camera/proc/injectaialbum(icon, img, desc, pixel_x, pixel_y, blueprintsinject) //stores image information to a list similar to that of the datacore var/numberer = 1 for(var/datum/picture in src.aipictures) numberer++ @@ -315,7 +315,7 @@ aipictures += P usr << "Image recorded" //feedback to the AI player that the picture was taken -/obj/item/device/camera/proc/injectmasteralbum(var/icon, var/img, var/desc, var/pixel_x, var/pixel_y, var/blueprintsinject) //stores image information to a list similar to that of the datacore +/obj/item/device/camera/proc/injectmasteralbum(icon, img, desc, pixel_x, pixel_y, blueprintsinject) //stores image information to a list similar to that of the datacore var/numberer = 1 var/mob/living/silicon/robot/C = src.loc if(C.connected_ai) @@ -335,7 +335,7 @@ else injectaialbum(icon, img, desc, pixel_x, pixel_y, blueprintsinject) -/obj/item/device/camera/siliconcam/proc/selectpicture(var/obj/item/device/camera/siliconcam/targetloc) +/obj/item/device/camera/siliconcam/proc/selectpicture(obj/item/device/camera/siliconcam/targetloc) var/list/nametemp = list() var/find if(targetloc.aipictures.len == 0) @@ -348,7 +348,7 @@ if(q.fields["name"] == find) return q -/obj/item/device/camera/siliconcam/proc/viewpichelper(var/obj/item/device/camera/siliconcam/targetloc) +/obj/item/device/camera/siliconcam/proc/viewpichelper(obj/item/device/camera/siliconcam/targetloc) var/obj/item/weapon/photo/P = new/obj/item/weapon/photo() var/datum/picture/selection = selectpicture(targetloc) if(selection) diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 09b77e13dc5..3fb4af902ad 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -72,7 +72,7 @@ // Syndicate stamp to forge documents. -/obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob) +/obj/item/weapon/stamp/chameleon/attack_self(mob/user) var/list/stamp_types = typesof(/obj/item/weapon/stamp) - src.type // Get all stamp types except our own var/list/stamps = list() diff --git a/code/modules/power/antimatter/containment_jar.dm b/code/modules/power/antimatter/containment_jar.dm index 4dbb76755b4..ff2d0043c42 100644 --- a/code/modules/power/antimatter/containment_jar.dm +++ b/code/modules/power/antimatter/containment_jar.dm @@ -33,7 +33,7 @@ //check_stability() return -/obj/item/weapon/am_containment/proc/usefuel(var/wanted) +/obj/item/weapon/am_containment/proc/usefuel(wanted) if(fuel < wanted) wanted = fuel fuel -= wanted diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index e8270dafd52..41be20dc92f 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -118,7 +118,7 @@ return -/obj/machinery/power/am_control_unit/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/power/am_control_unit/bullet_act(obj/item/projectile/Proj) if(Proj.flag != "bullet") stability -= Proj.force return 0 @@ -180,13 +180,13 @@ return -/obj/machinery/power/am_control_unit/attack_hand(mob/user as mob) +/obj/machinery/power/am_control_unit/attack_hand(mob/user) if(anchored) interact(user) return -/obj/machinery/power/am_control_unit/proc/add_shielding(var/obj/machinery/am_shielding/AMS, var/AMS_linking = 0) +/obj/machinery/power/am_control_unit/proc/add_shielding(obj/machinery/am_shielding/AMS, AMS_linking = 0) if(!istype(AMS)) return 0 if(!anchored) return 0 if(!AMS_linking && !AMS.link_control(src)) return 0 @@ -195,7 +195,7 @@ return 1 -/obj/machinery/power/am_control_unit/proc/remove_shielding(var/obj/machinery/am_shielding/AMS) +/obj/machinery/power/am_control_unit/proc/remove_shielding(obj/machinery/am_shielding/AMS) if(!istype(AMS)) return 0 linked_shielding.Remove(AMS) update_shield_icons = 2 diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index bcd24faebe1..1631f501fa7 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -33,7 +33,7 @@ return -/obj/machinery/am_shielding/proc/controllerscan(var/priorscan = 0) +/obj/machinery/am_shielding/proc/controllerscan(priorscan = 0) //Make sure we are the only one here if(!istype(src.loc, /turf)) qdel(src) @@ -106,7 +106,7 @@ return -/obj/machinery/am_shielding/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/am_shielding/bullet_act(obj/item/projectile/Proj) if(Proj.flag != "bullet") stability -= Proj.force/2 return 0 @@ -136,7 +136,7 @@ //Call this to link a detected shilding unit to the controller -/obj/machinery/am_shielding/proc/link_control(var/obj/machinery/power/am_control_unit/AMC) +/obj/machinery/am_shielding/proc/link_control(obj/machinery/power/am_control_unit/AMC) if(!istype(AMC)) return 0 if(control_unit && control_unit != AMC) return 0//Already have one control_unit = AMC @@ -171,7 +171,7 @@ return -/obj/machinery/am_shielding/proc/check_stability(var/injecting_fuel = 0) +/obj/machinery/am_shielding/proc/check_stability(injecting_fuel = 0) if(stability > 0) return if(injecting_fuel && control_unit) control_unit.exploding = 1 @@ -180,7 +180,7 @@ return -/obj/machinery/am_shielding/proc/recalc_efficiency(var/new_efficiency)//tbh still not 100% sure how I want to deal with efficiency so this is likely temp +/obj/machinery/am_shielding/proc/recalc_efficiency(new_efficiency)//tbh still not 100% sure how I want to deal with efficiency so this is likely temp if(!control_unit || !processing) return if(stability < 50) new_efficiency /= 2 @@ -203,7 +203,7 @@ throw_range = 2 materials = list(MAT_METAL=100) -/obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/device/am_shielding_container/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/multitool) && istype(src.loc,/turf)) new/obj/machinery/am_shielding(src.loc) qdel(src) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 329346fa41b..cc411f25092 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -575,7 +575,7 @@ return src.attack_hand(user) ..() -/obj/machinery/power/apc/emag_act(mob/user as mob) +/obj/machinery/power/apc/emag_act(mob/user) if(!emagged && !malfhack) if(opened) user << "You must close the cover to swipe an ID card!" @@ -664,7 +664,7 @@ return 0 // 0 = User is not a Malf AI -/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(!user) return @@ -737,11 +737,11 @@ // world << "[area.power_equip]" area.power_change() -/obj/machinery/power/apc/proc/isWireCut(var/wireIndex) +/obj/machinery/power/apc/proc/isWireCut(wireIndex) return wires.IsIndexCut(wireIndex) -/obj/machinery/power/apc/proc/can_use(mob/user as mob, var/loud = 0) //used by attack_hand() and Topic() +/obj/machinery/power/apc/proc/can_use(mob/user, loud = 0) //used by attack_hand() and Topic() if (user.stat) user << "You must be conscious to use [src]!" return 0 @@ -874,7 +874,7 @@ src.update() update_icon() -/obj/machinery/power/apc/proc/malfoccupy(var/mob/living/silicon/ai/malf) +/obj/machinery/power/apc/proc/malfoccupy(mob/living/silicon/ai/malf) if(!istype(malf)) return if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC @@ -905,7 +905,7 @@ point.the_disk = src //the pinpointer will detect the shunted AI -/obj/machinery/power/apc/proc/malfvacate(var/forced) +/obj/machinery/power/apc/proc/malfvacate(forced) if(!src.occupier) return if(src.occupier.parent && src.occupier.parent.stat != 2) @@ -958,7 +958,7 @@ else return 0 -/obj/machinery/power/apc/add_load(var/amount) +/obj/machinery/power/apc/add_load(amount) if(terminal && terminal.powernet) terminal.powernet.load += amount @@ -1128,7 +1128,7 @@ // val 0=off, 1=off(auto) 2=on 3=on(auto) // on 0=off, 1=on, 2=autooff -/obj/machinery/power/apc/proc/autoset(var/val, var/on) +/obj/machinery/power/apc/proc/autoset(val, on) if(on==0) if(val==2) // if on, return off return 0 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 8b2e9f5ae2e..4e380448a3f 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -102,7 +102,7 @@ By design, d1 is the smallest direction and d2 is the highest /////////////////////////////////// //If underfloor, hide the cable -/obj/structure/cable/hide(var/i) +/obj/structure/cable/hide(i) if(level == 1 && istype(loc, /turf)) invisibility = i ? 101 : 0 @@ -162,7 +162,7 @@ By design, d1 is the smallest direction and d2 is the highest src.add_fingerprint(user) // shock the user with probability prb -/obj/structure/cable/proc/shock(mob/user, prb, var/siemens_coeff = 1.0) +/obj/structure/cable/proc/shock(mob/user, prb, siemens_coeff = 1.0) if(!prob(prb)) return 0 if (electrocute_mob(user, powernet, src, siemens_coeff)) @@ -189,7 +189,7 @@ By design, d1 is the smallest direction and d2 is the highest if(current_size >= STAGE_FIVE) Deconstruct() -/obj/structure/cable/proc/cableColor(var/colorC = "red") +/obj/structure/cable/proc/cableColor(colorC = "red") cable_color = colorC switch(colorC) if("red") @@ -218,11 +218,11 @@ By design, d1 is the smallest direction and d2 is the highest // Power related /////////////////////////////////////////// -/obj/structure/cable/proc/add_avail(var/amount) +/obj/structure/cable/proc/add_avail(amount) if(powernet) powernet.newavail += amount -/obj/structure/cable/proc/add_load(var/amount) +/obj/structure/cable/proc/add_load(amount) if(powernet) powernet.load += amount @@ -244,7 +244,7 @@ By design, d1 is the smallest direction and d2 is the highest //handles merging diagonally matching cables //for info : direction^3 is flipping horizontally, direction^12 is flipping vertically -/obj/structure/cable/proc/mergeDiagonalsNetworks(var/direction) +/obj/structure/cable/proc/mergeDiagonalsNetworks(direction) //search for and merge diagonally matching cables from the first direction component (north/south) var/turf/T = get_step(src, direction&3)//go north/south @@ -288,7 +288,7 @@ By design, d1 is the smallest direction and d2 is the highest C.powernet.add_cable(src) //else, we simply connect to the matching cable powernet // merge with the powernets of power objects in the given direction -/obj/structure/cable/proc/mergeConnectedNetworks(var/direction) +/obj/structure/cable/proc/mergeConnectedNetworks(direction) var/fdir = (!direction)? 0 : turn(direction, 180) //flip the direction, to match with the source position on its turf @@ -362,7 +362,7 @@ By design, d1 is the smallest direction and d2 is the highest ////////////////////////////////////////////// //if powernetless_only = 1, will only get connections without powernet -/obj/structure/cable/proc/get_connections(var/powernetless_only = 0) +/obj/structure/cable/proc/get_connections(powernetless_only = 0) . = list() // this will be a list of all connected power objects var/turf/T @@ -565,13 +565,13 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \ src.use(amt) return -/obj/item/stack/cable_coil/use(var/used) +/obj/item/stack/cable_coil/use(used) . = ..() update_icon() return //add cables to the stack -/obj/item/stack/cable_coil/proc/give(var/extra) +/obj/item/stack/cable_coil/proc/give(extra) if(amount + extra > MAXCOIL) amount = MAXCOIL else @@ -584,7 +584,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \ // Cable laying procedures ////////////////////////////////////////////// -/obj/item/stack/cable_coil/proc/get_new_cable(var/location) +/obj/item/stack/cable_coil/proc/get_new_cable(location) var/path = "/obj/structure/cable" + (item_color == "red" ? "" : "/" + item_color) return new path (location) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 63ac0410ec1..b99735503ee 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -36,7 +36,7 @@ return 100.0*charge/maxcharge // use power from a cell -/obj/item/weapon/stock_parts/cell/proc/use(var/amount) +/obj/item/weapon/stock_parts/cell/proc/use(amount) if(rigged && amount > 0) explode() return 0 @@ -47,7 +47,7 @@ return 1 // recharge the cell -/obj/item/weapon/stock_parts/cell/proc/give(var/amount) +/obj/item/weapon/stock_parts/cell/proc/give(amount) if(rigged && amount > 0) explode() return 0 diff --git a/code/modules/power/engine.dm b/code/modules/power/engine.dm index b7ce6e6a6a0..fc5c68aa577 100644 --- a/code/modules/power/engine.dm +++ b/code/modules/power/engine.dm @@ -1,7 +1,7 @@ -/turf/simulated/floor/engine/attack_paw(var/mob/user as mob) +/turf/simulated/floor/engine/attack_paw(mob/user) return src.attack_hand(user) -/turf/simulated/floor/engine/attack_hand(var/mob/user as mob) +/turf/simulated/floor/engine/attack_hand(mob/user) user.Move_Pulled(src) /turf/simulated/floor/engine/ex_act(severity, target) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 6b73a53aa86..3dfc11b895b 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -126,7 +126,7 @@ return interact(user) -/obj/machinery/power/generator/proc/get_menu(var/include_link = 1) +/obj/machinery/power/generator/proc/get_menu(include_link = 1) var/t = "" if(!powernet) t += "Unable to connect to the power network!" diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 7196abe57e8..5c63a5cc097 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -63,13 +63,13 @@ var/const/GRAV_NEEDS_WRENCH = 3 /obj/machinery/gravity_generator/part var/obj/machinery/gravity_generator/main/main_part = null -/obj/machinery/gravity_generator/part/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/gravity_generator/part/attackby(obj/item/I, mob/user, params) return main_part.attackby(I, user) /obj/machinery/gravity_generator/part/get_status() return main_part.get_status() -/obj/machinery/gravity_generator/part/attack_hand(mob/user as mob) +/obj/machinery/gravity_generator/part/attack_hand(mob/user) return main_part.attack_hand(user) /obj/machinery/gravity_generator/part/set_broken() @@ -171,7 +171,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 // Interaction // Fixing the gravity generator. -/obj/machinery/gravity_generator/main/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/gravity_generator/main/attackby(obj/item/I, mob/user, params) var/old_broken_state = broken_state switch(broken_state) if(GRAV_NEEDS_SCREWDRIVER) @@ -208,11 +208,11 @@ var/const/GRAV_NEEDS_WRENCH = 3 if(old_broken_state != broken_state) update_icon() -/obj/machinery/gravity_generator/main/attack_hand(mob/user as mob) +/obj/machinery/gravity_generator/main/attack_hand(mob/user) if(!..()) return interact(user) -/obj/machinery/gravity_generator/main/interact(mob/user as mob) +/obj/machinery/gravity_generator/main/interact(mob/user) if(stat & BROKEN) return var/dat = "Gravity Generator Breaker: " @@ -277,7 +277,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 update_icon() // Set the state of the gravity. -/obj/machinery/gravity_generator/main/proc/set_state(var/new_state) +/obj/machinery/gravity_generator/main/proc/set_state(new_state) charging_state = POWER_IDLE on = new_state use_power = on ? 2 : 1 diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index e891aceb82c..145f2b2ba84 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -21,7 +21,7 @@ var/obj/machinery/light/newlight = null var/sheets_refunded = 2 -/obj/item/light_fixture_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/light_fixture_frame/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded ) qdel(src) @@ -94,7 +94,7 @@ if(3) user << "The casing is closed." -/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/light_construct/attackby(obj/item/weapon/W, mob/user, params) src.add_fingerprint(user) if (istype(W, /obj/item/weapon/wrench)) if (src.stage == 1) @@ -273,7 +273,7 @@ return // update the icon_state and luminosity of the light depending on its state -/obj/machinery/light/proc/update(var/trigger = 1) +/obj/machinery/light/proc/update(trigger = 1) update_icon() if(on) @@ -307,7 +307,7 @@ // attempt to set the light's on/off status // will not switch on if broken/burned/empty -/obj/machinery/light/proc/seton(var/s) +/obj/machinery/light/proc/seton(s) on = (s && status == LIGHT_OK) update() @@ -550,7 +550,7 @@ // break the light and make sparks if was on -/obj/machinery/light/proc/broken(var/skip_sound_and_sparks = 0) +/obj/machinery/light/proc/broken(skip_sound_and_sparks = 0) if(status == LIGHT_EMPTY) return @@ -677,7 +677,7 @@ // attack bulb/tube with object // if a syringe, can inject plasma to make it explode -/obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/weapon/light/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/weapon/reagent_containers/syringe)) var/obj/item/weapon/reagent_containers/syringe/S = I diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 28a024aa07e..37a75156cc8 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -78,7 +78,7 @@ display round(lastgen) and plasmatank amount icon_state = initial(icon_state) handleInactive() -/obj/machinery/power/port_gen/attack_hand(mob/user as mob) +/obj/machinery/power/port_gen/attack_hand(mob/user) if(..()) return if(!anchored) @@ -194,7 +194,7 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/pacman/proc/overheat() explosion(src.loc, 2, 5, 2, -1) -/obj/machinery/power/port_gen/pacman/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/power/port_gen/pacman/attackby(obj/item/O, mob/user, params) if(istype(O, sheet_path)) var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.amount) @@ -234,22 +234,22 @@ display round(lastgen) and plasmatank amount else if(istype(O, /obj/item/weapon/crowbar) && panel_open) default_deconstruction_crowbar(O) -/obj/machinery/power/port_gen/pacman/emag_act(mob/user as mob) +/obj/machinery/power/port_gen/pacman/emag_act(mob/user) if(!emagged) emagged = 1 emp_act(1) -/obj/machinery/power/port_gen/pacman/attack_hand(mob/user as mob) +/obj/machinery/power/port_gen/pacman/attack_hand(mob/user) ..() if (!anchored) return interact(user) -/obj/machinery/power/port_gen/pacman/attack_ai(mob/user as mob) +/obj/machinery/power/port_gen/pacman/attack_ai(mob/user) interact(user) -/obj/machinery/power/port_gen/pacman/attack_paw(mob/user as mob) +/obj/machinery/power/port_gen/pacman/attack_paw(mob/user) interact(user) /obj/machinery/power/port_gen/pacman/interact(mob/user) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index d6f19601413..1fbca84583c 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -24,11 +24,11 @@ ////////////////////////////// // common helper procs for all power machines -/obj/machinery/power/proc/add_avail(var/amount) +/obj/machinery/power/proc/add_avail(amount) if(powernet) powernet.newavail += amount -/obj/machinery/power/proc/add_load(var/amount) +/obj/machinery/power/proc/add_load(amount) if(powernet) powernet.load += amount @@ -65,7 +65,7 @@ return A.master.powered(chan) // return power status of the area // increment the power usage stats for an area -/obj/machinery/proc/use_power(var/amount, var/chan = -1) // defaults to power_channel +/obj/machinery/proc/use_power(amount, chan = -1) // defaults to power_channel var/area/A = get_area(src) // make sure it's in an area if(!A || !isarea(A) || !A.master) return @@ -192,7 +192,7 @@ // returns a list of all power-related objects (nodes, cable, junctions) in turf, // excluding source, that match the direction d // if unmarked==1, only return those with no powernet -/proc/power_list(var/turf/T, var/source, var/d, var/unmarked=0, var/cable_only = 0) +/proc/power_list(turf/T, source, d, unmarked=0, cable_only = 0) . = list() //var/fdir = (!d)? 0 : turn(d, 180) // the opposite direction to d (or 0 if d==0) @@ -219,7 +219,7 @@ //remove the old powernet and replace it with a new one throughout the network. -/proc/propagate_network(var/obj/O, var/datum/powernet/PN) +/proc/propagate_network(obj/O, datum/powernet/PN) //world.log << "propagating new network" var/list/worklist = list() var/list/found_machines = list() @@ -252,7 +252,7 @@ //Merge two powernets, the bigger (in cable length term) absorbing the other -/proc/merge_powernets(var/datum/powernet/net1, var/datum/powernet/net2) +/proc/merge_powernets(datum/powernet/net1, datum/powernet/net2) if(!net1 || !net2) //if one of the powernet doesn't exist, return return @@ -280,7 +280,7 @@ //power_source is a source of electricity, can be powercell, area, apc, cable, powernet or null //source is an object caused electrocuting (airlock, grille, etc) //No animations will be performed by this proc. -/proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0) +/proc/electrocute_mob(mob/living/carbon/M, power_source, obj/source, siemens_coeff = 1.0) if(istype(M.loc,/obj/mecha)) return 0 //feckin mechs are dumb if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index 3e8dfaf2309..0ad877f987d 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -33,7 +33,7 @@ //remove a cable from the current powernet //if the powernet is then empty, delete it //Warning : this proc DON'T check if the cable exists -/datum/powernet/proc/remove_cable(var/obj/structure/cable/C) +/datum/powernet/proc/remove_cable(obj/structure/cable/C) cables -= C C.powernet = null if(is_empty())//the powernet is now empty... @@ -41,7 +41,7 @@ //add a cable to the current powernet //Warning : this proc DON'T check if the cable exists -/datum/powernet/proc/add_cable(var/obj/structure/cable/C) +/datum/powernet/proc/add_cable(obj/structure/cable/C) if(C.powernet)// if C already has a powernet... if(C.powernet == src) return @@ -53,7 +53,7 @@ //remove a power machine from the current powernet //if the powernet is then empty, delete it //Warning : this proc DON'T check if the machine exists -/datum/powernet/proc/remove_machine(var/obj/machinery/power/M) +/datum/powernet/proc/remove_machine(obj/machinery/power/M) nodes -=M M.powernet = null if(is_empty())//the powernet is now empty... @@ -62,7 +62,7 @@ //add a power machine to the current powernet //Warning : this proc DON'T check if the machine exists -/datum/powernet/proc/add_machine(var/obj/machinery/power/M) +/datum/powernet/proc/add_machine(obj/machinery/power/M) if(M.powernet)// if M already has a powernet... if(M.powernet == src) return diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 82c2955ad09..3687d237bd2 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -35,7 +35,7 @@ var/global/list/rad_collectors = list() return -/obj/machinery/power/rad_collector/attack_hand(mob/user as mob) +/obj/machinery/power/rad_collector/attack_hand(mob/user) if(..()) return if(anchored) @@ -127,7 +127,7 @@ var/global/list/rad_collectors = list() else update_icons() -/obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength) +/obj/machinery/power/rad_collector/proc/receive_pulse(pulse_strength) if(P && active) var/power_produced = 0 power_produced = P.air_contents.toxins*pulse_strength*20 diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index ad420ffc5e6..fb0a69a9be2 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -21,7 +21,7 @@ FG2.cleanup() ..() -/obj/machinery/field/containment/attack_hand(mob/user as mob) +/obj/machinery/field/containment/attack_hand(mob/user) if(get_dist(src, user) > 1) return 0 else @@ -37,22 +37,22 @@ return 0 -/obj/machinery/field/containment/Crossed(mob/mover as mob) +/obj/machinery/field/containment/Crossed(mob/mover) if(isliving(mover)) shock(mover) -/obj/machinery/field/containment/Crossed(obj/mover as obj) +/obj/machinery/field/containment/Crossed(obj/mover) if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha)) bump(mover) -/obj/machinery/field/containment/proc/set_master(var/master1,var/master2) +/obj/machinery/field/containment/proc/set_master(master1,master2) if(!master1 || !master2) return 0 FG1 = master1 FG2 = master2 return 1 -/obj/machinery/field/containment/shock(mob/living/user as mob) +/obj/machinery/field/containment/shock(mob/living/user) if(!FG1 || !FG2) qdel(src) return 0 @@ -67,13 +67,13 @@ /obj/machinery/field var/hasShocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second. -/obj/machinery/field/CanPass(mob/mover as mob, turf/target, height=0) +/obj/machinery/field/CanPass(mob/mover, turf/target, height=0) if(isliving(mover)) // Don't let mobs through shock(mover) return 0 return ..() -/obj/machinery/field/CanPass(obj/mover as obj, turf/target, height=0) +/obj/machinery/field/CanPass(obj/mover, turf/target, height=0) if((istype(mover, /obj/machinery) && !istype(mover, /obj/singularity)) || \ istype(mover, /obj/structure) || \ istype(mover, /obj/mecha)) @@ -81,7 +81,7 @@ return 0 return ..() -/obj/machinery/field/proc/shock(mob/living/user as mob) +/obj/machinery/field/proc/shock(mob/living/user) if(hasShocked) return 0 if(isliving(user)) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index cfffc52cdd7..23e6468096f 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -79,7 +79,7 @@ icon_state = "emitter" -/obj/machinery/power/emitter/attack_hand(mob/user as mob) +/obj/machinery/power/emitter/attack_hand(mob/user) src.add_fingerprint(user) if(state == 2) if(!powernet) @@ -106,7 +106,7 @@ return 1 -/obj/machinery/power/emitter/emp_act(var/severity)//Emitters are hardened but still might have issues +/obj/machinery/power/emitter/emp_act(severity)//Emitters are hardened but still might have issues // add_load(1000) /* if((severity == 1)&&prob(1)&&prob(1)) if(src.active) @@ -260,7 +260,7 @@ ..() return -/obj/machinery/power/emitter/emag_act(mob/user as mob) +/obj/machinery/power/emitter/emag_act(mob/user) if(!emagged) locked = 0 emagged = 1 diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 07943676729..9c9f3c0f948 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -75,7 +75,7 @@ field_generator power level display return -/obj/machinery/field/generator/attack_hand(mob/user as mob) +/obj/machinery/field/generator/attack_hand(mob/user) if(state == 2) if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on if(src.active >= 1) @@ -162,7 +162,7 @@ field_generator power level display else ..() -/obj/machinery/field/generator/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/field/generator/bullet_act(obj/item/projectile/Proj) if(Proj.flag != "bullet") power += Proj.damage update_icon() @@ -218,7 +218,7 @@ field_generator power level display return 0 //This could likely be better, it tends to start loopin if you have a complex generator loop setup. Still works well enough to run the engine fields will likely recode the field gens and fields sometime -Mport -/obj/machinery/field/generator/proc/draw_power(var/draw = 0, var/failsafe = 0, var/obj/machinery/field/generator/G = null, var/obj/machinery/field/generator/last = null) +/obj/machinery/field/generator/proc/draw_power(draw = 0, failsafe = 0, obj/machinery/field/generator/G = null, obj/machinery/field/generator/last = null) if(Varpower) return 1 if((G && G == src) || (failsafe >= 8))//Loopin, set fail @@ -263,7 +263,7 @@ field_generator power level display src.active = 2 -/obj/machinery/field/generator/proc/setup_field(var/NSEW) +/obj/machinery/field/generator/proc/setup_field(NSEW) var/turf/T = src.loc var/obj/machinery/field/generator/G var/steps = 0 @@ -352,7 +352,7 @@ field_generator power level display investigate_log("has failed whilst a singulo exists.","singulo") O.last_warning = world.time -/obj/machinery/field/generator/shock(mob/living/user as mob) +/obj/machinery/field/generator/shock(mob/living/user) if(fields.len) ..() diff --git a/code/modules/power/singularity/investigate.dm b/code/modules/power/singularity/investigate.dm index e601e210680..8d375e06f90 100644 --- a/code/modules/power/singularity/investigate.dm +++ b/code/modules/power/singularity/investigate.dm @@ -1,4 +1,4 @@ -/area/engine/engineering/poweralert(var/state, var/source) +/area/engine/engineering/poweralert(state, source) if (state != poweralm) investigate_log("has a power alarm!","singulo") ..() \ No newline at end of file diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 607be1ba324..bbfa406ad58 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -62,7 +62,7 @@ godsmack(A) return -/obj/singularity/narsie/proc/godsmack(var/atom/A) +/obj/singularity/narsie/proc/godsmack(atom/A) if(istype(A,/obj/)) var/obj/O = A O.ex_act(1.0) @@ -81,7 +81,7 @@ M.apply_effect(3, STUN) -/obj/singularity/narsie/consume(var/atom/A) +/obj/singularity/narsie/consume(atom/A) A.narsie_act() @@ -123,7 +123,7 @@ return -/obj/singularity/narsie/proc/acquire(var/mob/food) +/obj/singularity/narsie/proc/acquire(mob/food) target << "NAR-SIE HAS LOST INTEREST IN YOU" target = food if(ishuman(target)) diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index e7e3632b93e..a9ff8952161 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -55,13 +55,13 @@ -/obj/effect/accelerated_particle/proc/toxmob(var/mob/living/M) +/obj/effect/accelerated_particle/proc/toxmob(mob/living/M) M.irradiate(energy*6) M.updatehealth() return -/obj/effect/accelerated_particle/proc/move(var/lag) +/obj/effect/accelerated_particle/proc/move(lag) if(loc == null) return if(!step(src,dir)) diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 9c21da66e97..18a04d16f32 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -168,7 +168,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return 0 -/obj/structure/particle_accelerator/proc/report_ready(var/obj/O) +/obj/structure/particle_accelerator/proc/report_ready(obj/O) if(O && (O == master)) if(construction_state >= 3) return 1 @@ -181,7 +181,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return 0 -/obj/structure/particle_accelerator/proc/connect_master(var/obj/O) +/obj/structure/particle_accelerator/proc/connect_master(obj/O) if(O && istype(O,/obj/machinery/particle_accelerator/control_box)) if(O.dir == src.dir) master = O @@ -189,7 +189,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return 0 -/obj/structure/particle_accelerator/proc/process_tool_hit(var/obj/O, var/mob/user) +/obj/structure/particle_accelerator/proc/process_tool_hit(obj/O, mob/user) if(!(O) || !(user)) return 0 if(!ismob(user) || !isobj(O)) @@ -325,7 +325,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return 0 -/obj/machinery/particle_accelerator/proc/process_tool_hit(var/obj/O, var/mob/user) +/obj/machinery/particle_accelerator/proc/process_tool_hit(obj/O, mob/user) if(!(O) || !(user)) return 0 if(!ismob(user) || !isobj(O)) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index c5fe52da089..61fd8dbe424 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -31,7 +31,7 @@ toggle_power() ..() -/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user as mob) +/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user) if(construction_state >= 3) interact(user) else if(construction_state == 2) // Wires exposed @@ -113,7 +113,7 @@ part.strength = strength part.update_icon() -/obj/machinery/particle_accelerator/control_box/proc/add_strength(var/s) +/obj/machinery/particle_accelerator/control_box/proc/add_strength(s) if(assembled) strength++ if(strength > strength_upper_limit) @@ -124,7 +124,7 @@ investigate_log("increased to [strength] by [key_name(usr)]","singulo") strength_change() -/obj/machinery/particle_accelerator/control_box/proc/remove_strength(var/s) +/obj/machinery/particle_accelerator/control_box/proc/remove_strength(s) if(assembled) strength-- if(strength < 0) @@ -196,7 +196,7 @@ return 0 -/obj/machinery/particle_accelerator/control_box/proc/check_part(var/turf/T, var/type) +/obj/machinery/particle_accelerator/control_box/proc/check_part(turf/T, type) if(!(T)||!(type)) return 0 var/obj/structure/particle_accelerator/PA = locate(/obj/structure/particle_accelerator) in T diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm index 8e260a1115d..caaae583787 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm @@ -24,14 +24,14 @@ ..() return -/obj/structure/particle_accelerator/particle_emitter/proc/set_delay(var/delay) +/obj/structure/particle_accelerator/particle_emitter/proc/set_delay(delay) if(delay && delay >= 0) src.fire_delay = delay return 1 return 0 -/obj/structure/particle_accelerator/particle_emitter/proc/emit_particle(var/strength = 0) +/obj/structure/particle_accelerator/particle_emitter/proc/emit_particle(strength = 0) if((src.last_shot + src.fire_delay) <= world.time) src.last_shot = world.time var/obj/effect/accelerated_particle/A = null diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 90c60fc5769..43eaa1a7235 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -53,7 +53,7 @@ return 0 -/obj/singularity/attack_hand(mob/user as mob) +/obj/singularity/attack_hand(mob/user) consume(user) return 1 @@ -126,7 +126,7 @@ dissipate_track++ -/obj/singularity/proc/expand(var/force_size = 0) +/obj/singularity/proc/expand(force_size = 0) var/temp_allowed_size = src.allowed_size if(force_size) temp_allowed_size = force_size @@ -243,7 +243,7 @@ return -/obj/singularity/proc/consume(var/atom/A) +/obj/singularity/proc/consume(atom/A) var/gain = A.singularity_act(current_size) src.energy += gain if(istype(A, /obj/machinery/power/supermatter_shard) && !consumedSupermatter) @@ -254,7 +254,7 @@ return -/obj/singularity/proc/move(var/force_move = 0) +/obj/singularity/proc/move(force_move = 0) if(!move_self) return 0 @@ -269,7 +269,7 @@ step(src, movement_dir) -/obj/singularity/proc/check_turfs_in(var/direction = 0, var/step = 0) +/obj/singularity/proc/check_turfs_in(direction = 0, step = 0) if(!direction) return 0 var/steps = 0 @@ -322,7 +322,7 @@ return 1 -/obj/singularity/proc/can_move(var/turf/T) +/obj/singularity/proc/can_move(turf/T) if(!T) return 0 if((locate(/obj/machinery/field/containment) in T)||(locate(/obj/machinery/shieldwall) in T)) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 04f15cbdfec..3bc6dbcfc36 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -172,7 +172,7 @@ // create a terminal object pointing towards the SMES // wires will attach to this -/obj/machinery/power/smes/proc/make_terminal(var/turf/T) +/obj/machinery/power/smes/proc/make_terminal(turf/T) terminal = new/obj/machinery/power/terminal(T) terminal.dir = get_dir(T,src) terminal.master = src @@ -306,7 +306,7 @@ return -/obj/machinery/power/smes/add_load(var/amount) +/obj/machinery/power/smes/add_load(amount) if(terminal && terminal.powernet) terminal.powernet.load += amount @@ -322,7 +322,7 @@ ui_interact(user) -/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(!user) return @@ -412,7 +412,7 @@ output_level = Clamp(output_level, 0, output_level_max) log_smes(usr.ckey) -/obj/machinery/power/smes/proc/log_smes(var/user = "") +/obj/machinery/power/smes/proc/log_smes(user = "") investigate_log("input/output; [input_level>output_level?"":""][input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [user]","singulo") diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index f85d5dcc655..480fb8380b2 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -30,7 +30,7 @@ ..() //set the control of the panel to a given computer if closer than SOLAR_MAX_DIST -/obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC) +/obj/machinery/power/solar/proc/set_control(obj/machinery/power/solar_control/SC) if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST)) return 0 control = SC @@ -43,7 +43,7 @@ control.connected_panels.Remove(src) control = null -/obj/machinery/power/solar/proc/Make(var/obj/item/solar_assembly/S) +/obj/machinery/power/solar/proc/Make(obj/item/solar_assembly/S) if(!S) S = new /obj/item/solar_assembly(src) S.glass_type = /obj/item/stack/sheet/glass @@ -209,7 +209,7 @@ var/tracker = 0 var/glass_type = null -/obj/item/solar_assembly/attack_hand(var/mob/user) +/obj/item/solar_assembly/attack_hand(mob/user) if(!anchored && isturf(loc)) // You can't pick it up ..() @@ -221,7 +221,7 @@ glass_type = null -/obj/item/solar_assembly/attackby(var/obj/item/weapon/W, var/mob/user, params) +/obj/item/solar_assembly/attackby(obj/item/weapon/W, mob/user, params) if(!anchored && isturf(loc)) if(istype(W, /obj/item/weapon/wrench)) @@ -370,7 +370,7 @@ if(!..()) ui_interact(user) -/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "solar_control.tmpl", name, 490, 420, 1) /obj/machinery/power/solar_control/get_ui_data() @@ -388,7 +388,7 @@ data["connected_tracker"] = (connected_tracker ? 1 : 0) return data -/obj/machinery/power/solar_control/attackby(I as obj, user as mob, params) +/obj/machinery/power/solar_control/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20, target = src)) @@ -469,7 +469,7 @@ set_panels(cdir) //rotates the panel to the passed angle -/obj/machinery/power/solar_control/proc/set_panels(var/cdir) +/obj/machinery/power/solar_control/proc/set_panels(cdir) for(var/obj/machinery/power/solar/S in connected_panels) S.adir = cdir //instantly rotates the panel diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 8520b330ec3..9fb8bfb9d52 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -189,7 +189,7 @@ /obj/machinery/power/supermatter_shard -/obj/machinery/power/supermatter_shard/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/power/supermatter_shard/bullet_act(obj/item/projectile/Proj) var/turf/L = loc if(!istype(L)) // We don't run process() when we are in space return 0 // This stops people from being able to really power up the supermatter @@ -217,21 +217,21 @@ qdel(src) return(gain) -/obj/machinery/power/supermatter_shard/attack_paw(mob/user as mob) +/obj/machinery/power/supermatter_shard/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/power/supermatter_shard/attack_robot(mob/user as mob) +/obj/machinery/power/supermatter_shard/attack_robot(mob/user) if(Adjacent(user)) return attack_hand(user) else user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." return -/obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob) +/obj/machinery/power/supermatter_shard/attack_ai(mob/user) user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." -/obj/machinery/power/supermatter_shard/attack_hand(mob/living/user as mob) +/obj/machinery/power/supermatter_shard/attack_hand(mob/living/user) if(!istype(user)) return user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\ @@ -248,7 +248,7 @@ R.receive_pulse(power/10) return -/obj/machinery/power/supermatter_shard/attackby(obj/item/W as obj, mob/living/user as mob, params) +/obj/machinery/power/supermatter_shard/attackby(obj/item/W, mob/living/user, params) if(!istype(W) || (W.flags & ABSTRACT) || !istype(user)) return if(user.drop_item(W)) diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index ded1f663392..37fded3198f 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -25,7 +25,7 @@ master.disconnect_terminal() return ..() -/obj/machinery/power/terminal/hide(var/i) +/obj/machinery/power/terminal/hide(i) if(i) invisibility = 101 icon_state = "term-f" @@ -48,7 +48,7 @@ . = 1 -/obj/machinery/power/terminal/proc/dismantle(var/mob/living/user) +/obj/machinery/power/terminal/proc/dismantle(mob/living/user) if(istype(loc, /turf/simulated)) var/turf/simulated/T = loc if(T.intact) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index d39921f2699..b2771ae6d4f 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -26,7 +26,7 @@ ..() //set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST -/obj/machinery/power/tracker/proc/set_control(var/obj/machinery/power/solar_control/SC) +/obj/machinery/power/tracker/proc/set_control(obj/machinery/power/solar_control/SC) if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST)) return 0 control = SC @@ -39,7 +39,7 @@ control.connected_tracker = null control = null -/obj/machinery/power/tracker/proc/Make(var/obj/item/solar_assembly/S) +/obj/machinery/power/tracker/proc/Make(obj/item/solar_assembly/S) if(!S) S = new /obj/item/solar_assembly(src) S.glass_type = /obj/item/stack/sheet/glass @@ -49,7 +49,7 @@ update_icon() //updates the tracker icon and the facing angle for the control computer -/obj/machinery/power/tracker/proc/set_angle(var/angle) +/obj/machinery/power/tracker/proc/set_angle(angle) sun_angle = angle //set icon dir to show sun illumination @@ -58,7 +58,7 @@ if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet control.cdir = angle -/obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user, params) +/obj/machinery/power/tracker/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 6e72debce5f..c7bf249a611 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -130,7 +130,7 @@ default_deconstruction_crowbar(I) -/obj/machinery/power/compressor/CanAtmosPass(var/turf/T) +/obj/machinery/power/compressor/CanAtmosPass(turf/T) return !density /obj/machinery/power/compressor/process() @@ -230,7 +230,7 @@ if(compressor) compressor.locate_machinery() -/obj/machinery/power/turbine/CanAtmosPass(var/turf/T) +/obj/machinery/power/turbine/CanAtmosPass(turf/T) return !density /obj/machinery/power/turbine/process() diff --git a/code/modules/procedural mapping/mapGenerator.dm b/code/modules/procedural mapping/mapGenerator.dm index 864e43c1ea6..f421b1db0ee 100644 --- a/code/modules/procedural mapping/mapGenerator.dm +++ b/code/modules/procedural mapping/mapGenerator.dm @@ -32,7 +32,7 @@ //Defines the region the map represents, sets map //Returns the map -/datum/mapGenerator/proc/defineRegion(var/turf/Start, var/turf/End, var/replace = 0) +/datum/mapGenerator/proc/defineRegion(turf/Start, turf/End, replace = 0) if(!checkRegion(Start, End)) return 0 @@ -45,7 +45,7 @@ //Defines the region the map represents, as a CIRCLE!, sets map //Returns the map -/datum/mapGenerator/proc/defineCircularRegion(var/turf/Start, var/turf/End, var/replace = 0) +/datum/mapGenerator/proc/defineCircularRegion(turf/Start, turf/End, replace = 0) if(!checkRegion(Start, End)) return 0 @@ -86,7 +86,7 @@ //Checks for and Rejects bad region coordinates //Returns 1/0 -/datum/mapGenerator/proc/checkRegion(var/turf/Start, var/turf/End) +/datum/mapGenerator/proc/checkRegion(turf/Start, turf/End) . = 1 if(!Start || !End) @@ -113,7 +113,7 @@ //Requests the mapGeneratorModule(s) to (re)generate this one turf -/datum/mapGenerator/proc/generateOneTurf(var/turf/T) +/datum/mapGenerator/proc/generateOneTurf(turf/T) if(!T) return syncModules() @@ -178,7 +178,7 @@ var/moduleClusters = input("Cluster Flags (Cancel to leave unchanged from defaults)","Map Gen Settings") as null|anything in clusters //null for default - + var/theCluster = 0 if(moduleClusters != "None") if(!clusters[moduleClusters]) @@ -187,7 +187,7 @@ theCluster = clusters[moduleClusters] else theCluster = CLUSTER_CHECK_NONE - + if(theCluster) for(var/datum/mapGeneratorModule/M in N.modules) M.clusterCheckFlags = theCluster diff --git a/code/modules/procedural mapping/mapGeneratorModule.dm b/code/modules/procedural mapping/mapGeneratorModule.dm index da08a540ef3..847b679225d 100644 --- a/code/modules/procedural mapping/mapGeneratorModule.dm +++ b/code/modules/procedural mapping/mapGeneratorModule.dm @@ -10,7 +10,7 @@ //Syncs the module up with it's mother -/datum/mapGeneratorModule/proc/sync(var/datum/mapGenerator/mum) +/datum/mapGeneratorModule/proc/sync(datum/mapGenerator/mum) mother = null if(mum) mother = mum @@ -26,7 +26,7 @@ //Place a spawnable atom or turf on this turf -/datum/mapGeneratorModule/proc/place(var/turf/T) +/datum/mapGeneratorModule/proc/place(turf/T) if(!T) return 0 @@ -104,7 +104,7 @@ //Checks and Rejects dense turfs -/datum/mapGeneratorModule/proc/checkPlaceAtom(var/turf/T) +/datum/mapGeneratorModule/proc/checkPlaceAtom(turf/T) . = 1 if(!T) return 0 diff --git a/code/modules/procedural mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural mapping/mapGeneratorModules/helpers.dm index bad449a9e8f..2c76915504b 100644 --- a/code/modules/procedural mapping/mapGeneratorModules/helpers.dm +++ b/code/modules/procedural mapping/mapGeneratorModules/helpers.dm @@ -33,7 +33,7 @@ if(is_border(T)) place(T) -/datum/mapGeneratorModule/border/proc/is_border(var/turf/T) +/datum/mapGeneratorModule/border/proc/is_border(turf/T) for(var/direction in list(SOUTH,EAST,WEST,NORTH)) if (get_step(T,direction) in mother.map) continue diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 5cce24c6dba..27a1309f57b 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -34,7 +34,7 @@ BB = new projectile_type(src) return -/obj/item/ammo_casing/attackby(obj/item/ammo_box/box as obj, mob/user as mob, params) +/obj/item/ammo_casing/attackby(obj/item/ammo_box/box, mob/user, params) if (!istype(box, /obj/item/ammo_box)) return if(isturf(src.loc)) @@ -79,7 +79,7 @@ stored_ammo += new ammo_type(src) update_icon() -/obj/item/ammo_box/proc/get_round(var/keep = 0) +/obj/item/ammo_box/proc/get_round(keep = 0) if (!stored_ammo.len) return null else @@ -89,7 +89,7 @@ stored_ammo.Insert(1,b) return b -/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/R, var/replace_spent = 0) +/obj/item/ammo_box/proc/give_round(obj/item/ammo_casing/R, replace_spent = 0) // Boxes don't have a caliber type, magazines do. Not sure if it's intended or not, but if we fail to find a caliber, then we fall back to ammo_type. if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type)) return 0 @@ -112,7 +112,7 @@ return 0 -/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, params, var/silent = 0, var/replace_spent = 0) +/obj/item/ammo_box/attackby(obj/item/A, mob/user, params, silent = 0, replace_spent = 0) var/num_loaded = 0 if(istype(A, /obj/item/ammo_box)) var/obj/item/ammo_box/AM = A @@ -138,7 +138,7 @@ return num_loaded -/obj/item/ammo_box/attack_self(mob/user as mob) +/obj/item/ammo_box/attack_self(mob/user) var/obj/item/ammo_casing/A = get_round() if(A) user.put_in_hands(A) diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 3e0afd3ee2e..586102cbe70 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -196,7 +196,7 @@ desc = "A caseless bullet casing." -/obj/item/ammo_casing/caseless/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, var/distro, var/quiet) +/obj/item/ammo_casing/caseless/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, distro, quiet) if (..()) loc = null return 1 @@ -244,7 +244,7 @@ icon_state = "foamdart_empty" desc = "Its nerf or nothing! ... Although, this one doesn't look too safe." -/obj/item/ammo_casing/caseless/foam_dart/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/ammo_casing/caseless/foam_dart/attackby(obj/item/A, mob/user, params) ..() if (istype(A, /obj/item/weapon/screwdriver) && !modified) modified = 1 diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 9a3c97ab7e7..c776a60e0a4 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -1,7 +1,7 @@ ////////////////INTERNAL MAGAZINES////////////////////// //internals magazines are accessible, so replace spent ammo if full when trying to put a live one in -/obj/item/ammo_box/magazine/internal/give_round(var/obj/item/ammo_casing/R) +/obj/item/ammo_box/magazine/internal/give_round(obj/item/ammo_casing/R) return ..(R,1) /obj/item/ammo_box/magazine/internal/cylinder @@ -11,7 +11,7 @@ caliber = "357" max_ammo = 7 -/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(var/countempties = 1) +/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = 1) if (!countempties) var/boolets = 0 for (var/i = 1, i <= stored_ammo.len, i++) diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm index d130f56e32b..a90eda4508f 100644 --- a/code/modules/projectiles/firing.dm +++ b/code/modules/projectiles/firing.dm @@ -1,4 +1,4 @@ -/obj/item/ammo_casing/proc/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, var/distro, var/quiet) +/obj/item/ammo_casing/proc/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, distro, quiet) distro += variance for (var/i = max(1, pellets), i > 0, i--) var/curloc = user.loc @@ -15,7 +15,7 @@ update_icon() return 1 -/obj/item/ammo_casing/proc/ready_proj(atom/target as mob|obj|turf, mob/living/user, var/quiet) +/obj/item/ammo_casing/proc/ready_proj(atom/target as mob|obj|turf, mob/living/user, quiet) if (!BB) return BB.original = target @@ -53,7 +53,7 @@ BB = null return 1 -/obj/item/ammo_casing/proc/spread(var/turf/target, var/turf/current, var/distro) +/obj/item/ammo_casing/proc/spread(turf/target, turf/current, distro) var/dx = abs(target.x - current.x) var/dy = abs(target.y - current.y) return locate(target.x + round(gaussian(0, distro) * (dy+2)/8, 1), target.y + round(gaussian(0, distro) * (dx+2)/8, 1), target.z) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index c2aec9dd829..e692bd7bb97 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -87,7 +87,7 @@ return -/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, var/pointblank = 0, var/mob/pbtarget = null, var/message = 1) +/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1) if(recoil) spawn() shake_camera(user, recoil + 1, recoil) @@ -172,7 +172,7 @@ return 0 -/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params) +/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params) add_fingerprint(user) if(semicd) @@ -235,7 +235,7 @@ else return -/obj/item/weapon/gun/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/device/flashlight/seclite)) var/obj/item/device/flashlight/seclite/S = A if(can_flashlight) @@ -293,7 +293,7 @@ update_gunlight(user) return -/obj/item/weapon/gun/proc/update_gunlight(var/mob/user = null) +/obj/item/weapon/gun/proc/update_gunlight(mob/user = null) if(F) action_button_name = "Toggle Gunlight" if(F.on) @@ -328,13 +328,13 @@ SetLuminosity(F.brightness_on) -/obj/item/weapon/gun/attack_hand(mob/user as mob) +/obj/item/weapon/gun/attack_hand(mob/user) if(unique_reskin && !reskinned && loc == user) reskin_gun(user) return ..() -/obj/item/weapon/gun/proc/reskin_gun(var/mob/M) +/obj/item/weapon/gun/proc/reskin_gun(mob/M) var/choice = input(M,"Warning, you can only reskin your weapon once!","Reskin Gun") in options if(src && choice && !M.stat && in_range(M,src) && !M.restrained() && M.canmove) @@ -348,7 +348,7 @@ reskinned = 1 return -/obj/item/weapon/gun/proc/rename_gun(var/mob/M) +/obj/item/weapon/gun/proc/rename_gun(mob/M) var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN) if(src && input && !M.stat && in_range(M,src) && !M.restrained() && M.canmove) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index b16bfeb140f..15115001e06 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -59,7 +59,7 @@ chambered = null //either way, released the prepared shot return -/obj/item/weapon/gun/energy/proc/select_fire(mob/living/user as mob) +/obj/item/weapon/gun/energy/proc/select_fire(mob/living/user) select++ if (select > ammo_type.len) select = 1 diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 6de08880434..90e201e2a61 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -8,7 +8,7 @@ modifystate = 2 can_flashlight = 1 -/obj/item/weapon/gun/energy/gun/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/gun/attack_self(mob/living/user) select_fire(user) update_icon() diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index d638e39a10b..734b408bfba 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -10,7 +10,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) cell_type = "/obj/item/weapon/stock_parts/cell/pulse" -/obj/item/weapon/gun/energy/pulse/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/pulse/attack_self(mob/living/user) select_fire(user) /obj/item/weapon/gun/energy/pulse/emp_act(severity) @@ -51,7 +51,7 @@ cell_type = "/obj/item/weapon/stock_parts/cell/infinite" ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse) -/obj/item/weapon/gun/energy/pulse/destroyer/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/pulse/destroyer/attack_self(mob/living/user) user << "[src.name] has three settings, and they are all DESTROY." /obj/item/weapon/gun/energy/pulse/pistol/m1911 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index c3c78b2010c..78d77697bab 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -62,7 +62,7 @@ update_icon() return 1 -/obj/item/weapon/gun/energy/floragun/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/floragun/attack_self(mob/living/user) select_fire(user) update_icon() return @@ -192,7 +192,7 @@ if(power_supply) user <<"[src] is [round(power_supply.percent())]% charged." -/obj/item/weapon/gun/energy/plasmacutter/attackby(var/obj/item/A, var/mob/user) +/obj/item/weapon/gun/energy/plasmacutter/attackby(obj/item/A, mob/user) if(istype(A, /obj/item/stack/sheet/mineral/plasma)) var/obj/item/stack/sheet/S = A S.use(1) @@ -263,14 +263,14 @@ icon_state = "[initial(icon_state)][select]" return -/obj/item/weapon/gun/energy/wormhole_projector/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/wormhole_projector/attack_self(mob/living/user) select_fire(user) /obj/item/weapon/gun/energy/wormhole_projector/process_chamber() ..() select_fire() -/obj/item/weapon/gun/energy/wormhole_projector/proc/portal_destroyed(var/obj/effect/portal/P) +/obj/item/weapon/gun/energy/wormhole_projector/proc/portal_destroyed(obj/effect/portal/P) if(P.icon_state == "portal") blue = null if(orange) @@ -280,7 +280,7 @@ if(blue) blue.target = null -/obj/item/weapon/gun/energy/wormhole_projector/proc/create_portal(var/obj/item/projectile/beam/wormhole/W) +/obj/item/weapon/gun/energy/wormhole_projector/proc/create_portal(obj/item/projectile/beam/wormhole/W) var/obj/effect/portal/P = new /obj/effect/portal(get_turf(W), null, src) P.precision = 0 if(W.name == "bluespace beam") diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm index 0db80cb561e..cdf7625e393 100644 --- a/code/modules/projectiles/guns/energy/temperature.dm +++ b/code/modules/projectiles/guns/energy/temperature.dm @@ -8,7 +8,7 @@ pin = null -/obj/item/weapon/gun/energy/temperature/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/temperature/attack_self(mob/living/user) select_fire(user) update_icon() return \ No newline at end of file diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm index 20fa083d6e0..39a23d5c07d 100644 --- a/code/modules/projectiles/guns/grenade_launcher.dm +++ b/code/modules/projectiles/guns/grenade_launcher.dm @@ -16,7 +16,7 @@ ..() user << "[grenades.len] / [max_grenades] grenades loaded." -/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I, mob/user, params) if((istype(I, /obj/item/weapon/grenade))) if(grenades.len < max_grenades) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 96cc485ab71..645d078002e 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -22,7 +22,7 @@ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands righthand_file = 'icons/mob/inhands/items_righthand.dmi' -/obj/item/weapon/gun/magic/afterattack(atom/target as mob, mob/living/user as mob, flag) +/obj/item/weapon/gun/magic/afterattack(atom/target, mob/living/user, flag) newshot() if(no_den_usage) var/area/A = get_area(user) diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 55f9ff2849f..f1734712170 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -24,12 +24,12 @@ /obj/item/weapon/gun/magic/wand/update_icon() icon_state = "[initial(icon_state)][charges ? "" : "-drained"]" -/obj/item/weapon/gun/magic/wand/attack(atom/target as mob, mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/attack(atom/target, mob/living/user) if(target == user) return ..() -/obj/item/weapon/gun/magic/wand/afterattack(atom/target as mob, mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/afterattack(atom/target, mob/living/user) if(!charges) shoot_with_empty_chamber(user) return @@ -47,7 +47,7 @@ update_icon() -/obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user) user.visible_message("[user] zaps \himself with [src].") playsound(user, fire_sound, 50, 1) user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] zapped \himself with a [src]" @@ -65,7 +65,7 @@ icon_state = "deathwand" max_charges = 3 //3, 2, 2, 1 -/obj/item/weapon/gun/magic/wand/death/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/death/zap_self(mob/living/user) var/message ="You irradiate yourself with pure energy! " message += pick("Do not pass go. Do not collect 200 zorkmids.","You feel more confident in your spell casting skills.","You Die...","Do you want your possessions identified?") user << message @@ -85,7 +85,7 @@ icon_state = "revivewand" max_charges = 10 //10, 5, 5, 4 -/obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user) user.revive() user << "You feel great!" charges-- @@ -103,7 +103,7 @@ fire_sound = "sound/magic/Staff_Change.ogg" max_charges = 10 //10, 5, 5, 4 -/obj/item/weapon/gun/magic/wand/polymorph/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/polymorph/zap_self(mob/living/user) ..() //because the user mob ceases to exists by the time wabbajack fully resolves wabbajack(user) charges-- @@ -121,7 +121,7 @@ max_charges = 10 //10, 5, 5, 4 no_den_usage = 1 -/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user) do_teleport(user, user, 10) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(10, 0, user.loc) @@ -157,7 +157,7 @@ icon_state = "firewand" max_charges = 8 //8, 4, 4, 3 -/obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user) explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) charges-- ..() \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 9a9c0267e6b..03c38726f09 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -17,7 +17,7 @@ update_icon() return -/obj/item/weapon/gun/projectile/process_chamber(var/eject_casing = 1, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1) // if(in_chamber) // return 1 var/obj/item/ammo_casing/AC = chambered //Find chambered round @@ -46,7 +46,7 @@ return 0 return 1 -/obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/attackby(obj/item/A, mob/user, params) ..() if (istype(A, /obj/item/ammo_box/magazine)) var/obj/item/ammo_box/magazine/AM = A @@ -87,7 +87,7 @@ return return 0 -/obj/item/weapon/gun/projectile/attack_hand(mob/user as mob) +/obj/item/weapon/gun/projectile/attack_hand(mob/user) if(loc == user) if(suppressed) var/obj/item/weapon/suppressor/S = suppressed @@ -103,7 +103,7 @@ return ..() -/obj/item/weapon/gun/projectile/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/projectile/attack_self(mob/living/user) var/obj/item/ammo_casing/AC = chambered //Find chambered round if(magazine) magazine.loc = get_turf(src.loc) @@ -126,7 +126,7 @@ ..() user << "Has [get_ammo()] round\s remaining." -/obj/item/weapon/gun/projectile/proc/get_ammo(var/countchambered = 1) +/obj/item/weapon/gun/projectile/proc/get_ammo(countchambered = 1) var/boolets = 0 //mature var names for mature people if (chambered && countchambered) boolets++ diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 19545232181..a08f9b37260 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -25,7 +25,7 @@ icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]" return -/obj/item/weapon/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/automatic/attackby(obj/item/A, mob/user, params) . = ..() if(.) return @@ -130,7 +130,7 @@ fire_delay = 3 pin = /obj/item/device/firing_pin/implant/pindicate -/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob) +/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user) cover_open = !cover_open user << "You [cover_open ? "open" : "close"] [src]'s cover." update_icon() @@ -148,7 +148,7 @@ update_icon() -/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user as mob) +/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user) if(loc != user) ..() return //let them pick it up @@ -164,7 +164,7 @@ user << "You remove the magazine from [src]." -/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(obj/item/A, mob/user, params) if(!cover_open) user << "[src]'s cover is closed! You can't insert a new mag." return @@ -190,13 +190,13 @@ underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src) update_icon() return -/obj/item/weapon/gun/projectile/automatic/m90/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/weapon/gun/projectile/automatic/m90/afterattack(atom/target, mob/living/user, flag, params) if(select == 2) underbarrel.afterattack(target, user, flag, params) else ..() return -/obj/item/weapon/gun/projectile/automatic/m90/attackby(var/obj/item/A, mob/user, params) +/obj/item/weapon/gun/projectile/automatic/m90/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/ammo_casing)) if(istype(A, underbarrel.magazine.ammo_type)) underbarrel.attack_self() diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index 4b05c3f86dc..4bddd2d3ce4 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -10,7 +10,7 @@ fire_sound = 'sound/weapons/grenadelaunch.ogg' w_class = 3 -/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(var/obj/item/A, mob/user, params) +/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing)) chamber_round() @@ -36,7 +36,7 @@ fire_delay = 0 action_button_name = null -/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(eject_casing = 0, empty_chamber = 1) ..() /obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon() @@ -65,10 +65,10 @@ /obj/item/weapon/gun/projectile/automatic/speargun/attack_self() return -/obj/item/weapon/gun/projectile/automatic/speargun/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/speargun/process_chamber(eject_casing = 0, empty_chamber = 1) ..() -/obj/item/weapon/gun/projectile/automatic/speargun/attackby(var/obj/item/A, mob/user, params) +/obj/item/weapon/gun/projectile/automatic/speargun/attackby(obj/item/A, mob/user, params) var/num_loaded = magazine.attackby(A, user, params, 1) if(num_loaded) user << "You load [num_loaded] spear\s into \the [src]." diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 6e8d226b7e7..1a9c2fdd071 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -14,7 +14,7 @@ /obj/item/weapon/gun/projectile/revolver/process_chamber() return ..(0, 1) -/obj/item/weapon/gun/projectile/revolver/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/attackby(obj/item/A, mob/user, params) var/num_loaded = magazine.attackby(A, user, params, 1) if(num_loaded) user << "You load [num_loaded] shell\s into \the [src]." @@ -26,7 +26,7 @@ if(istype(A, /obj/item/weapon/pen)) rename_gun(user) -/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user) var/num_unloaded = 0 while (get_ammo() > 0) var/obj/item/ammo_casing/CB @@ -44,7 +44,7 @@ /obj/item/weapon/gun/projectile/revolver/can_shoot() return get_ammo(0,0) -/obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1) +/obj/item/weapon/gun/projectile/revolver/get_ammo(countchambered = 0, countempties = 1) var/boolets = 0 //mature var names for mature people if (chambered && countchambered) boolets++ @@ -73,7 +73,7 @@ options["The Peacemaker"] = "detective_peacemaker" options["Cancel"] = null -/obj/item/weapon/gun/projectile/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params) +/obj/item/weapon/gun/projectile/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params) if(magazine.caliber != initial(magazine.caliber)) if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60 playsound(user, fire_sound, 50, 1) @@ -83,7 +83,7 @@ return 0 ..() -/obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/detective/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/weapon/screwdriver)) if(magazine.caliber == "38") @@ -143,7 +143,7 @@ chamber_round() spun = 1 -/obj/item/weapon/gun/projectile/revolver/russian/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/russian/attackby(obj/item/A, mob/user, params) var/num_loaded = ..() if(num_loaded) user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.") @@ -155,7 +155,7 @@ A.update_icon() return -/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob) +/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user) if(!spun && can_shoot()) user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") Spin() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 56fb14a3dd1..cda97e37feb 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -11,7 +11,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot var/recentpump = 0 // to prevent spammage -/obj/item/weapon/gun/projectile/shotgun/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/shotgun/attackby(obj/item/A, mob/user, params) var/num_loaded = magazine.attackby(A, user, params, 1) if(num_loaded) user << "You load [num_loaded] shell\s into \the [src]!" @@ -71,7 +71,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shotriot sawn_desc = "Come with me if you want to live." -/obj/item/weapon/gun/projectile/shotgun/riot/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/shotgun/riot/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter)) sawoff(user) @@ -103,7 +103,7 @@ update_icon() //I.E. fix the desc return 1 -/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(obj/item/A, mob/user, params) if(!bolt_open) user << "The bolt is closed!" return @@ -142,7 +142,7 @@ options["Rosewood"] = "dshotgun-p" options["Cancel"] = null -/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing)) chamber_round() @@ -153,7 +153,7 @@ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter)) sawoff(user) -/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user) var/num_unloaded = 0 while (get_ammo() > 0) var/obj/item/ammo_casing/CB @@ -184,7 +184,7 @@ unique_rename = 0 unique_reskin = 0 -/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/stack/cable_coil) && !sawn_state) var/obj/item/stack/cable_coil/C = A @@ -199,20 +199,20 @@ // Sawing guns related procs // -/obj/item/weapon/gun/projectile/proc/blow_up(mob/user as mob) +/obj/item/weapon/gun/projectile/proc/blow_up(mob/user) . = 0 for(var/obj/item/ammo_casing/AC in magazine.stored_ammo) if(AC.BB) process_fire(user, user,0) . = 1 -/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user as mob) +/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user) . = 0 if(chambered && chambered.BB) process_fire(user, user,0) . = 1 -/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob) +/obj/item/weapon/gun/projectile/proc/sawoff(mob/user) if(sawn_state == SAWN_OFF) user << "\The [src] is already shortened!" return @@ -296,4 +296,4 @@ icon_state = "cshotgun" origin_tech = "combat=5;materials=2" mag_type = /obj/item/ammo_box/magazine/internal/shotcom - w_class = 5 + w_class = 5 diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 67a5aa56406..06fd47933ba 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -13,7 +13,7 @@ clumsy_check = 0 needs_permit = 0 -/obj/item/weapon/gun/projectile/automatic/toy/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/toy/process_chamber(eject_casing = 0, empty_chamber = 1) ..() /obj/item/weapon/gun/projectile/automatic/toy/pistol @@ -74,7 +74,7 @@ needs_permit = 0 mag_type = /obj/item/ammo_box/magazine/toy/smgm45 -/obj/item/weapon/gun/projectile/automatic/c20r/toy/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/c20r/toy/process_chamber(eject_casing = 0, empty_chamber = 1) ..() /obj/item/weapon/gun/projectile/automatic/l6_saw/toy @@ -85,5 +85,5 @@ needs_permit = 0 mag_type = /obj/item/ammo_box/magazine/toy/m762 -/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chamber(eject_casing = 0, empty_chamber = 1) ..() \ No newline at end of file diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 67c4cb7191f..e44ae121576 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -45,7 +45,7 @@ ..() user << "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining." -/obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/syringe/attack_self(mob/living/user) if(!syringes.len) user << "[src] is empty!" return 0 @@ -60,7 +60,7 @@ return 1 -/obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, params, var/show_msg = 1) +/obj/item/weapon/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = 1) if(istype(A, /obj/item/weapon/reagent_containers/syringe)) if(syringes.len < max_syringes) if(!user.unEquip(A)) diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 123e35a2fd8..4d630ce494b 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -42,7 +42,7 @@ emagged = 1 user << "You override the authentication mechanism." -/obj/item/device/firing_pin/proc/gun_insert(mob/living/user, var/obj/item/weapon/gun/G) +/obj/item/device/firing_pin/proc/gun_insert(mob/living/user, obj/item/weapon/gun/G) gun = G loc = gun gun.pin = src @@ -132,7 +132,7 @@ return 0 return 1 -/obj/item/device/firing_pin/clown/ultra/gun_insert(mob/living/user, var/obj/item/weapon/gun/G) +/obj/item/device/firing_pin/clown/ultra/gun_insert(mob/living/user, obj/item/weapon/gun/G) ..() G.clumsy_check = 0 diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 7854bbf8e7c..29931e4e7bc 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -142,7 +142,7 @@ sleep(1) -/obj/item/projectile/Crossed(atom/movable/AM as mob) //A mob moving on a tile with a projectile is hit by it. +/obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it. ..() if(isliving(AM) && AM.density && !checkpass(PASSMOB)) Bump(AM, 1) \ No newline at end of file diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 00cd2fc1a42..f2c4eb31045 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -47,7 +47,7 @@ icon_state = "u_laser" damage = 50 -/obj/item/projectile/beam/pulse/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = 0) . = ..() if(istype(target,/turf/)||istype(target,/obj/structure/)) target.ex_act(2) @@ -76,7 +76,7 @@ pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag) -/obj/item/projectile/lasertag/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/lasertag/on_hit(atom/target, blocked = 0) . = ..() if(ishuman(target)) var/mob/living/carbon/human/M = target diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index d3fb315bc53..84bbe11872b 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -59,7 +59,7 @@ icon_state = "spark" color = "#FFFF00" -/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/incendiary/on_hit(atom/target, blocked = 0) . = ..() if(iscarbon(target)) var/mob/living/carbon/M = target @@ -92,7 +92,7 @@ stun = 8 hitsound = 'sound/effects/meteorimpact.ogg' -/obj/item/projectile/bullet/meteorshot/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = 0) . = ..() if(istype(target, /atom/movable)) var/atom/movable/M = target @@ -107,7 +107,7 @@ /obj/item/projectile/bullet/mime damage = 20 -/obj/item/projectile/bullet/mime/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/mime/on_hit(atom/target, blocked = 0) . = ..() if(iscarbon(target)) var/mob/living/carbon/M = target @@ -124,7 +124,7 @@ flags |= NOREACT create_reagents(50) -/obj/item/projectile/bullet/dart/on_hit(var/atom/target, var/blocked = 0, var/hit_zone) +/obj/item/projectile/bullet/dart/on_hit(atom/target, blocked = 0, hit_zone) var/deflect = 0 if(iscarbon(target)) var/mob/living/carbon/M = target @@ -162,7 +162,7 @@ damage_type = TOX weaken = 5 -/obj/item/projectile/bullet/neurotoxin/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/neurotoxin/on_hit(atom/target, blocked = 0) if(isalien(target)) weaken = 0 nodamage = 1 diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 2cfe90da467..f8e6dbf479b 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -18,7 +18,7 @@ hitsound = 'sound/weapons/taserhit.ogg' range = 7 -/obj/item/projectile/energy/electrode/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/energy/electrode/on_hit(atom/target, blocked = 0) . = ..() if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - burst into sparks! var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread @@ -50,7 +50,7 @@ ..() SpinAnimation() -/obj/item/projectile/energy/net/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/energy/net/on_hit(atom/target, blocked = 0) if(isliving(target) && !locate(/obj/effect/nettingportal) in loc) new/obj/effect/nettingportal(get_turf(target)) ..() @@ -97,7 +97,7 @@ hitsound = 'sound/weapons/taserhit.ogg' range = 4 -/obj/item/projectile/energy/trap/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/energy/trap/on_hit(atom/target, blocked = 0) if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - drop a trap new/obj/item/weapon/restraints/legcuffs/beartrap/energy(get_turf(loc)) else if(iscarbon(target)) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 36e2edb9db3..7ad01293b93 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -10,7 +10,7 @@ name = "bolt of death" icon_state = "pulse1_bl" -/obj/item/projectile/magic/death/on_hit(var/target) +/obj/item/projectile/magic/death/on_hit(target) . = ..() if(ismob(target)) var/mob/M = target @@ -31,7 +31,7 @@ return ..() -/obj/item/projectile/magic/fireball/on_hit(var/target) +/obj/item/projectile/magic/fireball/on_hit(target) . = ..() var/turf/T = get_turf(target) explosion(T, -1, 0, 2, 3, 0, flame_range = 2) @@ -47,7 +47,7 @@ nodamage = 1 flag = "magic" -/obj/item/projectile/magic/resurrection/on_hit(var/mob/living/carbon/target) +/obj/item/projectile/magic/resurrection/on_hit(mob/living/carbon/target) . = ..() if(ismob(target)) var/old_stat = target.stat @@ -73,7 +73,7 @@ var/inner_tele_radius = 0 var/outer_tele_radius = 6 -/obj/item/projectile/magic/teleport/on_hit(var/mob/target) +/obj/item/projectile/magic/teleport/on_hit(mob/target) . = ..() var/teleammount = 0 var/teleloc = target @@ -95,7 +95,7 @@ nodamage = 1 flag = "magic" -/obj/item/projectile/magic/door/on_hit(var/atom/target) +/obj/item/projectile/magic/door/on_hit(atom/target) . = ..() var/atom/T = target.loc if(isturf(target) && target.density) @@ -103,7 +103,7 @@ else if (isturf(T) && T.density) CreateDoor(T) -/obj/item/projectile/magic/door/proc/CreateDoor(var/turf/T) +/obj/item/projectile/magic/door/proc/CreateDoor(turf/T) new /obj/structure/mineral_door/wood(T) T.ChangeTurf(/turf/simulated/floor/plating) @@ -116,7 +116,7 @@ nodamage = 1 flag = "magic" -/obj/item/projectile/magic/change/on_hit(var/atom/change) +/obj/item/projectile/magic/change/on_hit(atom/change) . = ..() wabbajack(change) @@ -259,7 +259,7 @@ nodamage = 1 flag = "magic" -/obj/item/projectile/magic/animate/Bump(var/atom/change) +/obj/item/projectile/magic/animate/Bump(atom/change) ..() if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects)) if(istype(change, /obj/structure/closet/statue)) diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm index 414be55b31a..321ae1c6b42 100644 --- a/code/modules/projectiles/projectile/reusable.dm +++ b/code/modules/projectiles/projectile/reusable.dm @@ -3,7 +3,7 @@ desc = "How do you even reuse a bullet?" var/obj/item/ammo_casing/caseless/ammo_type = /obj/item/ammo_casing/caseless/ -/obj/item/projectile/bullet/reusable/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/reusable/on_hit(atom/target, blocked = 0) . = ..() if (src.contents.len) var/obj/content diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 80e24ad2fba..ed67992617a 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -177,7 +177,7 @@ obj/item/projectile/kinetic/New() /obj/item/ammo_casing/energy/wormhole/New(var/obj/item/weapon/gun/energy/wormhole_projector/wh) gun = wh -/obj/item/projectile/beam/wormhole/on_hit(var/atom/target) +/obj/item/projectile/beam/wormhole/on_hit(atom/target) if(ismob(target)) return ..() if(!gun) @@ -220,7 +220,7 @@ obj/item/projectile/kinetic/New() range += 3 ..() -/obj/item/projectile/plasma/on_hit(var/atom/target) +/obj/item/projectile/plasma/on_hit(atom/target) if(istype(target, /turf/simulated/mineral)) var/turf/simulated/mineral/M = target M.gets_drilled(firer) diff --git a/code/modules/reagents/Chemistry-Colours.dm b/code/modules/reagents/Chemistry-Colours.dm index 1378315276e..7251c9c25e1 100644 --- a/code/modules/reagents/Chemistry-Colours.dm +++ b/code/modules/reagents/Chemistry-Colours.dm @@ -1,5 +1,5 @@ -/proc/mix_color_from_reagents(var/list/reagent_list) +/proc/mix_color_from_reagents(list/reagent_list) if(!istype(reagent_list)) return diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 0978a34f58f..e83acf03014 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -61,7 +61,7 @@ var/const/INGEST = 2 if(my_atom && my_atom.reagents == src) my_atom.reagents = null -/datum/reagents/proc/remove_any(var/amount=1) +/datum/reagents/proc/remove_any(amount=1) var/total_transfered = 0 var/current_list_element = 1 @@ -103,7 +103,7 @@ var/const/INGEST = 2 return the_id -/datum/reagents/proc/trans_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred. +/datum/reagents/proc/trans_to(obj/target, amount=1, multiplier=1, preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred. if (!target ) return var/datum/reagents/R @@ -133,7 +133,7 @@ var/const/INGEST = 2 src.handle_reactions() return amount -/datum/reagents/proc/copy_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1) +/datum/reagents/proc/copy_to(obj/target, amount=1, multiplier=1, preserve_data=1) if(!target) return if(!target.reagents || src.total_volume<=0) @@ -154,7 +154,7 @@ var/const/INGEST = 2 src.handle_reactions() return amount -/datum/reagents/proc/trans_id_to(var/obj/target, var/reagent, var/amount=1, var/preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N +/datum/reagents/proc/trans_id_to(obj/target, reagent, amount=1, preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N if (!target) return if (!target.reagents || src.total_volume<=0 || !src.get_reagent_amount(reagent)) @@ -211,7 +211,7 @@ var/const/INGEST = 2 return total_transfered */ -/datum/reagents/proc/metabolize(var/mob/M) +/datum/reagents/proc/metabolize(mob/M) if(M) chem_temp = M.bodytemperature handle_reactions() @@ -270,12 +270,12 @@ var/const/INGEST = 2 R.on_tick() return -/datum/reagents/proc/conditional_update_move(var/atom/A, var/Running = 0) +/datum/reagents/proc/conditional_update_move(atom/A, Running = 0) for(var/datum/reagent/R in reagent_list) R.on_move (A, Running) update_total() -/datum/reagents/proc/conditional_update(var/atom/A) +/datum/reagents/proc/conditional_update(atom/A) for(var/datum/reagent/R in reagent_list) R.on_update (A) update_total() @@ -367,14 +367,14 @@ var/const/INGEST = 2 update_total() return 0 -/datum/reagents/proc/isolate_reagent(var/reagent) +/datum/reagents/proc/isolate_reagent(reagent) for(var/A in reagent_list) var/datum/reagent/R = A if (R.id != reagent) del_reagent(R.id) update_total() -/datum/reagents/proc/del_reagent(var/reagent) +/datum/reagents/proc/del_reagent(reagent) for(var/datum/reagent/R in reagent_list) if (R.id == reagent) if(istype(my_atom, /mob/living)) @@ -389,21 +389,21 @@ var/const/INGEST = 2 check_goreallyfast(my_atom) return 1 -/datum/reagents/proc/check_ignoreslow(var/mob/M) +/datum/reagents/proc/check_ignoreslow(mob/M) if(istype(M, /mob)) if(M.reagents.has_reagent("morphine")||M.reagents.has_reagent("ephedrine")) return 1 else M.status_flags &= ~IGNORESLOWDOWN -/datum/reagents/proc/check_gofast(var/mob/M) +/datum/reagents/proc/check_gofast(mob/M) if(istype(M, /mob)) if(M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola")) return 1 else M.status_flags &= ~GOTTAGOFAST -/datum/reagents/proc/check_goreallyfast(var/mob/M) +/datum/reagents/proc/check_goreallyfast(mob/M) if(istype(M, /mob)) if(M.reagents.has_reagent("methamphetamine")) return 1 @@ -425,7 +425,7 @@ var/const/INGEST = 2 del_reagent(R.id) return 0 -/datum/reagents/proc/reaction(var/atom/A, var/method=TOUCH, var/volume_modifier=1,var/show_message=1) +/datum/reagents/proc/reaction(atom/A, method=TOUCH, volume_modifier=1,show_message=1) if(isliving(A)) var/mob/living/L = A var/touch_protection = 0 @@ -440,7 +440,7 @@ var/const/INGEST = 2 for(var/datum/reagent/R in reagent_list) R.reaction_obj(A, R.volume*volume_modifier, show_message) -/datum/reagents/proc/add_reagent(var/reagent, var/amount, var/list/data=null, var/reagtemp = 300, var/no_react = 0) +/datum/reagents/proc/add_reagent(reagent, amount, list/data=null, reagtemp = 300, no_react = 0) if(!isnum(amount) || !amount) return 1 update_total() @@ -483,12 +483,12 @@ var/const/INGEST = 2 return 1 -/datum/reagents/proc/add_reagent_list(var/list/list_reagents, var/list/data=null) // Like add_reagent but you can enter a list. Format it like this: list("toxin" = 10, "beer" = 15) +/datum/reagents/proc/add_reagent_list(list/list_reagents, list/data=null) // Like add_reagent but you can enter a list. Format it like this: list("toxin" = 10, "beer" = 15) for(var/r_id in list_reagents) var/amt = list_reagents[r_id] add_reagent(r_id, amt, data) -/datum/reagents/proc/remove_reagent(var/reagent, var/amount, var/safety)//Added a safety check for the trans_id_to +/datum/reagents/proc/remove_reagent(reagent, amount, safety)//Added a safety check for the trans_id_to if(!isnum(amount)) return 1 @@ -504,7 +504,7 @@ var/const/INGEST = 2 return 1 -/datum/reagents/proc/has_reagent(var/reagent, var/amount = -1) +/datum/reagents/proc/has_reagent(reagent, amount = -1) for(var/A in reagent_list) var/datum/reagent/R = A @@ -516,7 +516,7 @@ var/const/INGEST = 2 return 0 -/datum/reagents/proc/get_reagent_amount(var/reagent) +/datum/reagents/proc/get_reagent_amount(reagent) for(var/A in reagent_list) var/datum/reagent/R = A if (R.id == reagent) @@ -532,7 +532,7 @@ var/const/INGEST = 2 return res -/datum/reagents/proc/remove_all_type(var/reagent_type, var/amount, var/strict = 0, var/safety = 1) // Removes all reagent of X type. @strict set to 1 determines whether the childs of the type are included. +/datum/reagents/proc/remove_all_type(reagent_type, amount, strict = 0, safety = 1) // Removes all reagent of X type. @strict set to 1 determines whether the childs of the type are included. if(!isnum(amount)) return 1 var/has_removed_reagent = 0 @@ -554,19 +554,19 @@ var/const/INGEST = 2 return has_removed_reagent //two helper functions to preserve data across reactions (needed for xenoarch) -/datum/reagents/proc/get_data(var/reagent_id) +/datum/reagents/proc/get_data(reagent_id) for(var/datum/reagent/D in reagent_list) if(D.id == reagent_id) //world << "proffering a data-carrying reagent ([reagent_id])" return D.data -/datum/reagents/proc/set_data(var/reagent_id, var/new_data) +/datum/reagents/proc/set_data(reagent_id, new_data) for(var/datum/reagent/D in reagent_list) if(D.id == reagent_id) //world << "reagent data set ([reagent_id])" D.data = new_data -/datum/reagents/proc/copy_data(var/datum/reagent/current_reagent) +/datum/reagents/proc/copy_data(datum/reagent/current_reagent) if (!current_reagent || !current_reagent.data) return null if (!istype(current_reagent.data, /list)) return current_reagent.data @@ -591,7 +591,7 @@ var/const/INGEST = 2 // Convenience proc to create a reagents holder for an atom // Max vol is maximum volume of holder -/atom/proc/create_reagents(var/max_vol) +/atom/proc/create_reagents(max_vol) if(reagents) qdel(reagents) reagents = new/datum/reagents(max_vol) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 5c79572d938..8b42b95134d 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -71,7 +71,7 @@ * * @return nothing */ -/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN)) return if(user.stat || user.restrained()) return @@ -137,7 +137,7 @@ add_fingerprint(usr) return 1 // update UIs attached to this object -/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob, params) +/obj/machinery/chem_dispenser/attackby(obj/item/weapon/reagent_containers/glass/B, mob/user, params) if(isrobot(user)) return @@ -160,13 +160,13 @@ icon_beaker.pixel_x = rand(-10,5) overlays += icon_beaker -/obj/machinery/chem_dispenser/attack_ai(mob/user as mob) +/obj/machinery/chem_dispenser/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/chem_dispenser/attack_paw(mob/user as mob) +/obj/machinery/chem_dispenser/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/chem_dispenser/attack_hand(mob/user as mob) +/obj/machinery/chem_dispenser/attack_hand(mob/user) if(stat & BROKEN) return @@ -273,7 +273,7 @@ stat |= NOPOWER -/obj/machinery/chem_master/attackby(var/obj/item/B as obj, var/mob/user as mob, params) +/obj/machinery/chem_master/attackby(obj/item/B, mob/user, params) if(default_unfasten_wrench(user, B)) return @@ -475,13 +475,13 @@ src.updateUsrDialog() return -/obj/machinery/chem_master/attack_ai(mob/user as mob) +/obj/machinery/chem_master/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/chem_master/attack_paw(mob/user as mob) +/obj/machinery/chem_master/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/chem_master/attack_hand(mob/user as mob) +/obj/machinery/chem_master/attack_hand(mob/user) if(stat & BROKEN) return @@ -556,7 +556,7 @@ popup.open(1) return -/obj/machinery/chem_master/proc/isgoodnumber(var/num) +/obj/machinery/chem_master/proc/isgoodnumber(num) if(isnum(num)) if(num > 200) num = 200 @@ -589,7 +589,7 @@ component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null) component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null) -/obj/machinery/chem_master/constructable/attackby(var/obj/item/B as obj, var/mob/user as mob, params) +/obj/machinery/chem_master/constructable/attackby(obj/item/B, mob/user, params) if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", B)) if(beaker) @@ -665,7 +665,7 @@ overlays.Cut() stat |= BROKEN -/obj/machinery/computer/pandemic/proc/GetVirusByIndex(var/index) +/obj/machinery/computer/pandemic/proc/GetVirusByIndex(index) if(beaker && beaker.reagents) if(beaker.reagents.reagent_list.len) var/datum/reagent/blood/BL = locate() in beaker.reagents.reagent_list @@ -675,7 +675,7 @@ return viruses[index] return null -/obj/machinery/computer/pandemic/proc/GetResistancesByIndex(var/index) +/obj/machinery/computer/pandemic/proc/GetResistancesByIndex(index) if(beaker && beaker.reagents) if(beaker.reagents.reagent_list.len) var/datum/reagent/blood/BL = locate() in beaker.reagents.reagent_list @@ -685,13 +685,13 @@ return resistances[index] return null -/obj/machinery/computer/pandemic/proc/GetVirusTypeByIndex(var/index) +/obj/machinery/computer/pandemic/proc/GetVirusTypeByIndex(index) var/datum/disease/D = GetVirusByIndex(index) if(D) return D.GetDiseaseID() return null -/obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) +/obj/machinery/computer/pandemic/proc/replicator_cooldown(waittime) wait = 1 update_icon() spawn(waittime) @@ -816,7 +816,7 @@ src.add_fingerprint(usr) return -/obj/machinery/computer/pandemic/attack_hand(mob/user as mob) +/obj/machinery/computer/pandemic/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -914,7 +914,7 @@ return -/obj/machinery/computer/pandemic/attackby(var/obj/I as obj, var/mob/user as mob, params) +/obj/machinery/computer/pandemic/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(stat & (NOPOWER|BROKEN)) return if(src.beaker) @@ -1043,7 +1043,7 @@ return -/obj/machinery/reagentgrinder/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/reagentgrinder/attackby(obj/item/O, mob/user, params) if(default_unfasten_wrench(user, O)) return @@ -1101,17 +1101,17 @@ src.updateUsrDialog() return 0 -/obj/machinery/reagentgrinder/attack_paw(mob/user as mob) +/obj/machinery/reagentgrinder/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/reagentgrinder/attack_ai(mob/user as mob) +/obj/machinery/reagentgrinder/attack_ai(mob/user) return 0 -/obj/machinery/reagentgrinder/attack_hand(mob/user as mob) +/obj/machinery/reagentgrinder/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/reagentgrinder/interact(mob/user as mob) // The microwave Menu +/obj/machinery/reagentgrinder/interact(mob/user) // The microwave Menu var/is_chamber_empty = 0 var/is_beaker_ready = 0 var/processing_chamber = "" @@ -1200,28 +1200,28 @@ holdingitems = list() updateUsrDialog() -/obj/machinery/reagentgrinder/proc/is_allowed(var/obj/item/weapon/reagent_containers/O) +/obj/machinery/reagentgrinder/proc/is_allowed(obj/item/weapon/reagent_containers/O) for (var/i in blend_items) if(istype(O, i)) return 1 return 0 -/obj/machinery/reagentgrinder/proc/get_allowed_by_id(var/obj/item/O) +/obj/machinery/reagentgrinder/proc/get_allowed_by_id(obj/item/O) for (var/i in blend_items) if (istype(O, i)) return blend_items[i] -/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(var/obj/item/weapon/reagent_containers/food/snacks/O) +/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(obj/item/weapon/reagent_containers/food/snacks/O) for(var/i in blend_items) if(istype(O, i)) return blend_items[i] -/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(var/obj/item/weapon/reagent_containers/food/snacks/O) +/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(obj/item/weapon/reagent_containers/food/snacks/O) for(var/i in juice_items) if(istype(O, i)) return juice_items[i] -/obj/machinery/reagentgrinder/proc/get_grownweapon_amount(var/obj/item/weapon/grown/O) +/obj/machinery/reagentgrinder/proc/get_grownweapon_amount(obj/item/weapon/grown/O) if (!istype(O)) return 5 else if (O.potency == -1) @@ -1229,7 +1229,7 @@ else return round(O.potency) -/obj/machinery/reagentgrinder/proc/get_juice_amount(var/obj/item/weapon/reagent_containers/food/snacks/grown/O) +/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/weapon/reagent_containers/food/snacks/grown/O) if (!istype(O)) return 5 else if (O.potency == -1) @@ -1237,7 +1237,7 @@ else return round(5*sqrt(O.potency)) -/obj/machinery/reagentgrinder/proc/remove_object(var/obj/item/O) +/obj/machinery/reagentgrinder/proc/remove_object(obj/item/O) holdingitems -= O qdel(O) @@ -1446,7 +1446,7 @@ stat |= NOPOWER SSnano.update_uis(src) -/obj/machinery/chem_heater/attackby(var/obj/item/I as obj, var/mob/user as mob, params) +/obj/machinery/chem_heater/attackby(obj/item/I, mob/user, params) if(isrobot(user)) return @@ -1474,7 +1474,7 @@ default_deconstruction_crowbar(I) return 1 -/obj/machinery/chem_heater/attack_hand(var/mob/user as mob) +/obj/machinery/chem_heater/attack_hand(mob/user) ui_interact(user) /obj/machinery/chem_heater/Topic(href, href_list) @@ -1499,7 +1499,7 @@ eject_beaker() . = 0 //updated in eject_beaker() already -/obj/machinery/chem_heater/ui_interact(var/mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(user.stat || user.restrained()) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "chem_heater.tmpl", "ChemHeater", 350, 270, 0) @@ -1536,7 +1536,7 @@ uiname = "Soda Dispenser" dispensable_reagents = list("water","ice","coffee","cream","tea","icetea","cola","spacemountainwind","dr_gibb","space_up","tonic","sodawater","lemon_lime","sugar","orangejuice","limejuice","tomatojuice") -/obj/machinery/chem_dispenser/drinks/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/machinery/chem_dispenser/drinks/attackby(obj/item/O, mob/user) if(default_unfasten_wrench(user, O)) return diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 5fe6dc7e8fa..c89a5d434eb 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -34,7 +34,7 @@ ..() holder = null -/datum/reagent/proc/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume, var/show_message = 1, var/touch_protection = 0) +/datum/reagent/proc/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1, touch_protection = 0) if(!istype(M)) return 0 var/datum/reagent/self = src @@ -48,15 +48,15 @@ M.reagents.add_reagent(self.id, amount) return 1 -/datum/reagent/proc/reaction_obj(var/obj/O, var/volume) +/datum/reagent/proc/reaction_obj(obj/O, volume) src = null return -/datum/reagent/proc/reaction_turf(var/turf/T, var/volume) +/datum/reagent/proc/reaction_turf(turf/T, volume) src = null return -/datum/reagent/proc/on_mob_life(var/mob/living/M as mob) +/datum/reagent/proc/on_mob_life(mob/living/M) current_cycle++ if(!istype(M, /mob/living)) return //Noticed runtime errors from facid trying to damage ghosts, this should fix. --NEO @@ -67,52 +67,52 @@ /datum/reagent/proc/on_mob_delete(mob/M) return -/datum/reagent/proc/on_move(var/mob/M) +/datum/reagent/proc/on_move(mob/M) return // Called after add_reagents creates a new reagent. -/datum/reagent/proc/on_new(var/data) +/datum/reagent/proc/on_new(data) return // Called when two reagents of the same are mixing. -/datum/reagent/proc/on_merge(var/data) +/datum/reagent/proc/on_merge(data) return -/datum/reagent/proc/on_update(var/atom/A) +/datum/reagent/proc/on_update(atom/A) return // Called every time reagent containers process. -/datum/reagent/proc/on_tick(var/data) +/datum/reagent/proc/on_tick(data) return // Called when the reagent container is hit by an explosion -/datum/reagent/proc/on_ex_act(var/severity) +/datum/reagent/proc/on_ex_act(severity) return // Called if the reagent has passed the overdose threshold and is set to be triggering overdose effects -/datum/reagent/proc/overdose_process(var/mob/living/M as mob) +/datum/reagent/proc/overdose_process(mob/living/M) return -/datum/reagent/proc/overdose_start(var/mob/living/M as mob) +/datum/reagent/proc/overdose_start(mob/living/M) M << "You feel like you took too much of [name]!" return -/datum/reagent/proc/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/proc/addiction_act_stage1(mob/living/M) if(prob(30)) M << "You feel like some [name] right about now." return -/datum/reagent/proc/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/proc/addiction_act_stage2(mob/living/M) if(prob(30)) M << "You feel like you need [name]. You just can't get enough." return -/datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/proc/addiction_act_stage3(mob/living/M) if(prob(30)) M << "You have an intense craving for [name]." return -/datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob) +/datum/reagent/proc/addiction_act_stage4(mob/living/M) if(prob(30)) M << "You're not feeling good at all! You really need some [name]." return diff --git a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm index 19826ce0d21..d181130314c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm @@ -11,7 +11,7 @@ color = "#B68D00" message = "The blob splashes you with burning oil" -/datum/reagent/blob/boiling_oil/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/boiling_oil/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(15*ratio, BURN) @@ -27,7 +27,7 @@ color = "#008000" message_living = ", and you feel sick and nauseated" -/datum/reagent/blob/toxic_goop/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/toxic_goop/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(20*ratio, TOX) @@ -39,7 +39,7 @@ color = "#FF4C4C" message_living = ", and you feel your skin ripping and tearing off" -/datum/reagent/blob/skin_ripper/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/skin_ripper/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(20*ratio, BRUTE) @@ -55,7 +55,7 @@ color = "#7F0000" message_living = ", and you feel your skin char and melt" -/datum/reagent/blob/skin_melter/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/skin_melter/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(10*ratio, BRUTE) @@ -72,7 +72,7 @@ color = "#00FFC5" message_living = ", and your lungs feel heavy and weak" -/datum/reagent/blob/lung_destroying_toxin/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/lung_destroying_toxin/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(20* ratio, OXY) @@ -88,7 +88,7 @@ color = "#00EE00" message_living = ", and your skin feels papery and everything hurts" -/datum/reagent/blob/radioactive_liquid/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/radioactive_liquid/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(10*ratio, BRUTE) @@ -108,7 +108,7 @@ color = "#61407E" message = "You feel a thrum as the blob strikes you, and everything flies at you" -/datum/reagent/blob/dark_matter/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/dark_matter/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(15*ratio, BRUTE) @@ -122,7 +122,7 @@ color = "#808000" message = "The blob slams into you, and sends you flying" -/datum/reagent/blob/b_sorium/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/b_sorium/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(15*ratio, BRUTE) @@ -136,7 +136,7 @@ color = "#FFA500" message = "The blob strikes you, and its tendrils explode" -/datum/reagent/blob/explosive/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/explosive/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 if(prob(75*ratio)) @@ -150,7 +150,7 @@ message = "The blob squirts something at you" message_living = ", and you feel great" -/datum/reagent/blob/omnizine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/omnizine/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.reagents.add_reagent("omnizine", 11*ratio) @@ -163,7 +163,7 @@ message = "The blob squirts something at you" message_living = ", and you feel funny" -/datum/reagent/blob/spacedrugs/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/spacedrugs/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.hallucination += 20*ratio @@ -171,7 +171,7 @@ M.apply_damage(10*ratio, TOX) -/datum/reagent/blob/proc/reagent_vortex(var/mob/living/M as mob, var/setting_type) +/datum/reagent/blob/proc/reagent_vortex(mob/living/M, setting_type) var/turf/pull = get_turf(M) for(var/atom/movable/X in range(4,pull)) if(istype(X, /atom/movable)) @@ -184,7 +184,7 @@ else X.throw_at(pull) -/datum/reagent/blob/proc/send_message(var/mob/living/M as mob) +/datum/reagent/blob/proc/send_message(mob/living/M) var/totalmessage = message if(message_living && !issilicon(M)) totalmessage += message_living diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm index 7a0b91da733..df637f4eab8 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm @@ -21,7 +21,7 @@ nutriment_factor = 0 var/boozepwr = 10 //lower numbers mean the booze will have an effect faster. -/datum/reagent/consumable/ethanol/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/on_mob_life(mob/living/M) M.jitteriness = max(M.jitteriness-5,0) if(current_cycle >= boozepwr) if (!M.slurring) M.slurring = 1 @@ -34,7 +34,7 @@ M.adjustToxLoss(2) ..() return -/datum/reagent/consumable/ethanol/reaction_obj(var/obj/O, var/volume) +/datum/reagent/consumable/ethanol/reaction_obj(obj/O, volume) if(istype(O,/obj/item/weapon/paper)) var/obj/item/weapon/paper/paperaffected = O paperaffected.clearpaper() @@ -48,7 +48,7 @@ usr << "It wasn't enough..." return -/datum/reagent/consumable/ethanol/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with ethanol isn't quite as good as fuel. +/datum/reagent/consumable/ethanol/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with ethanol isn't quite as good as fuel. if(!istype(M, /mob/living)) return if(method == TOUCH) @@ -76,7 +76,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 45 -/datum/reagent/consumable/ethanol/kahlua/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping-2) @@ -99,7 +99,7 @@ nutriment_factor = 1 * REAGENTS_METABOLISM boozepwr = 35 -/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/M) M.drowsyness = max(0,M.drowsyness-7) M.sleeping = max(0,M.sleeping-2) if (M.bodytemperature > 310) @@ -115,7 +115,7 @@ color = "#0064C8" // rgb: 0, 100, 200 boozepwr = 35 -/datum/reagent/consumable/ethanol/vodka/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/M) M.radiation = max(M.radiation-2,0) ..() return @@ -128,7 +128,7 @@ nutriment_factor = 2 * REAGENTS_METABOLISM boozepwr = 55 -/datum/reagent/consumable/ethanol/bilk/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/M) if(M.getBruteLoss() && prob(10)) M.heal_organ_damage(1,0) ..() @@ -141,7 +141,7 @@ color = "#666340" // rgb: 102, 99, 64 boozepwr = 15 -/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 50) ..() return @@ -314,7 +314,7 @@ boozepwr = 25 metabolization_rate = 0.8 -/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M) M.Stun(1) ..() return @@ -389,7 +389,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 15 -/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 30) ..() return @@ -408,7 +408,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 25 -/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M) if (M.bodytemperature < 330) M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -470,7 +470,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 35 -/datum/reagent/consumable/ethanol/sbiten/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M) if (M.bodytemperature < 360) M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -505,7 +505,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 55 -/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M) if(M.bodytemperature > 270) M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -597,7 +597,7 @@ color = "#FFFF91" // rgb: 255, 255, 140 boozepwr = 25 -/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/M) if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) ) M.heal_organ_damage(1,1) ..() @@ -611,7 +611,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 15 -/datum/reagent/consumable/ethanol/silencer/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/M) if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) M.heal_organ_damage(1,1) ..() diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm index 7ef486912ea..89c9a9a54c4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm @@ -10,7 +10,7 @@ description = "Both delicious AND rich in Vitamin C, what more do you need?" color = "#E78108" // rgb: 231, 129, 8 -/datum/reagent/consumable/orangejuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/M) if(M.getOxyLoss() && prob(30)) M.adjustOxyLoss(-1) ..() @@ -22,7 +22,7 @@ description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" color = "#731008" // rgb: 115, 16, 8 -/datum/reagent/consumable/tomatojuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/M) if(M.getFireLoss() && prob(20)) M.heal_organ_damage(0,1) ..() @@ -34,7 +34,7 @@ description = "The sweet-sour juice of limes." color = "#365E30" // rgb: 54, 94, 48 -/datum/reagent/consumable/limejuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/limejuice/on_mob_life(mob/living/M) if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1*REM) ..() @@ -46,7 +46,7 @@ description = "It is just like a carrot but without crunching." color = "#973800" // rgb: 151, 56, 0 -/datum/reagent/consumable/carrotjuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/M) M.eye_blurry = max(M.eye_blurry-1 , 0) M.eye_blind = max(M.eye_blind-1 , 0) switch(current_cycle) @@ -70,7 +70,7 @@ description = "A tasty juice blended from various kinds of very deadly and toxic berries." color = "#863353" // rgb: 134, 51, 83 -/datum/reagent/consumable/poisonberryjuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/M) M.adjustToxLoss(1) ..() return @@ -93,7 +93,7 @@ description = "The raw essence of a banana. HONK" color = "#863333" // rgb: 175, 175, 0 -/datum/reagent/consumable/banana/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/banana/on_mob_life(mob/living/M) if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) ) M.heal_organ_damage(1,1) ..() @@ -103,7 +103,7 @@ id = "nothing" description = "Absolutely nothing." -/datum/reagent/consumable/nothing/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/nothing/on_mob_life(mob/living/M) if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) M.heal_organ_damage(1,1) ..() @@ -121,7 +121,7 @@ description = "An opaque white liquid produced by the mammary glands of mammals." color = "#DFDFDF" // rgb: 223, 223, 223 -/datum/reagent/consumable/milk/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/milk/on_mob_life(mob/living/M) if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) if(holder.has_reagent("capsaicin")) @@ -135,7 +135,7 @@ description = "An opaque white liquid made from soybeans." color = "#DFDFC7" // rgb: 223, 223, 199 -/datum/reagent/consumable/soymilk/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/soymilk/on_mob_life(mob/living/M) if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) ..() @@ -147,7 +147,7 @@ description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" color = "#DFD7AF" // rgb: 223, 215, 175 -/datum/reagent/consumable/cream/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/cream/on_mob_life(mob/living/M) if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) ..() @@ -161,11 +161,11 @@ nutriment_factor = 0 overdose_threshold = 80 -/datum/reagent/consumable/coffee/overdose_process(var/mob/living/M as mob) +/datum/reagent/consumable/coffee/overdose_process(mob/living/M) M.Jitter(5) ..() -/datum/reagent/consumable/coffee/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/coffee/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping - 2) @@ -182,7 +182,7 @@ color = "#101000" // rgb: 16, 16, 0 nutriment_factor = 0 -/datum/reagent/consumable/tea/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/tea/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-2) M.drowsyness = max(0,M.drowsyness-1) M.jitteriness = max(0,M.jitteriness-3) @@ -201,7 +201,7 @@ color = "#102838" // rgb: 16, 40, 56 nutriment_factor = 0 -/datum/reagent/consumable/icecoffee/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping-2) @@ -218,7 +218,7 @@ color = "#104038" // rgb: 16, 64, 56 nutriment_factor = 0 -/datum/reagent/consumable/icetea/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/icetea/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-2) M.drowsyness = max(0,M.drowsyness-1) M.sleeping = max(0,M.sleeping-2) @@ -235,7 +235,7 @@ description = "A refreshing beverage." color = "#100800" // rgb: 16, 8, 0 -/datum/reagent/consumable/space_cola/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/space_cola/on_mob_life(mob/living/M) M.drowsyness = max(0,M.drowsyness-5) if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) @@ -248,7 +248,7 @@ description = "Cola, cola never changes." color = "#100800" // rgb: 16, 8, 0 -/datum/reagent/consumable/nuka_cola/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/M) M.Jitter(20) M.druggy = max(M.druggy, 30) M.dizziness +=5 @@ -266,7 +266,7 @@ description = "Blows right through you like a space wind." color = "#102000" // rgb: 16, 32, 0 -/datum/reagent/consumable/spacemountainwind/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/M) M.drowsyness = max(0,M.drowsyness-7) M.sleeping = max(0,M.sleeping-1) if (M.bodytemperature > 310) @@ -281,7 +281,7 @@ description = "A delicious blend of 42 different flavours" color = "#102000" // rgb: 16, 32, 0 -/datum/reagent/consumable/dr_gibb/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/M) M.drowsyness = max(0,M.drowsyness-6) if (M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 @@ -294,7 +294,7 @@ description = "Tastes like a hull breach in your mouth." color = "#00FF00" // rgb: 0, 255, 0 -/datum/reagent/consumable/space_up/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/space_up/on_mob_life(mob/living/M) if (M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -306,7 +306,7 @@ id = "lemon_lime" color = "#8CFF00" // rgb: 135, 255, 0 -/datum/reagent/consumable/lemon_lime/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/M) if (M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -318,7 +318,7 @@ description = "A can of club soda. Why not make a scotch and soda?" color = "#619494" // rgb: 97, 148, 148 -/datum/reagent/consumable/sodawater/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/sodawater/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) if (M.bodytemperature > 310) @@ -332,7 +332,7 @@ description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." color = "#0064C8" // rgb: 0, 100, 200 -/datum/reagent/consumable/tonic/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/tonic/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping-2) @@ -348,7 +348,7 @@ reagent_state = SOLID color = "#619494" // rgb: 97, 148, 148 -/datum/reagent/consumable/ice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ice/on_mob_life(mob/living/M) M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT ..() return @@ -359,7 +359,7 @@ description = "A nice and tasty beverage while you are reading your hippie books." color = "#664300" // rgb: 102, 67, 0 -/datum/reagent/consumable/soy_latte/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = 0 @@ -377,7 +377,7 @@ description = "A nice, strong and tasty beverage while you are reading." color = "#664300" // rgb: 102, 67, 0 -/datum/reagent/consumable/cafe_latte/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = 0 @@ -464,7 +464,7 @@ description = "Nuclear proliferation never tasted so good." color = "#666300" // rgb: 102, 99, 0 -/datum/reagent/consumable/atomicbomb/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/atomicbomb/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 50) M.confused = max(M.confused+2,0) M.Dizzy(10) @@ -486,7 +486,7 @@ description = "Whoah, this stuff looks volatile!" color = "#664300" // rgb: 102, 67, 0 -/datum/reagent/consumable/gargle_blaster/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/gargle_blaster/on_mob_life(mob/living/M) M.dizziness +=6 switch(current_cycle) if(15 to 45) @@ -509,7 +509,7 @@ description = "A strong neurotoxin that puts the subject into a death-like state." color = "#2E2E61" // rgb: 46, 46, 97 -/datum/reagent/consumable/neurotoxin/on_mob_life(var/mob/living/carbon/M as mob) +/datum/reagent/consumable/neurotoxin/on_mob_life(mob/living/carbon/M) M.weakened = max(M.weakened, 3) M.dizziness +=6 switch(current_cycle) @@ -535,7 +535,7 @@ nutriment_factor = 0 metabolization_rate = 0.2 * REAGENTS_METABOLISM -/datum/reagent/consumable/hippies_delight/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/hippies_delight/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 50) switch(current_cycle) if(1 to 5) diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm index 64ac0c3278b..6ca5afcf052 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm @@ -12,7 +12,7 @@ id = "consumable" var/nutriment_factor = 1 * REAGENTS_METABOLISM -/datum/reagent/consumable/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/on_mob_life(mob/living/M) current_cycle++ M.nutrition += nutriment_factor holder.remove_reagent(src.id, metabolization_rate) @@ -25,7 +25,7 @@ nutriment_factor = 15 * REAGENTS_METABOLISM color = "#664330" // rgb: 102, 67, 48 -/datum/reagent/consumable/nutriment/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/nutriment/on_mob_life(mob/living/M) if(prob(50)) M.heal_organ_damage(1,0) ..() @@ -38,7 +38,7 @@ reagent_state = SOLID color = "#664330" // rgb: 102, 67, 48 -/datum/reagent/consumable/vitamin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/vitamin/on_mob_life(mob/living/M) if(prob(50)) M.heal_organ_damage(1,1) if(M.satiety < 600) @@ -56,12 +56,12 @@ metabolization_rate = 2 * REAGENTS_METABOLISM overdose_threshold = 200 // Hyperglycaemic shock -/datum/reagent/consumable/sugar/overdose_start(var/mob/living/M as mob) +/datum/reagent/consumable/sugar/overdose_start(mob/living/M) M << "You go into hyperglycaemic shock! Lay off the twinkies!" M.sleeping += 30 return -/datum/reagent/consumable/sugar/overdose_process(var/mob/living/M as mob) +/datum/reagent/consumable/sugar/overdose_process(mob/living/M) M.sleeping += 3 ..() return @@ -94,7 +94,7 @@ description = "This is what makes chilis hot." color = "#B31008" // rgb: 179, 16, 8 -/datum/reagent/consumable/capsaicin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 15) M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT @@ -123,7 +123,7 @@ description = "A special oil that noticably chills the body. Extraced from Icepeppers." color = "#B31008" // rgb: 139, 166, 233 -/datum/reagent/consumable/frostoil/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/frostoil/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 15) M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT @@ -150,7 +150,7 @@ ..() return -/datum/reagent/consumable/frostoil/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/consumable/frostoil/reaction_turf(turf/simulated/T, volume) if(volume >= 5) for(var/mob/living/simple_animal/slime/M in T) M.adjustToxLoss(rand(15,30)) @@ -163,7 +163,7 @@ description = "A chemical agent used for self-defense and in police work." color = "#B31008" // rgb: 179, 16, 8 -/datum/reagent/consumable/condensedcapsaicin/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/consumable/condensedcapsaicin/reaction_mob(mob/living/M, method=TOUCH, volume) if(!istype(M, /mob/living/carbon/human) && !istype(M, /mob/living/carbon/monkey)) return @@ -225,7 +225,7 @@ victim.Weaken(5) victim.drop_item() -/datum/reagent/consumable/condensedcapsaicin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/M) if(prob(5)) M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]") ..() @@ -260,7 +260,7 @@ nutriment_factor = 3 * REAGENTS_METABOLISM color = "#403010" // rgb: 64, 48, 16 -/datum/reagent/consumable/hot_coco/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M) if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() @@ -273,7 +273,7 @@ color = "#E700E7" // rgb: 231, 0, 231 metabolization_rate = 0.2 * REAGENTS_METABOLISM -/datum/reagent/mushroomhallucinogen/on_mob_life(var/mob/living/M as mob) +/datum/reagent/mushroomhallucinogen/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 30) switch(current_cycle) if(1 to 5) @@ -307,7 +307,7 @@ description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." color = "#FF00FF" // rgb: 255, 0, 255 -/datum/reagent/consumable/sprinkles/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M) if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden")) M.heal_organ_damage(1,1) ..() @@ -321,7 +321,7 @@ nutriment_factor = 20 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 -/datum/reagent/consumable/cornoil/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/consumable/cornoil/reaction_turf(turf/simulated/T, volume) if (!istype(T)) return src = null @@ -355,7 +355,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 -/datum/reagent/consumable/hot_ramen/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/M) if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() @@ -368,7 +368,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 -/datum/reagent/consumable/hell_ramen/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/M) M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT ..() return @@ -380,7 +380,7 @@ reagent_state = SOLID color = "#FFFFFF" // rgb: 0, 0, 0 -/datum/reagent/consumable/flour/reaction_turf(var/turf/T, var/volume) +/datum/reagent/consumable/flour/reaction_turf(turf/T, volume) src = null if(!istype(T, /turf/space)) var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/flour(T) @@ -432,7 +432,7 @@ description = "Decays into sugar." color = "#C8A5DC" -/datum/reagent/consumable/corn_syrup/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 3) M.reagents.remove_reagent("corn_syrup", 1) ..() diff --git a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm index c21cdf68b33..a4854c28153 100644 --- a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm @@ -12,7 +12,7 @@ color = "#60A584" // rgb: 96, 165, 132 overdose_threshold = 30 -/datum/reagent/drug/space_drugs/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/space_drugs/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 15) if(isturf(M.loc) && !istype(M.loc, /turf/space)) if(M.canmove) @@ -22,11 +22,11 @@ ..() return -/datum/reagent/drug/space_drugs/overdose_start(var/mob/living/M as mob) +/datum/reagent/drug/space_drugs/overdose_start(mob/living/M) M << "You start tripping hard!" -/datum/reagent/drug/space_drugs/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/space_drugs/overdose_process(mob/living/M) if(M.hallucination < volume && prob(20)) M.hallucination += 5 ..() @@ -40,7 +40,7 @@ color = "#60A584" // rgb: 96, 165, 132 addiction_threshold = 30 -/datum/reagent/drug/nicotine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/nicotine/on_mob_life(mob/living/M) if(prob(1)) var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.") M << "[smoke_message]" @@ -57,7 +57,7 @@ overdose_threshold = 20 addiction_threshold = 10 -/datum/reagent/drug/crank/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/crank/on_mob_life(mob/living/M) var/high_message = pick("You feel jittery.", "You feel like you gotta go fast.", "You feel like you need to step it up.") if(prob(5)) M << "[high_message]" @@ -66,25 +66,25 @@ M.AdjustWeakened(-1) ..() -/datum/reagent/drug/crank/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/crank/overdose_process(mob/living/M) M.adjustBrainLoss(2*REM) M.adjustToxLoss(2*REM) M.adjustBruteLoss(2*REM) ..() -/datum/reagent/drug/crank/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/drug/crank/addiction_act_stage1(mob/living/M) M.adjustBrainLoss(5*REM) ..() -/datum/reagent/drug/crank/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/drug/crank/addiction_act_stage2(mob/living/M) M.adjustToxLoss(5*REM) ..() -/datum/reagent/drug/crank/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/drug/crank/addiction_act_stage3(mob/living/M) M.adjustBruteLoss(5*REM) ..() -/datum/reagent/drug/crank/addiction_act_stage4(var/mob/living/M as mob) +/datum/reagent/drug/crank/addiction_act_stage4(mob/living/M) M.adjustBrainLoss(5*REM) M.adjustToxLoss(5*REM) M.adjustBruteLoss(5*REM) @@ -100,38 +100,38 @@ addiction_threshold = 15 -/datum/reagent/drug/krokodil/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/krokodil/on_mob_life(mob/living/M) var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.") if(prob(5)) M << "[high_message]" ..() return -/datum/reagent/drug/krokodil/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/krokodil/overdose_process(mob/living/M) M.adjustBrainLoss(0.25*REM) M.adjustToxLoss(0.25*REM) ..() return -/datum/reagent/drug/krokodil/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/drug/krokodil/addiction_act_stage1(mob/living/M) M.adjustBrainLoss(2*REM) M.adjustToxLoss(2*REM) ..() return -/datum/reagent/krokodil/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/krokodil/addiction_act_stage2(mob/living/M) if(prob(25)) M << "Your skin feels loose..." ..() return -/datum/reagent/drug/krokodil/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/drug/krokodil/addiction_act_stage3(mob/living/M) if(prob(25)) M << "Your skin starts to peel away..." M.adjustBruteLoss(3*REM) ..() return -/datum/reagent/drug/krokodil/addiction_act_stage4(var/mob/living/carbon/human/M as mob) +/datum/reagent/drug/krokodil/addiction_act_stage4(mob/living/carbon/human/M) if(!istype(M.dna.species, /datum/species/cosmetic_zombie)) M << "Your skin falls off easily!" M.adjustBruteLoss(50*REM) // holy shit your skin just FELL THE FUCK OFF @@ -151,7 +151,7 @@ addiction_threshold = 10 metabolization_rate = 0.75 * REAGENTS_METABOLISM -/datum/reagent/drug/methamphetamine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/M) var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.") if(prob(5)) M << "[high_message]" @@ -167,7 +167,7 @@ ..() return -/datum/reagent/drug/methamphetamine/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/overdose_process(mob/living/M) if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 4, i++) step(M, pick(cardinal)) @@ -183,20 +183,20 @@ M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1)) return -/datum/reagent/drug/methamphetamine/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/addiction_act_stage1(mob/living/M) M.Jitter(5) if(prob(20)) M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/methamphetamine/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/addiction_act_stage2(mob/living/M) M.Jitter(10) M.Dizzy(10) if(prob(30)) M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/methamphetamine/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/addiction_act_stage3(mob/living/M) if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 4, i++) step(M, pick(cardinal)) @@ -206,7 +206,7 @@ M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/methamphetamine/addiction_act_stage4(var/mob/living/carbon/human/M as mob) +/datum/reagent/drug/methamphetamine/addiction_act_stage4(mob/living/carbon/human/M) if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 8, i++) step(M, pick(cardinal)) @@ -228,7 +228,7 @@ addiction_threshold = 10 -/datum/reagent/drug/bath_salts/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/on_mob_life(mob/living/M) var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") if(prob(5)) M << "[high_message]" @@ -245,7 +245,7 @@ ..() return -/datum/reagent/drug/bath_salts/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/overdose_process(mob/living/M) M.hallucination += 10 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 8, i++) @@ -259,7 +259,7 @@ ..() return -/datum/reagent/drug/bath_salts/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/addiction_act_stage1(mob/living/M) M.hallucination += 10 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 8, i++) @@ -270,7 +270,7 @@ M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/bath_salts/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/addiction_act_stage2(mob/living/M) M.hallucination += 20 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 8, i++) @@ -282,7 +282,7 @@ M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/bath_salts/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/addiction_act_stage3(mob/living/M) M.hallucination += 30 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 12, i++) @@ -294,7 +294,7 @@ M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/bath_salts/addiction_act_stage4(var/mob/living/carbon/human/M as mob) +/datum/reagent/drug/bath_salts/addiction_act_stage4(mob/living/carbon/human/M) M.hallucination += 40 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 16, i++) @@ -315,7 +315,7 @@ reagent_state = LIQUID color = "#60A584" // rgb: 96, 165, 132 -/datum/reagent/drug/aranesp/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/aranesp/on_mob_life(mob/living/M) var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") if(prob(5)) M << "[high_message]" diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm index f0e16a9924c..38290e992d5 100644 --- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm @@ -9,7 +9,7 @@ name = "Medicine" id = "medicine" -/datum/reagent/medicine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/on_mob_life(mob/living/M) current_cycle++ holder.remove_reagent(src.id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism @@ -19,7 +19,7 @@ description = "Leporazine can be use to stabilize an individuals body temperature." color = "#C8A5DC" // rgb: 200, 165, 220 -/datum/reagent/medicine/leporazine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/leporazine/on_mob_life(mob/living/M) if(M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) else if(M.bodytemperature < 311) @@ -32,7 +32,7 @@ description = "It's magic. We don't have to explain it." color = "#C8A5DC" // rgb: 200, 165, 220 -/datum/reagent/medicine/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob) +/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M) M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1) M.setCloneLoss(0) M.setOxyLoss(0) @@ -76,7 +76,7 @@ description = "Synaptizine is used to treat various diseases." color = "#C8A5DC" // rgb: 200, 165, 220 -/datum/reagent/medicine/synaptizine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/M) M.drowsyness = max(M.drowsyness-5, 0) M.AdjustParalysis(-1) M.AdjustStunned(-1) @@ -94,7 +94,7 @@ description = "Heals ear damage." color = "#6600FF" // rgb: 100, 165, 255 -/datum/reagent/medicine/inacusiate/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/M) M.setEarDamage(0,0) ..() return @@ -105,7 +105,7 @@ description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." color = "#0000C8" -/datum/reagent/medicine/cryoxadone/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/M) if(M.stat != DEAD && M.bodytemperature < 270) M.adjustCloneLoss(-4) M.adjustOxyLoss(-10) @@ -124,7 +124,7 @@ reagent_state = SOLID color = "#669900" // rgb: 102, 153, 0 -/datum/reagent/medicine/rezadone/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/rezadone/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 15) M.adjustCloneLoss(-1) @@ -163,7 +163,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1) +/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1) if(iscarbon(M)) if(method == TOUCH) M.adjustFireLoss(-volume) @@ -177,7 +177,7 @@ ..() return -/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M) M.adjustFireLoss(-2*REM) ..() return @@ -189,7 +189,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/medicine/styptic_powder/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1) +/datum/reagent/medicine/styptic_powder/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1) if(iscarbon(M)) if(method == TOUCH) M.adjustBruteLoss(-volume) @@ -204,7 +204,7 @@ ..() return -/datum/reagent/medicine/styptic_powder/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/M) M.adjustBruteLoss(-2*REM) ..() return @@ -217,7 +217,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/salglu_solution/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M) if(prob(33)) M.adjustBruteLoss(-0.5*REM) M.adjustFireLoss(-0.5*REM) @@ -231,7 +231,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/medicine/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume,var/show_message = 1) +/datum/reagent/medicine/synthflesh/reaction_mob(mob/living/M, method=TOUCH, volume,show_message = 1) if(iscarbon(M)) if(method == TOUCH) M.adjustBruteLoss(-1.5*volume) @@ -249,7 +249,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/charcoal/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/charcoal/on_mob_life(mob/living/M) M.adjustToxLoss(-2*REM) for(var/datum/reagent/R in M.reagents.reagent_list) if(R != src) @@ -266,7 +266,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM overdose_threshold = 30 -/datum/reagent/medicine/omnizine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/omnizine/on_mob_life(mob/living/M) M.adjustToxLoss(-0.5*REM) M.adjustOxyLoss(-0.5*REM) M.adjustBruteLoss(-0.5*REM) @@ -274,7 +274,7 @@ ..() return -/datum/reagent/medicine/omnizine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/omnizine/overdose_process(mob/living/M) M.adjustToxLoss(1.5*REM) M.adjustOxyLoss(1.5*REM) M.adjustBruteLoss(1.5*REM) @@ -290,7 +290,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/calomel/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/calomel/on_mob_life(mob/living/M) for(var/datum/reagent/R in M.reagents.reagent_list) if(R != src) M.reagents.remove_reagent(R.id,2.5) @@ -307,7 +307,7 @@ color = "#C8A5DC" metabolization_rate = 2 * REAGENTS_METABOLISM -/datum/reagent/medicine/potass_iodide/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M) if(M.radiation > 0) M.radiation-- if(M.radiation < 0) @@ -323,7 +323,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/pen_acid/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M) if(M.radiation > 0) M.radiation -= 4 M.adjustToxLoss(-2*REM) @@ -346,13 +346,13 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM overdose_threshold = 25 -/datum/reagent/medicine/sal_acid/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M) if(M.getBruteLoss() < 50) M.adjustBruteLoss(-0.25*REM) ..() return -/datum/reagent/medicine/sal_acid/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/sal_acid/overdose_process(mob/living/M) if(M.getBruteLoss() < 50) M.adjustBruteLoss(0.5*REM) ..() @@ -366,7 +366,7 @@ color = "#C8A5DC" metabolization_rate = 0.25 * REAGENTS_METABOLISM -/datum/reagent/medicine/salbutamol/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/M) M.adjustOxyLoss(-3*REM) if(M.losebreath >= 4) M.losebreath -= 2 @@ -381,7 +381,7 @@ color = "#C8A5DC" metabolization_rate = 0.25 * REAGENTS_METABOLISM -/datum/reagent/medicine/perfluorodecalin/on_mob_life(var/mob/living/carbon/human/M as mob) +/datum/reagent/medicine/perfluorodecalin/on_mob_life(mob/living/carbon/human/M) M.adjustOxyLoss(-12*REM) M.silent = max(M.silent, 5) if(prob(33)) @@ -400,7 +400,7 @@ overdose_threshold = 45 addiction_threshold = 30 -/datum/reagent/medicine/ephedrine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/M) M.status_flags |= GOTTAGOFAST M.AdjustParalysis(-1) M.AdjustStunned(-1) @@ -409,32 +409,32 @@ ..() return -/datum/reagent/medicine/ephedrine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/overdose_process(mob/living/M) if(prob(33)) M.adjustToxLoss(0.5*REM) M.losebreath++ ..() return -/datum/reagent/medicine/ephedrine/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/addiction_act_stage1(mob/living/M) if(prob(33)) M.adjustToxLoss(2*REM) M.losebreath += 2 ..() return -/datum/reagent/medicine/ephedrine/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/addiction_act_stage2(mob/living/M) if(prob(33)) M.adjustToxLoss(3*REM) M.losebreath += 3 ..() return -/datum/reagent/medicine/ephedrine/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/addiction_act_stage3(mob/living/M) if(prob(33)) M.adjustToxLoss(4*REM) M.losebreath += 4 ..() return -/datum/reagent/medicine/ephedrine/addiction_act_stage4(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/addiction_act_stage4(mob/living/M) if(prob(33)) M.adjustToxLoss(5*REM) M.losebreath += 5 @@ -449,7 +449,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/diphenhydramine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/M) if(prob(50)) M.drowsyness += 1 M.jitteriness -= 1 @@ -468,14 +468,14 @@ addiction_threshold = 25 -/datum/reagent/medicine/morphine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/on_mob_life(mob/living/M) M.status_flags |= IGNORESLOWDOWN if(current_cycle >= 12) M.sleeping += 1 ..() return -/datum/reagent/medicine/morphine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/overdose_process(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -485,7 +485,7 @@ ..() return -/datum/reagent/medicine/morphine/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/addiction_act_stage1(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -494,7 +494,7 @@ M.Jitter(2) ..() return -/datum/reagent/medicine/morphine/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/addiction_act_stage2(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -504,7 +504,7 @@ M.Jitter(3) ..() return -/datum/reagent/medicine/morphine/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/addiction_act_stage3(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -514,7 +514,7 @@ M.Jitter(4) ..() return -/datum/reagent/medicine/morphine/addiction_act_stage4(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/addiction_act_stage4(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -533,7 +533,7 @@ color = "#C8A5DC" metabolization_rate = 0.25 * REAGENTS_METABOLISM -/datum/reagent/medicine/oculine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/oculine/on_mob_life(mob/living/M) if(M.eye_blind > 0 && current_cycle > 20) if(prob(30)) M.eye_blind = 0 @@ -555,7 +555,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM overdose_threshold = 35 -/datum/reagent/medicine/atropine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/atropine/on_mob_life(mob/living/M) if(M.health > -60) M.adjustToxLoss(0.5*REM) if(M.health < -25) @@ -571,7 +571,7 @@ ..() return -/datum/reagent/medicine/atropine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/atropine/overdose_process(mob/living/M) M.adjustToxLoss(0.5*REM) M.Dizzy(1) M.Jitter(1) @@ -587,7 +587,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM overdose_threshold = 30 -/datum/reagent/medicine/epinephrine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/M) if(M.health < -10 && M.health > -65) M.adjustToxLoss(-0.5*REM) M.adjustBruteLoss(-0.5*REM) @@ -606,7 +606,7 @@ ..() return -/datum/reagent/medicine/epinephrine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/epinephrine/overdose_process(mob/living/M) if(prob(33)) M.adjustStaminaLoss(2.5*REM) M.adjustToxLoss(1*REM) @@ -622,7 +622,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/medicine/strange_reagent/reaction_mob(mob/living/carbon/human/M, method=TOUCH, volume) if(M.stat == DEAD) if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100) M.visible_message("[M]'s body convulses a bit, and then falls still once more.") @@ -644,7 +644,7 @@ ..() return -/datum/reagent/medicine/strange_reagent/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/M) M.adjustBruteLoss(0.5*REM) M.adjustFireLoss(0.5*REM) ..() @@ -656,7 +656,7 @@ description = "Heals brain damage effectively. Use it in cyro tubes alongside Cryoxadone." color = "#C8A5DC" -/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M as mob) +/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M) M.adjustBrainLoss(-3*REM) ..() return @@ -667,7 +667,7 @@ description = "Heals your genetic defects." color = "#C8A5DC" -/datum/reagent/medicine/mutadone/on_mob_life(var/mob/living/carbon/human/M as mob) +/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/human/M) M.jitteriness = 0 if(istype(M) && M.dna) M.dna.remove_all_mutations() @@ -680,7 +680,7 @@ description = "Helps remove Alcohol from someone's body, as well as eliminating its side effects." color = "#C8A5DC" -/datum/reagent/medicine/antihol/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/antihol/on_mob_life(mob/living/M) M.dizziness = 0 M.drowsyness = 0 M.slurring = 0 @@ -697,7 +697,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM overdose_threshold = 60 -/datum/reagent/medicine/stimulants/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/stimulants/on_mob_life(mob/living/M) M.status_flags |= GOTTAGOFAST if(M.health < 50 && M.health > 0) M.adjustOxyLoss(-1*REM) @@ -710,7 +710,7 @@ M.adjustStaminaLoss(-5*REM) ..() -/datum/reagent/medicine/stimulants/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/stimulants/overdose_process(mob/living/M) if(prob(33)) M.adjustStaminaLoss(2.5*REM) M.adjustToxLoss(1*REM) @@ -726,7 +726,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/insulin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/insulin/on_mob_life(mob/living/M) if(M.sleeping) M.sleeping-- M.reagents.remove_reagent("sugar", 3) @@ -741,12 +741,12 @@ datum/reagent/medicine/bicaridine color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/bicaridine/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M) M.adjustBruteLoss(-2*REM) ..() return -datum/reagent/medicine/bicaridine/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/bicaridine/overdose_process(mob/living/M) M.adjustBruteLoss(4*REM) // End result is 2 oxygen loss taken, because it heals 2 and then removes 4. ..() return @@ -759,12 +759,12 @@ datum/reagent/medicine/dexalin color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/dexalin/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/dexalin/on_mob_life(mob/living/M) M.adjustOxyLoss(-2*REM) ..() return -datum/reagent/medicine/dexalin/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/dexalin/overdose_process(mob/living/M) M.adjustOxyLoss(4*REM) // End result is 2 oxygen loss taken, because it heals 2 and then removes 4. ..() return @@ -777,12 +777,12 @@ datum/reagent/medicine/kelotane color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/kelotane/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/kelotane/on_mob_life(mob/living/M) M.adjustFireLoss(-2*REM) ..() return -datum/reagent/medicine/kelotane/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/kelotane/overdose_process(mob/living/M) M.adjustFireLoss(4*REM) // End result is 2 burn loss taken, because it heals 2 and then removes 4. ..() return @@ -796,7 +796,7 @@ datum/reagent/medicine/antitoxin color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/antitoxin/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/antitoxin/on_mob_life(mob/living/M) M.adjustToxLoss(-2*REM) for(var/datum/reagent/toxin/R in M.reagents.reagent_list) if(R != src) @@ -804,7 +804,7 @@ datum/reagent/medicine/antitoxin/on_mob_life(var/mob/living/M as mob) ..() return -datum/reagent/medicine/antitoxin/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/antitoxin/overdose_process(mob/living/M) M.adjustToxLoss(4*REM) // End result is 2 toxin loss taken, because it heals 2 and then removes 4. ..() return @@ -817,7 +817,7 @@ datum/reagent/medicine/inaprovaline reagent_state = LIQUID color = "#C8A5DC" -datum/reagent/medicine/inaprovaline/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/M) if(M.losebreath >= 5) M.losebreath -= 5 ..() @@ -831,7 +831,7 @@ datum/reagent/medicine/tricordrazine color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/tricordrazine/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/tricordrazine/on_mob_life(mob/living/M) if(prob(80)) M.adjustBruteLoss(-1*REM) M.adjustFireLoss(-1*REM) @@ -840,7 +840,7 @@ datum/reagent/medicine/tricordrazine/on_mob_life(var/mob/living/M as mob) ..() return -datum/reagent/medicine/tricordrazine/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/tricordrazine/overdose_process(mob/living/M) M.adjustToxLoss(2*REM) M.adjustOxyLoss(2*REM) M.adjustBruteLoss(2*REM) diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm index 8a9ecf7173f..923dfa759b9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm @@ -5,7 +5,7 @@ id = "blood" color = "#C80000" // rgb: 200, 0, 0 -/datum/reagent/blood/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/blood/reaction_mob(mob/M, method=TOUCH, volume) var/datum/reagent/blood/self = src src = null if(self.data && self.data["viruses"]) @@ -19,11 +19,11 @@ else //injected M.ForceContractDisease(D) -/datum/reagent/blood/on_new(var/list/data) +/datum/reagent/blood/on_new(list/data) if(istype(data)) SetViruses(src, data) -/datum/reagent/blood/on_merge(var/list/data) +/datum/reagent/blood/on_merge(list/data) if(src.data && data) src.data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc if(src.data["viruses"] || data["viruses"]) @@ -48,7 +48,7 @@ src.data["viruses"] = preserve return 1 -/datum/reagent/blood/reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place +/datum/reagent/blood/reaction_turf(turf/simulated/T, volume)//splash the blood all over the place if(!istype(T)) return var/datum/reagent/blood/self = src src = null @@ -93,7 +93,7 @@ id = "vaccine" color = "#C81040" // rgb: 200, 16, 64 -/datum/reagent/vaccine/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/vaccine/reaction_mob(mob/M, method=TOUCH, volume) var/datum/reagent/vaccine/self = src src = null if(islist(self.data) && method == INGEST) @@ -103,7 +103,7 @@ M.resistances |= self.data return -/datum/reagent/vaccine/on_merge(var/list/data) +/datum/reagent/vaccine/on_merge(list/data) if(istype(data)) src.data |= data.Copy() @@ -119,7 +119,7 @@ * Water reaction to turf */ -/datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/water/reaction_turf(turf/simulated/T, volume) if (!istype(T)) return var/CT = cooling_temperature src = null @@ -142,7 +142,7 @@ * Water reaction to an object */ -/datum/reagent/water/reaction_obj(var/obj/O, var/volume) +/datum/reagent/water/reaction_obj(obj/O, volume) src = null if(istype(O,/obj/item)) @@ -166,7 +166,7 @@ * Water reaction to a mob */ -/datum/reagent/water/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with water can help put them out! +/datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with water can help put them out! if(!istype(M, /mob/living)) return if(method == TOUCH) @@ -178,7 +178,7 @@ description = "Water blessed by some deity." color = "#E0E8EF" // rgb: 224, 232, 239 -/datum/reagent/water/holywater/on_mob_life(var/mob/living/M as mob) +/datum/reagent/water/holywater/on_mob_life(mob/living/M) if(!data) data = 1 data++ M.jitteriness = max(M.jitteriness-5,0) @@ -200,7 +200,7 @@ holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack return -/datum/reagent/water/holywater/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/water/holywater/reaction_turf(turf/simulated/T, volume) ..() if(!istype(T)) return if(volume>=10) @@ -213,7 +213,7 @@ id = "unholywater" description = "Something that shouldn't exist on this plane of existance." -/datum/reagent/fuel/unholywater/on_mob_life(var/mob/living/M as mob) +/datum/reagent/fuel/unholywater/on_mob_life(mob/living/M) M.adjustBrainLoss(3) if(iscultist(M)) M.status_flags |= GOTTAGOFAST @@ -233,7 +233,7 @@ id = "hell_water" description = "YOUR FLESH! IT BURNS!" -/datum/reagent/hellwater/on_mob_life(var/mob/living/M as mob) +/datum/reagent/hellwater/on_mob_life(mob/living/M) M.fire_stacks = min(5,M.fire_stacks + 3) M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire M.adjustToxLoss(1) @@ -247,7 +247,7 @@ description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity." color = "#009CA8" // rgb: 0, 156, 168 -/datum/reagent/lube/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/lube/reaction_turf(turf/simulated/T, volume) if (!istype(T)) return src = null if(volume >= 1) @@ -266,7 +266,7 @@ color = "#5EFF3B" //RGB: 94, 255, 59 metabolization_rate = INFINITY //So it instantly removes all of itself -/datum/reagent/unstableslimetoxin/on_mob_life(var/mob/living/carbon/human/H as mob) +/datum/reagent/unstableslimetoxin/on_mob_life(mob/living/carbon/human/H) ..() H << "You crumple in agony as your flesh wildly morphs into new forms!" H.visible_message("[H] falls to the ground and screams as their skin bubbles and froths!") //'froths' sounds painful when used with SKIN. @@ -293,7 +293,7 @@ description = "An advanced corruptive toxin produced by slimes." color = "#13BC5E" // rgb: 19, 188, 94 -/datum/reagent/aslimetoxin/reaction_mob(var/mob/M, var/volume) +/datum/reagent/aslimetoxin/reaction_mob(mob/M, volume) src = null M.ForceContractDisease(new /datum/disease/transformation/slime(0)) @@ -304,7 +304,7 @@ color = "#202040" // rgb: 20, 20, 40 metabolization_rate = 0.25 * REAGENTS_METABOLISM -/datum/reagent/serotrotium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/serotrotium/on_mob_life(mob/living/M) if(ishuman(M)) if(prob(7)) M.emote(pick("twitch","drool","moan","gasp")) ..() @@ -351,7 +351,7 @@ description = "A chemical element." color = "#484848" // rgb: 72, 72, 72 -/datum/reagent/mercury/on_mob_life(var/mob/living/M as mob) +/datum/reagent/mercury/on_mob_life(mob/living/M) if(M.canmove && istype(M.loc, /turf/space)) step(M, pick(cardinal)) if(prob(5)) @@ -374,7 +374,7 @@ reagent_state = SOLID color = "#1C1300" // rgb: 30, 20, 0 -/datum/reagent/carbon/reaction_turf(var/turf/T, var/volume) +/datum/reagent/carbon/reaction_turf(turf/T, volume) src = null if(!istype(T, /turf/space)) new /obj/effect/decal/cleanable/dirt(T) @@ -386,7 +386,7 @@ reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 -/datum/reagent/chlorine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/chlorine/on_mob_life(mob/living/M) M.take_organ_damage(1*REM, 0) ..() return @@ -398,7 +398,7 @@ reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 -/datum/reagent/fluorine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/fluorine/on_mob_life(mob/living/M) M.adjustToxLoss(1*REM) ..() return @@ -424,7 +424,7 @@ reagent_state = SOLID color = "#808080" // rgb: 128, 128, 128 -/datum/reagent/lithium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/lithium/on_mob_life(mob/living/M) if(M.canmove && istype(M.loc, /turf/space)) step(M, pick(cardinal)) if(prob(5)) @@ -445,12 +445,12 @@ reagent_state = SOLID color = "#C7C7C7" // rgb: 199,199,199 -/datum/reagent/radium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/radium/on_mob_life(mob/living/M) M.apply_effect(2*REM/M.metabolism_efficiency,IRRADIATE,0) ..() return -/datum/reagent/radium/reaction_turf(var/turf/T, var/volume) +/datum/reagent/radium/reaction_turf(turf/T, volume) src = null if(volume >= 3) if(!istype(T, /turf/space)) @@ -491,13 +491,13 @@ reagent_state = SOLID color = "#B8B8C0" // rgb: 184, 184, 192 -/datum/reagent/uranium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/uranium/on_mob_life(mob/living/M) M.apply_effect(1/M.metabolism_efficiency,IRRADIATE,0) ..() return -/datum/reagent/uranium/reaction_turf(var/turf/T, var/volume) +/datum/reagent/uranium/reaction_turf(turf/T, volume) src = null if(volume >= 3) if(!istype(T, /turf/space)) @@ -524,14 +524,14 @@ description = "Required for welders. Flamable." color = "#660000" // rgb: 102, 0, 0 -/datum/reagent/fuel/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with welding fuel to make them easy to ignite! +/datum/reagent/fuel/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with welding fuel to make them easy to ignite! if(!istype(M, /mob/living)) return if(method == TOUCH) M.adjust_fire_stacks(volume / 10) return -/datum/reagent/fuel/on_mob_life(var/mob/living/M as mob) +/datum/reagent/fuel/on_mob_life(mob/living/M) M.adjustToxLoss(1) ..() return @@ -542,14 +542,14 @@ description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" color = "#A5F0EE" // rgb: 165, 240, 238 -/datum/reagent/space_cleaner/reaction_obj(var/obj/O, var/volume) +/datum/reagent/space_cleaner/reaction_obj(obj/O, volume) if(istype(O,/obj/effect/decal/cleanable)) qdel(O) else if(O) O.clean_blood() -/datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume) +/datum/reagent/space_cleaner/reaction_turf(turf/T, volume) if(volume >= 1) T.clean_blood() for(var/obj/effect/decal/cleanable/C in T) @@ -562,7 +562,7 @@ if(volume >= 1) F.dirt = 0 -/datum/reagent/space_cleaner/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/space_cleaner/reaction_mob(mob/M, method=TOUCH, volume) if(iscarbon(M)) var/mob/living/carbon/C = M if(istype(M,/mob/living/carbon/human)) @@ -600,7 +600,7 @@ color = "#C8A5DC" // rgb: 200, 165, 220 metabolization_rate = 1.5 * REAGENTS_METABOLISM -/datum/reagent/cryptobiolin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/cryptobiolin/on_mob_life(mob/living/M) M.Dizzy(1) if(!M.confused) M.confused = 1 @@ -614,7 +614,7 @@ description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions." color = "#C8A5DC" // rgb: 200, 165, 220 -/datum/reagent/impedrezene/on_mob_life(var/mob/living/M as mob) +/datum/reagent/impedrezene/on_mob_life(mob/living/M) M.jitteriness = max(M.jitteriness-5,0) if(prob(80)) M.adjustBrainLoss(1*REM) if(prob(50)) M.drowsyness = max(M.drowsyness, 3) @@ -628,7 +628,7 @@ description = "Microscopic construction robots." color = "#535E66" // rgb: 83, 94, 102 -/datum/reagent/nanites/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/nanites/reaction_mob(mob/M, method=TOUCH, volume) src = null if( (prob(min(10, volume)) && method==TOUCH) || method==INGEST) M.ForceContractDisease(new /datum/disease/transformation/robot(0)) @@ -639,7 +639,7 @@ description = "Microbes with an entirely alien cellular structure." color = "#535E66" // rgb: 83, 94, 102 -/datum/reagent/xenomicrobes/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/xenomicrobes/reaction_mob(mob/M, method=TOUCH, volume) src = null if( (prob(min(10, volume)) && method==TOUCH) || method==INGEST) M.ContractDisease(new /datum/disease/transformation/xeno(0)) @@ -741,7 +741,7 @@ color = "#000000" // RBG: 0, 0, 0 var/tox_prob = 0 -/datum/reagent/plantnutriment/on_mob_life(var/mob/living/M as mob) +/datum/reagent/plantnutriment/on_mob_life(mob/living/M) if(prob(tox_prob)) M.adjustToxLoss(1*REM) ..() @@ -813,7 +813,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/carpet/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/carpet/reaction_turf(turf/simulated/T, volume) if(istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel)) var/turf/simulated/floor/F = T F.ChangeTurf(/turf/simulated/floor/carpet) @@ -857,23 +857,23 @@ var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700") -/datum/reagent/colorful_reagent/on_mob_life(var/mob/living/M as mob) +/datum/reagent/colorful_reagent/on_mob_life(mob/living/M) if(M && isliving(M)) M.color = pick(random_color_list) ..() return -/datum/reagent/colorful_reagent/reaction_mob(var/mob/living/M, var/volume) +/datum/reagent/colorful_reagent/reaction_mob(mob/living/M, volume) if(M && isliving(M)) M.color = pick(random_color_list) ..() return -/datum/reagent/colorful_reagent/reaction_obj(var/obj/O, var/volume) +/datum/reagent/colorful_reagent/reaction_obj(obj/O, volume) if(O) O.color = pick(random_color_list) ..() return -/datum/reagent/colorful_reagent/reaction_turf(var/turf/T, var/volume) +/datum/reagent/colorful_reagent/reaction_turf(turf/T, volume) if(T) T.color = pick(random_color_list) ..() @@ -887,7 +887,7 @@ color = "#C8A5DC" var/list/potential_colors = list("0ad","a0f","f73","d14","d14","0b5","0ad","f73","fc2","084","05e","d22","fa0") // fucking hair code -/datum/reagent/hair_dye/reaction_mob(var/mob/living/M, var/volume) +/datum/reagent/hair_dye/reaction_mob(mob/living/M, volume) if(M && ishuman(M)) var/mob/living/carbon/human/H = M H.hair_color = pick(potential_colors) @@ -903,7 +903,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/barbers_aid/reaction_mob(var/mob/living/M, var/volume) +/datum/reagent/barbers_aid/reaction_mob(mob/living/M, volume) if(M && ishuman(M)) var/mob/living/carbon/human/H = M var/datum/sprite_accessory/hair/picked_hair = pick(hair_styles_list) @@ -921,7 +921,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/concentrated_barbers_aid/reaction_mob(var/mob/living/M, var/volume) +/datum/reagent/concentrated_barbers_aid/reaction_mob(mob/living/M, volume) if(M && ishuman(M)) var/mob/living/carbon/human/H = M H.hair_style = "Very Long Hair" diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm index 545f4020afb..56300fffd97 100644 --- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm @@ -6,7 +6,7 @@ reagent_state = SOLID color = "#673910" // rgb: 103, 57, 16 -/datum/reagent/thermite/reaction_turf(var/turf/T, var/volume) +/datum/reagent/thermite/reaction_turf(turf/T, volume) src = null if(volume >= 1 && istype(T, /turf/simulated/wall)) var/turf/simulated/wall/Wall = T @@ -17,7 +17,7 @@ Wall.overlays = list() Wall.overlays += image('icons/effects/effects.dmi',"thermite") -/datum/reagent/thermite/on_mob_life(var/mob/living/M as mob) +/datum/reagent/thermite/on_mob_life(mob/living/M) M.adjustFireLoss(1) ..() @@ -42,13 +42,13 @@ color = "#FF0000" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/clf3/on_mob_life(var/mob/living/M as mob) +/datum/reagent/clf3/on_mob_life(mob/living/M) M.adjust_fire_stacks(2) var/burndmg = max(0.3*M.fire_stacks, 0.3) M.adjustFireLoss(burndmg) ..() -/datum/reagent/clf3/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/clf3/reaction_turf(turf/simulated/T, volume) if(istype(T, /turf/simulated/floor/plating)) var/turf/simulated/floor/plating/F = T if(prob(1 + F.burnt + 5*F.broken)) //broken or burnt plating is more susceptible to being destroyed @@ -66,7 +66,7 @@ if(prob(volume/10)) W.ChangeTurf(/turf/simulated/floor/plating) -/datum/reagent/clf3/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/clf3/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH && isliving(M)) M.adjust_fire_stacks(min(volume/5, 10)) M.IgniteMob() @@ -129,7 +129,7 @@ reagent_state = LIQUID color = "#FF9999" -/datum/reagent/phlogiston/on_mob_life(var/mob/living/M as mob) +/datum/reagent/phlogiston/on_mob_life(mob/living/M) M.adjust_fire_stacks(1) M.IgniteMob() M.adjustFireLoss(0.2*M.fire_stacks) @@ -143,11 +143,11 @@ reagent_state = LIQUID color = "#FF9999" -/datum/reagent/napalm/on_mob_life(var/mob/living/M as mob) +/datum/reagent/napalm/on_mob_life(mob/living/M) M.adjust_fire_stacks(1) ..() -/datum/reagent/napalm/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/napalm/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH && isliving(M)) M.adjust_fire_stacks(min(volume/4, 20)) @@ -159,7 +159,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/cryostylane/on_mob_life(var/mob/living/M as mob) //TODO: code freezing into an ice cube +/datum/reagent/cryostylane/on_mob_life(mob/living/M) //TODO: code freezing into an ice cube if(M.reagents.has_reagent("oxygen")) M.reagents.remove_reagent("oxygen", 0.5) M.bodytemperature -= 15 @@ -172,7 +172,7 @@ holder.handle_reactions() ..() -/datum/reagent/cryostylane/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/cryostylane/reaction_turf(turf/simulated/T, volume) if(volume >= 5) for(var/mob/living/simple_animal/slime/M in T) M.adjustToxLoss(rand(15,30)) @@ -184,7 +184,7 @@ color = "#B20000" // rgb: 139, 166, 233 metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/pyrosium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/pyrosium/on_mob_life(mob/living/M) if(M.reagents.has_reagent("oxygen")) M.reagents.remove_reagent("oxygen", 0.5) M.bodytemperature += 15 diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm index 04b93d4c856..d693da360a1 100644 --- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -8,7 +8,7 @@ color = "#CF3600" // rgb: 207, 54, 0 var/toxpwr = 1.5 -/datum/reagent/toxin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/on_mob_life(mob/living/M) if(toxpwr) M.adjustToxLoss(toxpwr*REM) ..() @@ -28,7 +28,7 @@ color = "#13BC5E" // rgb: 19, 188, 94 toxpwr = 0 -/datum/reagent/toxin/mutagen/reaction_mob(var/mob/living/carbon/M, var/method=TOUCH, var/volume) +/datum/reagent/toxin/mutagen/reaction_mob(mob/living/carbon/M, method=TOUCH, volume) if(!..()) return if(!istype(M) || !M.dna) @@ -44,7 +44,7 @@ updateappearance(M) return -/datum/reagent/toxin/mutagen/on_mob_life(var/mob/living/carbon/M) +/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/M) if(istype(M)) M.apply_effect(5,IRRADIATE,0) ..() @@ -57,13 +57,13 @@ color = "#500064" // rgb: 80, 0, 100 toxpwr = 3 -/datum/reagent/toxin/plasma/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/plasma/on_mob_life(mob/living/M) if(holder.has_reagent("epinephrine")) holder.remove_reagent("epinephrine", 2*REM) ..() return -/datum/reagent/toxin/plasma/reaction_obj(var/obj/O, var/volume) +/datum/reagent/toxin/plasma/reaction_obj(obj/O, volume) src = null /*if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg/slime)) var/obj/item/weapon/reagent_containers/food/snacks/egg/slime/egg = O @@ -72,13 +72,13 @@ if((!O) || (!volume)) return 0 O.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume) -/datum/reagent/toxin/plasma/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/toxin/plasma/reaction_turf(turf/simulated/T, volume) src = null if(istype(T)) T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume) return -/datum/reagent/toxin/plasma/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with plasma is stronger than fuel! +/datum/reagent/toxin/plasma/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with plasma is stronger than fuel! if(!istype(M, /mob/living)) return if(method == TOUCH) @@ -92,7 +92,7 @@ color = "#C8A5DC" // rgb: 200, 165, 220 toxpwr = 0 -/datum/reagent/toxin/lexorin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/lexorin/on_mob_life(mob/living/M) if(M.stat != DEAD) if(prob(33)) M.take_organ_damage(1*REM, 0) @@ -109,7 +109,7 @@ color = "#801E28" // rgb: 128, 30, 40 toxpwr = 0 -/datum/reagent/toxin/slimejelly/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/M) if(prob(10)) M << "Your insides are burning!" M.adjustToxLoss(rand(20,60)*REM) @@ -125,7 +125,7 @@ color = "#CF3600" // rgb: 207, 54, 0 toxpwr = 0 -/datum/reagent/toxin/minttoxin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M) if (FAT in M.mutations) M.gib() ..() @@ -146,7 +146,7 @@ color = "#669900" // rgb: 102, 153, 0 toxpwr = 0.5 -/datum/reagent/toxin/zombiepowder/on_mob_life(var/mob/living/carbon/M as mob) +/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/carbon/M) M.status_flags |= FAKEDEATH M.adjustOxyLoss(0.5*REM) M.Weaken(5) @@ -166,7 +166,7 @@ color = "#B31008" // rgb: 139, 166, 233 toxpwr = 0 -/datum/reagent/toxin/mindbreaker/on_mob_life(var/mob/living/M) +/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/M) M.hallucination += 10 ..() return @@ -178,7 +178,7 @@ color = "#49002E" // rgb: 73, 0, 46 toxpwr = 1 -/datum/reagent/toxin/plantbgone/reaction_obj(var/obj/O, var/volume) +/datum/reagent/toxin/plantbgone/reaction_obj(obj/O, volume) if(istype(O,/obj/structure/alien/weeds/)) var/obj/structure/alien/weeds/alien_weeds = O alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast @@ -189,7 +189,7 @@ var/obj/effect/spacevine/SV = O SV.on_chem_effect(src) -/datum/reagent/toxin/plantbgone/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/toxin/plantbgone/reaction_mob(mob/living/M, method=TOUCH, volume) src = null if(iscarbon(M)) var/mob/living/carbon/C = M @@ -210,7 +210,7 @@ color = "#4B004B" // rgb: 75, 0, 75 toxpwr = 1 -/datum/reagent/toxin/pestkiller/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/toxin/pestkiller/reaction_mob(mob/living/M, method=TOUCH, volume) src = null if(iscarbon(M)) var/mob/living/carbon/C = M @@ -225,7 +225,7 @@ color = "#9ACD32" toxpwr = 0.5 -/datum/reagent/toxin/spore/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/spore/on_mob_life(mob/living/M) M.damageoverlaytemp = 60 M.eye_blurry = max(M.eye_blurry, 3) ..() @@ -239,7 +239,7 @@ color = "#9ACD32" toxpwr = 0.5 -/datum/reagent/toxin/spore_burning/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/M) ..() M.adjust_fire_stacks(2) M.IgniteMob() @@ -253,7 +253,7 @@ toxpwr = 0 metabolization_rate = 1.5 * REAGENTS_METABOLISM -/datum/reagent/toxin/chloralhydrate/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 10) M.confused += 2 @@ -273,7 +273,7 @@ color = "#664300" // rgb: 102, 67, 0 metabolization_rate = 1.5 * REAGENTS_METABOLISM -/datum/reagent/toxin/beer2/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/beer2/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 50) M.sleeping += 1 @@ -332,7 +332,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/polonium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/polonium/on_mob_life(mob/living/M) M.radiation += 4 ..() @@ -346,7 +346,7 @@ overdose_threshold = 30 toxpwr = 0 -/datum/reagent/toxin/histamine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/histamine/on_mob_life(mob/living/M) if(prob(50)) switch(pick(1, 2, 3, 4)) if(1) @@ -362,7 +362,7 @@ M.adjustBruteLoss(2*REM) ..() -/datum/reagent/toxin/histamine/overdose_process(var/mob/living/M as mob) +/datum/reagent/toxin/histamine/overdose_process(mob/living/M) M.adjustOxyLoss(2*REM) M.adjustBruteLoss(2*REM) M.adjustToxLoss(2*REM) @@ -377,7 +377,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM toxpwr = 1 -/datum/reagent/toxin/formaldehyde/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/M) if(prob(5)) M.reagents.add_reagent("histamine",pick(5,15)) M.reagents.remove_reagent("formaldehyde",1) @@ -392,7 +392,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/venom/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/venom/on_mob_life(mob/living/M) toxpwr = 0.2*volume M.adjustBruteLoss((0.3*volume)*REM) if(prob(15)) @@ -409,7 +409,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/neurotoxin2/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/neurotoxin2/on_mob_life(mob/living/M) if(M.brainloss + M.toxloss <= 60) M.adjustBrainLoss(1*REM) M.adjustToxLoss(1*REM) @@ -426,7 +426,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 1.25 -/datum/reagent/toxin/cyanide/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/cyanide/on_mob_life(mob/living/M) if(prob(5)) M.losebreath += 1 if(prob(8)) @@ -453,12 +453,12 @@ metabolization_rate = 0.4 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/itching_powder/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/toxin/itching_powder/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) M.reagents.add_reagent("itching_powder", volume) return -/datum/reagent/toxin/itching_powder/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/M) if(prob(15)) M << "You scratch at your head." M.adjustBruteLoss(0.2*REM) @@ -482,7 +482,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM toxpwr = 2.5 -/datum/reagent/toxin/initropidril/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/initropidril/on_mob_life(mob/living/M) if(prob(25)) var/picked_option = rand(1,3) switch(picked_option) @@ -513,7 +513,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/pancuronium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/M) if(current_cycle >= 10) M.SetParalysis(1) if(prob(20)) @@ -529,7 +529,7 @@ metabolization_rate = 0.75 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/sodium_thiopental/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/M) if(current_cycle >= 10) M.sleeping += 1 M.adjustStaminaLoss(10*REM) @@ -544,7 +544,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 0.5 -/datum/reagent/toxin/sulfonal/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/M) if(current_cycle >= 22) M.sleeping += 1 ..() @@ -558,7 +558,7 @@ toxpwr = 0 metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/toxin/amanitin/on_mob_delete(var/mob/living/M as mob) +/datum/reagent/toxin/amanitin/on_mob_delete(mob/living/M) M.adjustToxLoss(current_cycle*3*REM) ..() @@ -571,7 +571,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM toxpwr = 0.5 -/datum/reagent/toxin/lipolicide/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/M) if(!holder.has_reagent("nutriment")) M.adjustToxLoss(0.5*REM) M.nutrition -= 5 * REAGENTS_METABOLISM @@ -589,7 +589,7 @@ metabolization_rate = 0.06 * REAGENTS_METABOLISM toxpwr = 1.75 -/datum/reagent/toxin/coniine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/coniine/on_mob_life(mob/living/M) M.losebreath += 5 ..() @@ -602,7 +602,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 1 -/datum/reagent/toxin/curare/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/curare/on_mob_life(mob/living/M) if(current_cycle >= 11) M.Weaken(1) M.adjustOxyLoss(1*REM) @@ -620,7 +620,7 @@ toxpwr = 1 var/acidpwr = 10 //the amount of protection removed from the armour -/datum/reagent/toxin/acid/reaction_mob(var/mob/living/carbon/C, var/method=TOUCH, var/volume) +/datum/reagent/toxin/acid/reaction_mob(mob/living/carbon/C, method=TOUCH, volume) if(!istype(C)) return volume = round(volume,0.1) @@ -630,7 +630,7 @@ C.acid_act(acidpwr, toxpwr, volume) -/datum/reagent/toxin/acid/reaction_obj(var/obj/O, var/volume) +/datum/reagent/toxin/acid/reaction_obj(obj/O, volume) if(istype(O.loc, /mob)) //handled in human acid_act() return volume = round(volume,0.1) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 9555c8a126a..6a238b39c41 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -17,12 +17,12 @@ var/required_temp = 0 var/mix_message = "The solution begins to bubble." -/datum/chemical_reaction/proc/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/proc/on_reaction(datum/reagents/holder, created_volume) return //I recommend you set the result amount to the total volume of all components. -/datum/chemical_reaction/proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reaction_name, var/mob_faction = "chemicalsummon") +/datum/chemical_reaction/proc/chemical_mob_spawn(datum/reagents/holder, amount_to_spawn, reaction_name, mob_faction = "chemicalsummon") if(holder && holder.my_atom) var/blocked = list(/mob/living/simple_animal/hostile, /mob/living/simple_animal/hostile/pirate, @@ -78,7 +78,7 @@ for(var/j = 1, j <= rand(1, 3), j++) step(C, pick(NORTH,SOUTH,EAST,WEST)) -/datum/chemical_reaction/proc/goonchem_vortex(var/turf/simulated/T, var/setting_type, var/range, var/pull_times) +/datum/chemical_reaction/proc/goonchem_vortex(turf/simulated/T, setting_type, range, pull_times) for(var/atom/movable/X in orange(range, T)) if(istype(X, /obj/effect)) continue //stop pulling smoke and hotspots please diff --git a/code/modules/reagents/Chemistry-Recipes/Others.dm b/code/modules/reagents/Chemistry-Recipes/Others.dm index f03bec05038..b839ad05c4c 100644 --- a/code/modules/reagents/Chemistry-Recipes/Others.dm +++ b/code/modules/reagents/Chemistry-Recipes/Others.dm @@ -49,7 +49,7 @@ result_amount = 1 mob_react = 1 -/datum/chemical_reaction/plasmasolidification/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/plasmasolidification/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) new /obj/item/stack/sheet/mineral/plasma(location) return @@ -80,7 +80,7 @@ var/level_min = 0 var/level_max = 2 -/datum/chemical_reaction/mix_virus/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/mix_virus/on_reaction(datum/reagents/holder, created_volume) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list if(B && B.data) @@ -112,7 +112,7 @@ required_reagents = list("synaptizine" = 1) required_catalysts = list("blood" = 1) -/datum/chemical_reaction/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/mix_virus/rem_virus/on_reaction(datum/reagents/holder, created_volume) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list if(B && B.data) @@ -141,7 +141,7 @@ result_amount = 2 mob_react = 1 -/datum/chemical_reaction/foam/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/foam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) M << "The solution spews out foam!" @@ -160,7 +160,7 @@ result_amount = 5 mob_react = 1 -/datum/chemical_reaction/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/metalfoam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) @@ -179,7 +179,7 @@ result_amount = 5 mob_react = 1 -/datum/chemical_reaction/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/ironfoam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) M << "The solution spews out a metallic foam!" @@ -295,7 +295,7 @@ result_amount = 1 required_temp = 374 -/datum/chemical_reaction/life/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/life/on_reaction(datum/reagents/holder, created_volume) chemical_mob_spawn(holder, 1, "Life") /datum/chemical_reaction/corgium @@ -306,7 +306,7 @@ result_amount = 1 required_temp = 374 -/datum/chemical_reaction/corgium/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/corgium/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) new /mob/living/simple_animal/pet/corgi(location) ..() diff --git a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm index ba20b7c7817..d0344d28fb4 100644 --- a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm +++ b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm @@ -6,7 +6,7 @@ required_reagents = list("glycerol" = 1, "facid" = 1, "sacid" = 1) result_amount = 2 -/datum/chemical_reaction/nitroglycerin/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/nitroglycerin/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("nitroglycerin", created_volume) @@ -24,7 +24,7 @@ result_amount = 1 required_temp = 474 -/datum/chemical_reaction/nitroglycerin_explosion/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/nitroglycerin_explosion/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) var/datum/effect/effect/system/reagents_explosion/e = new() e.set_up(round(created_volume/2, 1), location, 0, 0) @@ -38,7 +38,7 @@ required_reagents = list("water" = 1, "potassium" = 1) result_amount = 2 -/datum/chemical_reaction/potassium_explosion/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/potassium_explosion/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) var/datum/effect/effect/system/reagents_explosion/e = new() e.set_up(round (created_volume/10, 1), location, 0, 0) @@ -61,7 +61,7 @@ required_temp = 474 mix_message = "Sparks start flying around the black powder!" -/datum/chemical_reaction/blackpowder_explosion/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/blackpowder_explosion/on_reaction(datum/reagents/holder, created_volume) sleep(rand(50,100)) var/location = get_turf(holder.my_atom) var/datum/effect/effect/system/reagents_explosion/e = new() @@ -83,7 +83,7 @@ required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense result_amount = 2 -/datum/chemical_reaction/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/emp_pulse/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes. // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades. @@ -106,7 +106,7 @@ result_amount = 4 required_temp = 424 -/datum/chemical_reaction/clf3/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/clf3/on_reaction(datum/reagents/holder, created_volume) var/turf/T = get_turf(holder.my_atom) for(var/turf/turf in range(1,T)) PoolOrNew(/obj/effect/hotspot, turf) @@ -119,7 +119,7 @@ required_reagents = list("mercury" = 1, "oxygen" = 1, "nitrogen" = 1, "carbon" = 1) result_amount = 4 -/datum/chemical_reaction/sorium/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/sorium/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("sorium", created_volume) @@ -133,7 +133,7 @@ required_reagents = list("sorium" = 1) required_temp = 474 -/datum/chemical_reaction/sorium_vortex/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/sorium_vortex/on_reaction(datum/reagents/holder, created_volume) var/turf/simulated/T = get_turf(holder.my_atom) goonchem_vortex(T, 1, 5, 6) @@ -145,7 +145,7 @@ required_reagents = list("stable_plasma" = 1, "radium" = 1, "carbon" = 1) result_amount = 3 -/datum/chemical_reaction/liquid_dark_matter/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/liquid_dark_matter/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("liquid_dark_matter", created_volume) @@ -159,7 +159,7 @@ required_reagents = list("liquid_dark_matter" = 1) required_temp = 474 -/datum/chemical_reaction/ldm_vortex/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/ldm_vortex/on_reaction(datum/reagents/holder, created_volume) var/turf/simulated/T = get_turf(holder.my_atom) goonchem_vortex(T, 0, 5, 6) @@ -170,7 +170,7 @@ required_reagents = list("aluminium" = 1, "potassium" = 1, "sulfur" = 1 ) result_amount = 3 -/datum/chemical_reaction/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/flash_powder/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return var/location = get_turf(holder.my_atom) @@ -193,7 +193,7 @@ result_amount = 1 required_temp = 374 -/datum/chemical_reaction/flash_powder_flash/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/flash_powder_flash/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, location) @@ -212,7 +212,7 @@ required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1) result_amount = 3 -/datum/chemical_reaction/smoke_powder/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/smoke_powder/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("smoke_powder", created_volume) @@ -237,7 +237,7 @@ secondary = 1 mob_react = 1 -/datum/chemical_reaction/smoke_powder_smoke/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/smoke_powder_smoke/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) var/smoke_amount = round(Clamp(created_volume/5, 1, 20),1) var/datum/effect/effect/system/smoke_spread/chem/S = new @@ -258,7 +258,7 @@ required_reagents = list("oxygen" = 1, "cola" = 1, "phosphorus" = 1) result_amount = 3 -/datum/chemical_reaction/sonic_powder/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/sonic_powder/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("sonic_powder", created_volume) @@ -284,7 +284,7 @@ required_temp = 374 result_amount = 1 -/datum/chemical_reaction/sonic_powder_deafen/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/sonic_powder_deafen/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) playsound(location, 'sound/effects/bang.ogg', 25, 1) for(var/mob/living/carbon/C in get_hearers_in_view(created_volume/10, location)) @@ -307,7 +307,7 @@ required_reagents = list("phosphorus" = 1, "sacid" = 1, "stable_plasma" = 1) result_amount = 3 -/datum/chemical_reaction/phlogiston/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/phlogiston/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return var/turf/simulated/T = get_turf(holder.my_atom) @@ -332,7 +332,7 @@ required_reagents = list("water" = 1, "stable_plasma" = 1, "nitrogen" = 1) result_amount = 3 -/datum/chemical_reaction/cryostylane/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/cryostylane/on_reaction(datum/reagents/holder, created_volume) holder.chem_temp = 20 // cools the fuck down return @@ -344,6 +344,6 @@ required_reagents = list("stable_plasma" = 1, "radium" = 1, "phosphorus" = 1) result_amount = 3 -/datum/chemical_reaction/pyrosium/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/pyrosium/on_reaction(datum/reagents/holder, created_volume) holder.chem_temp = 20 // also cools the fuck down return \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm index 98f34ef9f73..49048502ad0 100644 --- a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm +++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm @@ -9,7 +9,7 @@ required_container = /obj/item/slime_extract/grey required_other = 1 -/datum/chemical_reaction/slimespawn/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimespawn/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime S.loc = get_turf(holder.my_atom) @@ -24,7 +24,7 @@ required_other = 1 required_container = /obj/item/slime_extract/grey -/datum/chemical_reaction/slimeinaprov/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeinaprov/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") /datum/chemical_reaction/slimemonkey @@ -36,7 +36,7 @@ required_container = /obj/item/slime_extract/grey required_other = 1 -/datum/chemical_reaction/slimemonkey/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/i = 1, i <= 3, i++) var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube @@ -52,7 +52,7 @@ required_other = 1 required_container = /obj/item/slime_extract/green -/datum/chemical_reaction/slimemutate/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemutate/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") //Mutated Green @@ -66,7 +66,7 @@ required_container = /obj/item/slime_extract/green mix_message = "The mixture rapidly expands and contracts, its appearance shifting into a sickening green." -/datum/chemical_reaction/slimemutate_unstable/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemutate_unstable/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") //Metal @@ -79,7 +79,7 @@ required_container = /obj/item/slime_extract/metal required_other = 1 -/datum/chemical_reaction/slimemetal/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemetal/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal M.amount = 15 @@ -98,7 +98,7 @@ required_container = /obj/item/slime_extract/gold required_other = 1 -/datum/chemical_reaction/slimecrit/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimecrit/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -115,7 +115,7 @@ required_container = /obj/item/slime_extract/gold required_other = 1 -/datum/chemical_reaction/slimecritlesser/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimecritlesser/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -133,7 +133,7 @@ required_container = /obj/item/slime_extract/silver required_other = 1 -/datum/chemical_reaction/slimebork/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimebork/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/list/blocked = list(/obj/item/weapon/reagent_containers/food/snacks, @@ -181,7 +181,7 @@ required_container = /obj/item/slime_extract/silver required_other = 1 -/datum/chemical_reaction/slimebork2/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimebork2/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/list/blocked = list(/obj/item/weapon/reagent_containers/food/drinks) @@ -214,7 +214,7 @@ required_container = /obj/item/slime_extract/blue required_other = 1 -/datum/chemical_reaction/slimefrost/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimefrost/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") @@ -227,7 +227,7 @@ required_container = /obj/item/slime_extract/blue required_other = 1 -/datum/chemical_reaction/slimestabilizer/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimestabilizer/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/slimestabilizer/P = new /obj/item/weapon/slimestabilizer P.loc = get_turf(holder.my_atom) @@ -244,7 +244,7 @@ required_container = /obj/item/slime_extract/darkblue required_other = 1 -/datum/chemical_reaction/slimefreeze/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimefreeze/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -265,7 +265,7 @@ required_container = /obj/item/slime_extract/orange required_other = 1 -/datum/chemical_reaction/slimecasp/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimecasp/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") /datum/chemical_reaction/slimefire @@ -277,7 +277,7 @@ required_container = /obj/item/slime_extract/orange required_other = 1 -/datum/chemical_reaction/slimefire/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimefire/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -298,7 +298,7 @@ required_container = /obj/item/slime_extract/yellow required_other = 1 -/datum/chemical_reaction/slimeoverload/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/slimeoverload/on_reaction(datum/reagents/holder, created_volume) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") empulse(get_turf(holder.my_atom), 3, 7) @@ -312,7 +312,7 @@ required_container = /obj/item/slime_extract/yellow required_other = 1 -/datum/chemical_reaction/slimecell/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/slimecell/on_reaction(datum/reagents/holder, created_volume) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/stock_parts/cell/high/slime/P = new /obj/item/weapon/stock_parts/cell/high/slime P.loc = get_turf(holder.my_atom) @@ -326,7 +326,7 @@ required_container = /obj/item/slime_extract/yellow required_other = 1 -/datum/chemical_reaction/slimeglow/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeglow/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly."), 1) @@ -344,7 +344,7 @@ required_container = /obj/item/slime_extract/purple required_other = 1 -/datum/chemical_reaction/slimepsteroid/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimepsteroid/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid P.loc = get_turf(holder.my_atom) @@ -358,7 +358,7 @@ required_container = /obj/item/slime_extract/purple required_other = 1 -/datum/chemical_reaction/slimejam/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimejam/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") @@ -372,7 +372,7 @@ required_container = /obj/item/slime_extract/darkpurple required_other = 1 -/datum/chemical_reaction/slimeplasma/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeplasma/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/stack/sheet/mineral/plasma/P = new /obj/item/stack/sheet/mineral/plasma P.amount = 10 @@ -401,7 +401,7 @@ required_container = /obj/item/slime_extract/red required_other = 1 -/datum/chemical_reaction/slimemutator/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemutator/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/slimemutator/P = new /obj/item/weapon/slimemutator P.loc = get_turf(holder.my_atom) @@ -415,7 +415,7 @@ required_container = /obj/item/slime_extract/red required_other = 1 -/datum/chemical_reaction/slimebloodlust/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimebloodlust/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null)) slime.rabid = 1 @@ -432,7 +432,7 @@ required_container = /obj/item/slime_extract/pink required_other = 1 -/datum/chemical_reaction/slimeppotion/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeppotion/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/slimepotion/P = new /obj/item/slimepotion P.loc = get_turf(holder.my_atom) @@ -448,7 +448,7 @@ required_other = 1 required_container = /obj/item/slime_extract/black -/datum/chemical_reaction/slimemutate2/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemutate2/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") //Oil @@ -461,7 +461,7 @@ required_container = /obj/item/slime_extract/oil required_other = 1 -/datum/chemical_reaction/slimeexplosion/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeexplosion/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -479,7 +479,7 @@ required_reagents = list("plasma" = 1) required_other = 1 -/datum/chemical_reaction/slimepotion2/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimepotion2/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/slimepotion2/P = new /obj/item/slimepotion2 P.loc = get_turf(holder.my_atom) @@ -494,7 +494,7 @@ required_container = /obj/item/slime_extract/adamantine required_other = 1 -/datum/chemical_reaction/slimegolem/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimegolem/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/effect/golemrune/Z = new /obj/effect/golemrune Z.loc = get_turf(holder.my_atom) @@ -510,7 +510,7 @@ required_container = /obj/item/slime_extract/bluespace required_other = 1 -/datum/chemical_reaction/slimefloor2/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/slimefloor2/on_reaction(datum/reagents/holder, created_volume) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace P.amount = 25 @@ -526,7 +526,7 @@ required_container = /obj/item/slime_extract/bluespace required_other = 1 -/datum/chemical_reaction/slimecrystal/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/slimecrystal/on_reaction(datum/reagents/holder, created_volume) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") if(holder.my_atom) var/obj/item/bluespace_crystal/BC = new(get_turf(holder.my_atom)) @@ -542,7 +542,7 @@ required_container = /obj/item/slime_extract/cerulean required_other = 1 -/datum/chemical_reaction/slimepsteroid2/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimepsteroid2/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/slimesteroid2/P = new /obj/item/weapon/slimesteroid2 P.loc = get_turf(holder.my_atom) @@ -557,7 +557,7 @@ required_container = /obj/item/slime_extract/sepia required_other = 1 -/datum/chemical_reaction/slimestop/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimestop/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast) var/obj/effect/timestop/T = new /obj/effect/timestop @@ -575,7 +575,7 @@ required_container = /obj/item/slime_extract/sepia required_other = 1 -/datum/chemical_reaction/slimecamera/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimecamera/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/device/camera/P = new /obj/item/device/camera P.loc = get_turf(holder.my_atom) @@ -591,7 +591,7 @@ required_container = /obj/item/slime_extract/sepia required_other = 1 -/datum/chemical_reaction/slimefloor/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimefloor/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia P.amount = 25 @@ -610,7 +610,7 @@ required_container = /obj/item/slime_extract/pyrite required_other = 1 -/datum/chemical_reaction/slimepaint/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimepaint/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/list/paints = typesof(/obj/item/weapon/paint) - /obj/item/weapon/paint var/chosen = pick(paints) @@ -628,7 +628,7 @@ required_other = 1 required_container = /obj/item/slime_extract/rainbow -/datum/chemical_reaction/slimeRNG/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeRNG/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime S.colour = pick("grey","orange", "metal", "blue", "purple", "dark purple", "dark blue", "green", "silver", "yellow", "gold", "yellow", "red", "silver", "pink", "cerulean", "sepia", "bluespace", "pyrite", "light pink", "oil", "adamantine", "black") diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index b8edfbae4a6..c75e6c3e82d 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -36,16 +36,16 @@ if(list_reagents) reagents.add_reagent_list(list_reagents) -/obj/item/weapon/reagent_containers/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/attack_self(mob/user) return -/obj/item/weapon/reagent_containers/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/reagent_containers/attack(mob/M, mob/user, def_zone) return /obj/item/weapon/reagent_containers/afterattack(obj/target, mob/user , flag) return -/obj/item/weapon/reagent_containers/proc/reagentlist(var/obj/item/weapon/reagent_containers/snack) //Attack logs for regents in pills +/obj/item/weapon/reagent_containers/proc/reagentlist(obj/item/weapon/reagent_containers/snack) //Attack logs for regents in pills var/data if(snack.reagents.reagent_list && snack.reagents.reagent_list.len) //find a reagent list if there is and check if it has entries for (var/datum/reagent/R in snack.reagents.reagent_list) //no reagents will be left behind diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index f7425424367..ab68ee49f79 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -64,7 +64,7 @@ Borg Hypospray // Use this to add more chemicals for the borghypo to produce. -/obj/item/weapon/reagent_containers/borghypo/proc/add_reagent(var/reagent) +/obj/item/weapon/reagent_containers/borghypo/proc/add_reagent(reagent) reagent_ids |= reagent var/datum/reagents/RG = new(30) RG.my_atom = src @@ -82,7 +82,7 @@ Borg Hypospray R.cell.use(charge_cost) //Take power from borg... RG.add_reagent(reagent_ids[mode], 5) //And fill hypo with reagent. -/obj/item/weapon/reagent_containers/borghypo/attack(mob/living/M as mob, mob/user as mob) +/obj/item/weapon/reagent_containers/borghypo/attack(mob/living/M, mob/user) var/datum/reagents/R = reagent_list[mode] if(!R.total_volume) user << "The injector is empty." @@ -139,7 +139,7 @@ Borg Shaker reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale") -/obj/item/weapon/reagent_containers/borghypo/borgshaker/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user) return //Can't inject stuff with a shaker, can we? /obj/item/weapon/reagent_containers/borghypo/borgshaker/regenerate_reagents() diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 149a5c5c365..28f2344db58 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -34,7 +34,7 @@ -/obj/item/weapon/reagent_containers/glass/attack(mob/M as mob, mob/user as mob, obj/target) +/obj/item/weapon/reagent_containers/glass/attack(mob/M, mob/user, obj/target) if(!canconsume(M, user)) return @@ -125,7 +125,7 @@ reagents.reaction(target, TOUCH) reagents.clear_reagents() -/obj/item/weapon/reagent_containers/glass/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/reagent_containers/glass/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird return var/hotness = is_hot(I) @@ -265,7 +265,7 @@ volume = 70 flags = OPENCONTAINER -/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/O, mob/user as mob, params) +/obj/item/weapon/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/weapon/mop)) if(reagents.total_volume < 1) user << "[src] is out of water!" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 4ab2c5b5268..5c7b6096d40 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -74,7 +74,7 @@ update_icon() return -/obj/item/weapon/reagent_containers/hypospray/medipen/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/reagent_containers/hypospray/medipen/attack(mob/M, mob/user) ..() update_icon() return diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 1f606a3f885..40a495450fc 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -17,7 +17,7 @@ possible_transfer_amounts = null -/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob) +/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user) if(istype(A, /obj/item/weapon/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack) || istype(A, /obj/structure/closet) \ || istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart) || istype(A, /obj/machinery/hydroponics)) return @@ -60,7 +60,7 @@ return -/obj/item/weapon/reagent_containers/spray/proc/spray(var/atom/A) +/obj/item/weapon/reagent_containers/spray/proc/spray(atom/A) var/range = max(min(spray_currentrange, get_dist(src, A)), 1) var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src)) D.create_reagents(amount_per_transfer_from_this) @@ -92,7 +92,7 @@ return qdel(D) -/obj/item/weapon/reagent_containers/spray/attack_self(var/mob/user) +/obj/item/weapon/reagent_containers/spray/attack_self(mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) spray_currentrange = (spray_currentrange == 1 ? spray_maxrange : 1) @@ -141,7 +141,7 @@ volume = 10 list_reagents = list("water" = 10) -/obj/item/weapon/reagent_containers/spray/waterflower/attack_self(var/mob/user) //Don't allow changing how much the flower sprays +/obj/item/weapon/reagent_containers/spray/waterflower/attack_self(mob/user) //Don't allow changing how much the flower sprays return //chemsprayer @@ -160,7 +160,7 @@ origin_tech = "combat=3;materials=3;engineering=3" -/obj/item/weapon/reagent_containers/spray/chemsprayer/spray(var/atom/A) +/obj/item/weapon/reagent_containers/spray/chemsprayer/spray(atom/A) var/direction = get_dir(src, A) var/turf/T = get_turf(A) var/turf/T1 = get_step(T,turn(direction, 90)) @@ -172,7 +172,7 @@ return ..(the_targets[i]) -/obj/item/weapon/reagent_containers/spray/chemsprayer/attack_self(var/mob/user) +/obj/item/weapon/reagent_containers/spray/chemsprayer/attack_self(mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) user << "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray." diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 553f6c9cfbc..4a53376ceb6 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -30,7 +30,7 @@ if(prob(50)) qdel(src) -/obj/structure/reagent_dispensers/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/reagent_dispensers/attackby(obj/item/weapon/W, mob/user, params) return /obj/structure/reagent_dispensers/New() @@ -94,7 +94,7 @@ reagents.add_reagent("welding_fuel",1000) -/obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/reagent_dispensers/fueltank/bullet_act(obj/item/projectile/Proj) ..() if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet)) if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)) @@ -145,7 +145,7 @@ ..() reagents.add_reagent("water",500) -/obj/structure/reagent_dispensers/water_cooler/attack_hand(var/mob/living/carbon/human/user) +/obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/carbon/human/user) if((!istype(user)) || (user.stat)) return if(cups <= 0) @@ -155,7 +155,7 @@ user.put_in_hands(new /obj/item/weapon/reagent_containers/food/drinks/sillycup) user.visible_message("[user] gets a cup from [src].","You get a cup from [src].") -/obj/structure/reagent_dispensers/water_cooler/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/reagent_dispensers/water_cooler/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/paper)) if(!user.drop_item()) return diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 5e077f56ea3..749b76bb1eb 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -115,7 +115,7 @@ break // attack with item, place item on conveyor -/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user, params) +/obj/machinery/conveyor/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/crowbar)) if(!(stat & BROKEN)) var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc) @@ -132,7 +132,7 @@ return // attack with hand, move pulled object onto conveyor -/obj/machinery/conveyor/attack_hand(mob/user as mob) +/obj/machinery/conveyor/attack_hand(mob/user) user.Move_Pulled(src) @@ -257,7 +257,7 @@ S.position = position S.update() -/obj/machinery/conveyor_switch/attackby(var/obj/item/I, mob/user, params) +/obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/crowbar)) var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc) C.id = id diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 2576dcfc98c..e85c1218e39 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -153,7 +153,7 @@ // wrench: (un)anchor // weldingtool: convert to real pipe -/obj/structure/disposalconstruct/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposalconstruct/attackby(obj/item/I, mob/user, params) var/nicetype = "pipe" var/ispipe = is_pipe() // Indicates if we should change the level of this pipe add_fingerprint(user) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 6c071c54d0b..0ad17216e87 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -71,7 +71,7 @@ trunk_check() // attack by item places it in to disposal -/obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/disposal/attackby(obj/item/I, mob/user, params) if(stat & BROKEN || !I || !user) return @@ -152,8 +152,8 @@ target.visible_message("[user] starts putting [target] into [src].", \ "[user] starts putting you into [src]!") if(do_mob(user, target, 20)) - if (!src.loc) - return + if (!src.loc) + return if (target.client) target.client.perspective = EYE_PERSPECTIVE target.client.eye = src @@ -171,14 +171,14 @@ /obj/machinery/disposal/alter_health() return get_turf(src) -/obj/machinery/disposal/relaymove(mob/user as mob) +/obj/machinery/disposal/relaymove(mob/user) attempt_escape(user) // resist to escape the bin /obj/machinery/disposal/container_resist() attempt_escape(usr) -/obj/machinery/disposal/proc/attempt_escape(mob/user as mob) +/obj/machinery/disposal/proc/attempt_escape(mob/user) if(src.flushing) return go_out(user) @@ -196,18 +196,18 @@ // monkeys and xenos can only pull the flush lever -/obj/machinery/disposal/attack_paw(mob/user as mob) +/obj/machinery/disposal/attack_paw(mob/user) if(stat & BROKEN) return flush = !flush update() // ai as human but can't flush -/obj/machinery/disposal/attack_ai(mob/user as mob) +/obj/machinery/disposal/attack_ai(mob/user) interact(user, 1) // human interact with machine -/obj/machinery/disposal/attack_hand(mob/user as mob) +/obj/machinery/disposal/attack_hand(mob/user) if(user && user.loc == src) usr << "You cannot reach the controls from inside!" return @@ -219,7 +219,7 @@ interact(user, 0) // hostile mob escape from disposals -/obj/machinery/disposal/attack_animal(var/mob/living/simple_animal/M) +/obj/machinery/disposal/attack_animal(mob/living/simple_animal/M) if(M.environment_smash) M.do_attack_animation(src) visible_message("[M.name] smashes \the [src] apart!") @@ -227,7 +227,7 @@ return // user interaction -/obj/machinery/disposal/interact(mob/user, var/ai=0) +/obj/machinery/disposal/interact(mob/user, ai=0) src.add_fingerprint(user) if(stat & BROKEN) @@ -417,7 +417,7 @@ // called when holder is expelled from a disposal // should usually only occur if the pipe network is modified -/obj/machinery/disposal/proc/expel(var/obj/structure/disposalholder/H) +/obj/machinery/disposal/proc/expel(obj/structure/disposalholder/H) var/turf/target playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0) @@ -486,7 +486,7 @@ ..() // initialize a holder from the contents of a disposal unit -/obj/structure/disposalholder/proc/init(var/obj/machinery/disposal/D) +/obj/structure/disposalholder/proc/init(obj/machinery/disposal/D) gas = D.air_contents// transfer gas resv. into holder object //Check for any living mobs trigger hasmob. @@ -521,7 +521,7 @@ // start the movement process // argument is the disposal unit the holder started in -/obj/structure/disposalholder/proc/start(var/obj/machinery/disposal/D) +/obj/structure/disposalholder/proc/start(obj/machinery/disposal/D) if(!D.trunk) D.expel(src) // no trunk connected, so expel immediately return @@ -554,7 +554,7 @@ return get_step(loc,dir) // find a matching pipe on a turf -/obj/structure/disposalholder/proc/findpipe(var/turf/T) +/obj/structure/disposalholder/proc/findpipe(turf/T) if(!T) return null @@ -568,7 +568,7 @@ // merge two holder objects // used when a a holder meets a stuck holder -/obj/structure/disposalholder/proc/merge(var/obj/structure/disposalholder/other) +/obj/structure/disposalholder/proc/merge(obj/structure/disposalholder/other) for(var/atom/movable/AM in other) AM.loc = src // move everything in other holder to this one if(ismob(AM)) @@ -579,7 +579,7 @@ // called when player tries to move while in a pipe -/obj/structure/disposalholder/relaymove(mob/user as mob) +/obj/structure/disposalholder/relaymove(mob/user) if (user.stat) return if (src.loc) @@ -588,7 +588,7 @@ playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0) // called to vent all gas in holder to a location -/obj/structure/disposalholder/proc/vent_gas(var/atom/location) +/obj/structure/disposalholder/proc/vent_gas(atom/location) if(location) location.assume_air(gas) // vent all gas to turf air_update_turf() @@ -673,13 +673,13 @@ // returns the direction of the next pipe object, given the entrance dir // by default, returns the bitmask of remaining directions -/obj/structure/disposalpipe/proc/nextdir(var/fromdir) +/obj/structure/disposalpipe/proc/nextdir(fromdir) return dpdir & (~turn(fromdir, 180)) // transfer the holder through this pipe segment // overriden for special behaviour // -/obj/structure/disposalpipe/proc/transfer(var/obj/structure/disposalholder/H) +/obj/structure/disposalpipe/proc/transfer(obj/structure/disposalholder/H) var/nextdir = nextdir(H.dir) H.dir = nextdir var/turf/T = H.nextloc() @@ -726,7 +726,7 @@ // called when there is a break in the pipe // -/obj/structure/disposalpipe/proc/expel(var/obj/structure/disposalholder/H, var/turf/T, var/direction) +/obj/structure/disposalpipe/proc/expel(obj/structure/disposalholder/H, turf/T, direction) var/turf/target @@ -772,7 +772,7 @@ // will expel any holder inside at the time // then delete the pipe // remains : set to leave broken pipe pieces in place -/obj/structure/disposalpipe/proc/broken(var/remains = 0) +/obj/structure/disposalpipe/proc/broken(remains = 0) if(remains) for(var/D in cardinal) if(D & dpdir) @@ -836,7 +836,7 @@ //attack by item //weldingtool: unfasten and convert to obj/disposalconstruct -/obj/structure/disposalpipe/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposalpipe/attackby(obj/item/I, mob/user, params) var/turf/T = src.loc if(T.intact) @@ -915,7 +915,7 @@ // if coming in from secondary dirs, then next is primary dir // if coming in from primary dir, then next is equal chance of other dirs -/obj/structure/disposalpipe/junction/nextdir(var/fromdir) +/obj/structure/disposalpipe/junction/nextdir(fromdir) var/flipdir = turn(fromdir, 180) if(flipdir != dir) // came from secondary dir return dir // so exit through primary @@ -973,7 +973,7 @@ update() return -/obj/structure/disposalpipe/sortjunction/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposalpipe/sortjunction/attackby(obj/item/I, mob/user, params) if(..()) return @@ -993,7 +993,7 @@ // if coming in from posdir, then flip around and go back to posdir // if coming in from sortdir, go to posdir -/obj/structure/disposalpipe/sortjunction/nextdir(var/fromdir, var/sortTag) +/obj/structure/disposalpipe/sortjunction/nextdir(fromdir, sortTag) //var/flipdir = turn(fromdir, 180) if(fromdir != sortdir) // probably came from the negdir @@ -1005,7 +1005,7 @@ // so go with the flow to positive direction return posdir -/obj/structure/disposalpipe/sortjunction/transfer(var/obj/structure/disposalholder/H) +/obj/structure/disposalpipe/sortjunction/transfer(obj/structure/disposalholder/H) var/nextdir = nextdir(H.dir, H.destinationTag) H.dir = nextdir var/turf/T = H.nextloc() @@ -1054,7 +1054,7 @@ // if coming in from posdir, then flip around and go back to posdir // if coming in from sortdir, go to posdir -/obj/structure/disposalpipe/wrapsortjunction/nextdir(var/fromdir, var/istomail) +/obj/structure/disposalpipe/wrapsortjunction/nextdir(fromdir, istomail) //var/flipdir = turn(fromdir, 180) if(fromdir != sortdir) // probably came from the negdir @@ -1066,7 +1066,7 @@ // so go with the flow to positive direction return posdir -/obj/structure/disposalpipe/wrapsortjunction/transfer(var/obj/structure/disposalholder/H) +/obj/structure/disposalpipe/wrapsortjunction/transfer(obj/structure/disposalholder/H) var/nextdir = nextdir(H.dir, H.tomail) H.dir = nextdir var/turf/T = H.nextloc() @@ -1119,7 +1119,7 @@ return // Override attackby so we disallow trunkremoval when somethings ontop -/obj/structure/disposalpipe/trunk/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposalpipe/trunk/attackby(obj/item/I, mob/user, params) //Disposal bins or chutes /* @@ -1164,7 +1164,7 @@ // if not entering from disposal bin, // transfer to linked object (outlet or bin) -/obj/structure/disposalpipe/trunk/transfer(var/obj/structure/disposalholder/H) +/obj/structure/disposalpipe/trunk/transfer(obj/structure/disposalholder/H) if(H.dir == DOWN) // we just entered from a disposer return ..() // so do base transfer proc @@ -1184,7 +1184,7 @@ // nextdir -/obj/structure/disposalpipe/trunk/nextdir(var/fromdir) +/obj/structure/disposalpipe/trunk/nextdir(fromdir) if(fromdir == DOWN) return dir else @@ -1246,7 +1246,7 @@ // expel the contents of the holder object, then delete it // called when the holder exits the outlet -/obj/structure/disposaloutlet/proc/expel(var/obj/structure/disposalholder/H) +/obj/structure/disposaloutlet/proc/expel(obj/structure/disposalholder/H) flick("outlet-open", src) if((start_eject + 30) < world.time) @@ -1267,7 +1267,7 @@ qdel(H) return -/obj/structure/disposaloutlet/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposaloutlet/attackby(obj/item/I, mob/user, params) if(!I || !user) return src.add_fingerprint(user) @@ -1305,7 +1305,7 @@ // called when movable is expelled from a disposal pipe or outlet // by default does nothing, override for special behaviour -/atom/movable/proc/pipe_eject(var/direction) +/atom/movable/proc/pipe_eject(direction) return // check if mob has client, if so restore client view on eject @@ -1316,7 +1316,7 @@ return -/obj/effect/decal/cleanable/blood/gibs/pipe_eject(var/direction) +/obj/effect/decal/cleanable/blood/gibs/pipe_eject(direction) var/list/dirs if(direction) dirs = list( direction, turn(direction, -45), turn(direction, 45)) @@ -1325,11 +1325,11 @@ src.streak(dirs) -/obj/effect/decal/cleanable/robot_debris/gib/pipe_eject(var/direction) +/obj/effect/decal/cleanable/robot_debris/gib/pipe_eject(direction) var/list/dirs if(direction) dirs = list( direction, turn(direction, -45), turn(direction, 45)) else dirs = alldirs.Copy() - src.streak(dirs) + src.streak(dirs) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 5225e5a4d48..fc8b12cbe5b 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -10,7 +10,7 @@ var/sortTag = 0 -/obj/structure/bigDelivery/attack_hand(mob/user as mob) +/obj/structure/bigDelivery/attack_hand(mob/user) playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1) qdel(src) @@ -25,7 +25,7 @@ AM.loc = T ..() -/obj/structure/bigDelivery/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/bigDelivery/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/destTagger)) var/obj/item/device/destTagger/O = W @@ -68,7 +68,7 @@ var/sortTag = 0 -/obj/item/smallDelivery/attack_self(mob/user as mob) +/obj/item/smallDelivery/attack_self(mob/user) if(wrapped && wrapped.loc) //sometimes items can disappear. For example, bombs. --rastaf0 wrapped.loc = user.loc if(ishuman(user)) @@ -79,7 +79,7 @@ qdel(src) -/obj/item/smallDelivery/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/smallDelivery/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/destTagger)) var/obj/item/device/destTagger/O = W @@ -120,7 +120,7 @@ burn_state = 0 //burnable -/obj/item/stack/packageWrap/afterattack(var/obj/target as obj, mob/user as mob, proximity) +/obj/item/stack/packageWrap/afterattack(obj/target, mob/user, proximity) if(!proximity) return if(!istype(target)) //this really shouldn't be necessary (but it is). -Pete return @@ -204,7 +204,7 @@ flags = CONDUCT slot_flags = SLOT_BELT -/obj/item/device/destTagger/proc/openwindow(mob/user as mob) +/obj/item/device/destTagger/proc/openwindow(mob/user) var/dat = "

    TagMaster 2.2

    " dat += "" @@ -219,7 +219,7 @@ user << browse(dat, "window=destTagScreen;size=450x350") onclose(user, "destTagScreen") -/obj/item/device/destTagger/attack_self(mob/user as mob) +/obj/item/device/destTagger/attack_self(mob/user) openwindow(user) return @@ -256,7 +256,7 @@ /obj/machinery/disposal/deliveryChute/update() return -/obj/machinery/disposal/deliveryChute/Bumped(var/atom/movable/AM) //Go straight into the chute +/obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute if(!AM.disposalEnterTry()) return switch(dir) @@ -292,7 +292,7 @@ /obj/machinery/disposal/deliveryChute/newHolderDestination(obj/structure/disposalholder/H) H.destinationTag = 1 -/obj/machinery/disposal/deliveryChute/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/disposal/deliveryChute/attackby(obj/item/I, mob/user, params) if(!I || !user) return diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index ad73173fdbe..59205f31359 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -59,7 +59,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). qdel(src) -/obj/machinery/r_n_d/circuit_imprinter/proc/check_mat(datum/design/being_built, var/M) +/obj/machinery/r_n_d/circuit_imprinter/proc/check_mat(datum/design/being_built, M) switch(M) if(MAT_GLASS) return (g_amount - (being_built.materials[M]/efficiency_coeff) >= 0) @@ -74,7 +74,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). /obj/machinery/r_n_d/circuit_imprinter/proc/TotalMaterials() return g_amount + gold_amount + diamond_amount -/obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/circuit_imprinter/attackby(obj/item/O, mob/user, params) if (shocked) shock(user,50) if (default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter", O)) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index a7af564216a..4f7414e3457 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -44,7 +44,7 @@ other types of metals and chemistry for reagents). //A proc to calculate the reliability of a design based on tech levels and innate modifiers. //Input: A list of /datum/tech; Output: The new reliabilty. -/datum/design/proc/CalcReliability(var/list/temp_techs) +/datum/design/proc/CalcReliability(list/temp_techs) var/new_reliability for(var/datum/tech/T in temp_techs) if(T.id in req_tech) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 57f36ad9179..6fef356857b 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -30,14 +30,14 @@ Note: Must be placed within 3 tiles of the R&D Console decon_mod = T -/obj/machinery/r_n_d/destructive_analyzer/proc/ConvertReqString2List(var/list/source_list) +/obj/machinery/r_n_d/destructive_analyzer/proc/ConvertReqString2List(list/source_list) var/list/temp_list = params2list(source_list) for(var/O in temp_list) temp_list[O] = text2num(temp_list[O]) return temp_list -/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/destructive_analyzer/attackby(obj/item/O, mob/user, params) if (shocked) shock(user,50) if (default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O)) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 731a78e8b7c..0d9299f5ce1 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -34,7 +34,7 @@ var/list/valid_items = list() //valid items for special reactions like transforming var/list/critical_items = list() //items that can cause critical reactions -/obj/machinery/r_n_d/experimentor/proc/ConvertReqString2List(var/list/source_list) +/obj/machinery/r_n_d/experimentor/proc/ConvertReqString2List(list/source_list) var/list/temp_list = params2list(source_list) for(var/O in temp_list) temp_list[O] = text2num(temp_list[O]) @@ -106,7 +106,7 @@ for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) badThingCoeff += M.rating -/obj/machinery/r_n_d/experimentor/proc/checkCircumstances(var/obj/item/O as obj) +/obj/machinery/r_n_d/experimentor/proc/checkCircumstances(obj/item/O) //snowflake check to only take "made" bombs if(istype(O,/obj/item/device/transfer_valve)) var/obj/item/device/transfer_valve/T = O @@ -114,7 +114,7 @@ return FALSE return TRUE -/obj/machinery/r_n_d/experimentor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/experimentor/attackby(obj/item/O, mob/user, params) if (shocked) shock(user,50) @@ -162,11 +162,11 @@ return -/obj/machinery/r_n_d/experimentor/default_deconstruction_crowbar(var/obj/item/O) +/obj/machinery/r_n_d/experimentor/default_deconstruction_crowbar(obj/item/O) ejectItem() ..(O) -/obj/machinery/r_n_d/experimentor/attack_hand(mob/user as mob) +/obj/machinery/r_n_d/experimentor/attack_hand(mob/user) user.set_machine(src) var/dat = "
    " if(!linked_console) @@ -200,7 +200,7 @@ onclose(user, "experimentor") -/obj/machinery/r_n_d/experimentor/proc/matchReaction(var/matching,var/reaction) +/obj/machinery/r_n_d/experimentor/proc/matchReaction(matching,reaction) var/obj/item/D = matching if(D) if(item_reactions.Find("[D.type]")) @@ -214,7 +214,7 @@ else return FAIL -/obj/machinery/r_n_d/experimentor/proc/ejectItem(var/delete=FALSE) +/obj/machinery/r_n_d/experimentor/proc/ejectItem(delete=FALSE) if(loaded_item) if(cloneMode && cloneCount > 0) visible_message("A duplicate [loaded_item] pops out!") @@ -230,12 +230,12 @@ qdel(loaded_item) loaded_item = null -/obj/machinery/r_n_d/experimentor/proc/throwSmoke(var/turf/where) +/obj/machinery/r_n_d/experimentor/proc/throwSmoke(turf/where) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(1,0, where, 0) smoke.start() -/obj/machinery/r_n_d/experimentor/proc/pickWeighted(var/list/from) +/obj/machinery/r_n_d/experimentor/proc/pickWeighted(list/from) var/result = FALSE var/counter = 1 while(!result) @@ -248,7 +248,7 @@ else counter = 1 -/obj/machinery/r_n_d/experimentor/proc/experiment(var/exp,var/obj/item/exp_on) +/obj/machinery/r_n_d/experimentor/proc/experiment(exp,obj/item/exp_on) recentlyExperimented = 1 icon_state = "h_lathe_wloop" var/chosenchem @@ -588,7 +588,7 @@ return //~~~~~~~~Admin logging proc, aka the Powergamer Alarm~~~~~~~~ -/obj/machinery/r_n_d/experimentor/proc/warn_admins(var/mob/user, var/ReactionName) +/obj/machinery/r_n_d/experimentor/proc/warn_admins(mob/user, ReactionName) var/turf/T = get_turf(src) message_admins("Experimentor reaction: [ReactionName] generated by [key_name_admin(user)](?) (FLW) at ([T.x],[T.y],[T.z] - JMP)",0,1) log_game("Experimentor reaction: [ReactionName] generated by [key_name(user)] in ([T.x],[T.y],[T.z])") @@ -636,7 +636,7 @@ cooldownMax = rand(60,300) realProc = pick("teleport","explode","rapidDupe","petSpray","flash","clean","corgicannon") -/obj/item/weapon/relic/attack_self(mob/user as mob) +/obj/item/weapon/relic/attack_self(mob/user) if(revealed) if(cooldown) user << "[src] does not react!" @@ -651,31 +651,31 @@ //////////////// RELIC PROCS ///////////////////////////// -/obj/item/weapon/relic/proc/throwSmoke(var/turf/where) +/obj/item/weapon/relic/proc/throwSmoke(turf/where) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(1,0, where, 0) smoke.start() -/obj/item/weapon/relic/proc/corgicannon(var/mob/user) +/obj/item/weapon/relic/proc/corgicannon(mob/user) playsound(src.loc, "sparks", rand(25,50), 1) var/mob/living/simple_animal/pet/corgi/C = new/mob/living/simple_animal/pet/corgi(get_turf(user)) C.throw_at(pick(oview(10,user)),10,rand(3,8)) throwSmoke(get_turf(C)) warn_admins(user, "Corgi Cannon", 0) -/obj/item/weapon/relic/proc/clean(var/mob/user) +/obj/item/weapon/relic/proc/clean(mob/user) playsound(src.loc, "sparks", rand(25,50), 1) var/obj/item/weapon/grenade/chem_grenade/cleaner/CL = new/obj/item/weapon/grenade/chem_grenade/cleaner(get_turf(user)) CL.prime() warn_admins(user, "Smoke", 0) -/obj/item/weapon/relic/proc/flash(var/mob/user) +/obj/item/weapon/relic/proc/flash(mob/user) playsound(src.loc, "sparks", rand(25,50), 1) var/obj/item/weapon/grenade/flashbang/CB = new/obj/item/weapon/grenade/flashbang(get_turf(user)) CB.prime() warn_admins(user, "Flash") -/obj/item/weapon/relic/proc/petSpray(var/mob/user) +/obj/item/weapon/relic/proc/petSpray(mob/user) var/message = "[src] begans to shake, and in the distance the sound of rampaging animals arises!" visible_message(message) user << message @@ -690,7 +690,7 @@ user << "[src] falls apart!" qdel(src) -/obj/item/weapon/relic/proc/rapidDupe(var/mob/user) +/obj/item/weapon/relic/proc/rapidDupe(mob/user) audible_message("[src] emits a loud pop!") var/list/dupes = list() var/counter @@ -711,7 +711,7 @@ qdel(R) warn_admins(user, "Rapid duplicator", 0) -/obj/item/weapon/relic/proc/explode(var/mob/user) +/obj/item/weapon/relic/proc/explode(mob/user) user << "[src] begins to heat up!" spawn(rand(35,100)) if(src.loc == user) @@ -720,7 +720,7 @@ warn_admins(user, "Explosion") qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!! -/obj/item/weapon/relic/proc/teleport(var/mob/user) +/obj/item/weapon/relic/proc/teleport(mob/user) user << "The [src] begins to vibrate!" spawn(rand(10,30)) var/turf/userturf = get_turf(user) @@ -732,7 +732,7 @@ warn_admins(user, "Teleport", 0) //Admin Warning proc for relics -/obj/item/weapon/relic/proc/warn_admins(var/mob/user, var/RelicType, var/priority = 1) +/obj/item/weapon/relic/proc/warn_admins(mob/user, RelicType, priority = 1) var/turf/T = get_turf(src) var/log_msg = "[RelicType] relic used by [key_name(user)] in ([T.x],[T.y],[T.z])" if(priority) //For truly dangerous relics that may need an admin's attention. BWOINK! diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 6c584bc1a15..901d291e947 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -116,17 +116,17 @@ var/global/list/obj/machinery/message_server/message_servers = list() update_icon() return -/obj/machinery/message_server/proc/send_chat_message(var/sender = "", var/channel = "", var/message = "") +/obj/machinery/message_server/proc/send_chat_message(sender = "", channel = "", message = "") chat_msgs += new/datum/data_chat_msg(sender,channel,message) -/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "",var/photo=null) +/obj/machinery/message_server/proc/send_pda_message(recipient = "",sender = "",message = "",photo=null) . = new/datum/data_pda_msg(recipient,sender,message,photo) pda_msgs += . -/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1) +/obj/machinery/message_server/proc/send_rc_message(recipient = "",sender = "",message = "",stamp = "", id_auth = "", priority = 1) rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth) -/obj/machinery/message_server/attack_hand(user as mob) +/obj/machinery/message_server/attack_hand(mob/user) // user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few Centcom delays." user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]" active = !active @@ -154,7 +154,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() variable = param_variable value = param_value -/datum/feedback_variable/proc/inc(var/num = 1) +/datum/feedback_variable/proc/inc(num = 1) if (isnum(value)) value += num else @@ -164,7 +164,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() else value = num -/datum/feedback_variable/proc/dec(var/num = 1) +/datum/feedback_variable/proc/dec(num = 1) if (isnum(value)) value -= num else @@ -174,7 +174,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() else value = -num -/datum/feedback_variable/proc/set_value(var/num) +/datum/feedback_variable/proc/set_value(num) if (isnum(num)) value = num @@ -186,11 +186,11 @@ var/global/list/obj/machinery/message_server/message_servers = list() /datum/feedback_variable/proc/get_variable() return variable -/datum/feedback_variable/proc/set_details(var/text) +/datum/feedback_variable/proc/set_details(text) if (istext(text)) details = text -/datum/feedback_variable/proc/add_details(var/text) +/datum/feedback_variable/proc/add_details(text) if (istext(text)) text = replacetext(text, " ", "_") if (!details) @@ -260,7 +260,7 @@ var/obj/machinery/blackbox_recorder/blackbox blackbox = BR ..() -/obj/machinery/blackbox_recorder/proc/find_feedback_datum(var/variable) +/obj/machinery/blackbox_recorder/proc/find_feedback_datum(variable) for (var/datum/feedback_variable/FV in feedback) if (FV.get_variable() == variable) return FV @@ -340,7 +340,7 @@ var/obj/machinery/blackbox_recorder/blackbox query_insert.Execute() -/proc/feedback_set(var/variable,var/value) +/proc/feedback_set(variable,value) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -349,7 +349,7 @@ var/obj/machinery/blackbox_recorder/blackbox FV.set_value(value) -/proc/feedback_inc(var/variable,var/value) +/proc/feedback_inc(variable,value) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -358,7 +358,7 @@ var/obj/machinery/blackbox_recorder/blackbox FV.inc(value) -/proc/feedback_dec(var/variable,var/value) +/proc/feedback_dec(variable,value) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -367,7 +367,7 @@ var/obj/machinery/blackbox_recorder/blackbox FV.dec(value) -/proc/feedback_set_details(var/variable,var/details) +/proc/feedback_set_details(variable,details) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -376,7 +376,7 @@ var/obj/machinery/blackbox_recorder/blackbox FV.set_details(details) -/proc/feedback_add_details(var/variable,var/details) +/proc/feedback_add_details(variable,details) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 6ab22db8ebc..07ab76f7b5d 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -70,7 +70,7 @@ Note: Must be placed west/left of and R&D console to function. T += (M.rating/3) efficiency_coeff = max(T, 1) -/obj/machinery/r_n_d/protolathe/proc/check_mat(datum/design/being_built, var/M) // now returns how many times the item can be built with the material +/obj/machinery/r_n_d/protolathe/proc/check_mat(datum/design/being_built, M) // now returns how many times the item can be built with the material var/A = 0 switch(M) if(MAT_METAL) @@ -94,7 +94,7 @@ Note: Must be placed west/left of and R&D console to function. A = A / max(1, (being_built.materials[M]/efficiency_coeff)) return A -/obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/protolathe/attackby(obj/item/O, mob/user, params) if (shocked) shock(user,50) if (default_deconstruction_screwdriver(user, "protolathe_t", "protolathe", O)) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index b96bc830e9b..a3e8c47888d 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -52,7 +52,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/list/datum/design/matching_designs = list() //for the search function -/obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID. +/obj/machinery/computer/rdconsole/proc/CallTechName(ID) //A simple helper proc to find the name of a tech with a given ID. var/datum/tech/check_tech var/return_name = null for(var/T in typesof(/datum/tech) - /datum/tech) @@ -66,7 +66,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, return return_name -/obj/machinery/computer/rdconsole/proc/CallMaterialName(var/ID) +/obj/machinery/computer/rdconsole/proc/CallMaterialName(ID) var/datum/reagent/temp_reagent var/return_name = null if (copytext(ID, 1, 2) == "$") @@ -144,7 +144,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, griefProtection() */ -/obj/machinery/computer/rdconsole/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params) +/obj/machinery/computer/rdconsole/attackby(obj/item/weapon/D, mob/user, params) //Loading a disk into it. if(istype(D, /obj/item/weapon/disk)) @@ -166,7 +166,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, src.updateUsrDialog() return -/obj/machinery/computer/rdconsole/emag_act(mob/user as mob) +/obj/machinery/computer/rdconsole/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 @@ -603,7 +603,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, return -/obj/machinery/computer/rdconsole/attack_hand(mob/user as mob) +/obj/machinery/computer/rdconsole/attack_hand(mob/user) if(..()) return interact(user) @@ -1063,7 +1063,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, return //helper proc, which return a table containing categories -/obj/machinery/computer/rdconsole/proc/list_categories(var/list/categories, var/menu_num as num) +/obj/machinery/computer/rdconsole/proc/list_categories(list/categories, menu_num as num) if(!categories) return diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index e4ed832817e..91a33aa41be 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -49,7 +49,7 @@ else return 0 -/obj/machinery/r_n_d/attack_hand(mob/user as mob) +/obj/machinery/r_n_d/attack_hand(mob/user) if (shocked) shock(user,50) if(panel_open) diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 397f6edbad4..ac43f99f99c 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -63,7 +63,7 @@ research holder datum. //Checks to see if tech has all the required pre-reqs. //Input: datum/tech; Output: 0/1 (false/true) -/datum/research/proc/TechHasReqs(var/datum/tech/T) +/datum/research/proc/TechHasReqs(datum/tech/T) if(T.req_tech.len == 0) return 1 var/matches = 0 @@ -79,7 +79,7 @@ research holder datum. //Checks to see if design has all the required pre-reqs. //Input: datum/design; Output: 0/1 (false/true) -/datum/research/proc/DesignHasReqs(var/datum/design/D)//Heavily optimized -Sieve +/datum/research/proc/DesignHasReqs(datum/design/D)//Heavily optimized -Sieve if(D.req_tech.len == 0) return 1 for(var/datum/tech/T in known_tech) @@ -106,7 +106,7 @@ research holder datum. */ //Adds a tech to known_tech list. Checks to make sure there aren't duplicates and updates existing tech's levels if needed. //Input: datum/tech; Output: Null -/datum/research/proc/AddTech2Known(var/datum/tech/T) +/datum/research/proc/AddTech2Known(datum/tech/T) for(var/datum/tech/known in known_tech) if(T.id == known.id) if(T.level > known.level) @@ -115,7 +115,7 @@ research holder datum. known_tech += T return -/datum/research/proc/AddDesign2Known(var/datum/design/D) +/datum/research/proc/AddDesign2Known(datum/design/D) for(var/datum/design/known in known_designs) if(D.id == known.id) if(D.reliability > known.reliability) @@ -141,14 +141,14 @@ research holder datum. //Refreshes the levels of a given tech. //Input: Tech's ID and Level; Output: null -/datum/research/proc/UpdateTech(var/ID, var/level) +/datum/research/proc/UpdateTech(ID, level) for(var/datum/tech/KT in known_tech) if(KT.id == ID) if(KT.level <= level) KT.level = max((KT.level + 1), (level - 1)) return -/datum/research/proc/UpdateDesigns(var/obj/item/I, var/list/temp_tech) +/datum/research/proc/UpdateDesigns(obj/item/I, list/temp_tech) for(var/T in temp_tech) if(temp_tech[T] - 1 >= known_tech[T]) for(var/datum/design/D in known_designs) @@ -159,7 +159,7 @@ research holder datum. if(I.crit_fail) D.reliability = min(100, D.reliability + rand(3, 5)) -/datum/research/proc/FindDesignByID(var/id) +/datum/research/proc/FindDesignByID(id) for(var/datum/design/D in known_designs) if(D.id == id) return D @@ -175,7 +175,7 @@ research holder datum. if((D.build_type & AUTOLATHE) && ("initial" in D.category)) //autolathe starts without hacked designs AddDesign2Known(D) -/datum/research/autolathe/AddDesign2Known(var/datum/design/D) +/datum/research/autolathe/AddDesign2Known(datum/design/D) if(!(D.build_type & AUTOLATHE)) return ..() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index fb56e869fe8..af580b93b83 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -121,7 +121,7 @@ env.merge(removed) air_update_turf() -/obj/machinery/r_n_d/server/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/server/attackby(obj/item/O, mob/user, params) if (disabled) return if (shocked) @@ -256,7 +256,7 @@ updateUsrDialog() return -/obj/machinery/computer/rdservercontrol/attack_hand(mob/user as mob) +/obj/machinery/computer/rdservercontrol/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -317,12 +317,12 @@ onclose(user, "server_control") return -/obj/machinery/computer/rdservercontrol/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params) +/obj/machinery/computer/rdservercontrol/attackby(obj/item/weapon/D, mob/user, params) ..() src.updateUsrDialog() return -/obj/machinery/computer/rdservercontrol/emag_act(mob/user as mob) +/obj/machinery/computer/rdservercontrol/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index a36af9c71ca..ac15222b3ff 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -18,7 +18,7 @@ var/pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/rped.ogg' var/alt_sound = null -/obj/item/weapon/storage/part_replacer/afterattack(obj/machinery/T as obj, mob/living/carbon/human/user as mob, flag, params) +/obj/item/weapon/storage/part_replacer/afterattack(obj/machinery/T, mob/living/carbon/human/user, flag, params) if(flag) return else @@ -62,7 +62,7 @@ //Sorts stock parts inside an RPED by their rating. //Only use /obj/item/weapon/stock_parts/ with this sort proc! -/proc/cmp_rped_sort(var/obj/item/weapon/stock_parts/A, var/obj/item/weapon/stock_parts/B) +/proc/cmp_rped_sort(obj/item/weapon/stock_parts/A, obj/item/weapon/stock_parts/B) return B.rating - A.rating /obj/item/weapon/stock_parts diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 6042955456d..e91fa523046 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -15,7 +15,7 @@ var/Uses = 1 // uses before it goes inert var/enhanced = 0 //has it been enhanced before? -/obj/item/slime_extract/attackby(obj/item/O as obj, mob/user as mob) +/obj/item/slime_extract/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/weapon/slimesteroid2)) if(enhanced == 1) user << "This extract has already been enhanced!" @@ -128,7 +128,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle19" -/obj/item/slimepotion/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) +/obj/item/slimepotion/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) user << "The potion only works on slimes!" return ..() @@ -156,7 +156,7 @@ var/list/not_interested = list() var/being_used = 0 -/obj/item/slimepotion2/afterattack(mob/living/M as mob, mob/user as mob) +/obj/item/slimepotion2/afterattack(mob/living/M, mob/user) if(being_used || !ismob(M)) return if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled @@ -218,7 +218,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" -/obj/item/weapon/slimesteroid/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) +/obj/item/weapon/slimesteroid/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M))//If target is not a slime. user << "The steroid only works on baby slimes!" return ..() @@ -269,7 +269,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle15" -/obj/item/weapon/slimestabilizer/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) +/obj/item/weapon/slimestabilizer/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) user << "The stabilizer only works on slimes!" return ..() @@ -290,7 +290,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle3" -/obj/item/weapon/slimemutator/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) +/obj/item/weapon/slimemutator/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) user << "The mutator only works on slimes!" return ..() @@ -397,7 +397,7 @@ else icon_state = "golem" -/obj/effect/golemrune/attack_hand(mob/living/user as mob) +/obj/effect/golemrune/attack_hand(mob/living/user) var/mob/dead/observer/ghost for(var/mob/dead/observer/O in src.loc) if(!O.client) continue diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index f2d999e59f8..cd8c7258b05 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -58,7 +58,7 @@ var/list/allowed_custom_spans = list(SPAN_ROBOT,SPAN_YELL,SPAN_ITALICS,SPAN_SANS /* -- Execute the compiled code -- */ - proc/Run(var/datum/signal/signal) + proc/Run(datum/signal/signal) if(!ready) return @@ -256,7 +256,7 @@ var/const/SIGNAL_COOLDOWN = 20 // 2 seconds /datum/signal - proc/mem(var/address, var/value) + proc/mem(address, value) if(istext(address)) var/obj/machinery/telecomms/server/S = data["server"] @@ -268,7 +268,7 @@ var/const/SIGNAL_COOLDOWN = 20 // 2 seconds S.memory[address] = value - proc/signaler(var/freq = 1459, var/code = 30) + proc/signaler(freq = 1459, code = 30) if(isnum(freq) && isnum(code)) @@ -299,7 +299,7 @@ var/const/SIGNAL_COOLDOWN = 20 // 2 seconds lastsignalers.Add("[time] : [S.id] sent a signal command, which was triggered by NTSL.: [format_frequency(freq)]/[code]") - proc/tcombroadcast(var/message, var/freq, var/source, var/job, var/spans, var/say = "says", var/ask = "asks", var/yell = "yells", var/exclaim = "exclaims") + proc/tcombroadcast(message, freq, source, job, spans, say = "says", ask = "asks", yell = "yells", exclaim = "exclaims") var/datum/signal/newsign = new var/obj/machinery/telecomms/server/S = data["server"] diff --git a/code/modules/scripting/Implementations/_Logic.dm b/code/modules/scripting/Implementations/_Logic.dm index 6fd47acf7c8..723ffe4490f 100644 --- a/code/modules/scripting/Implementations/_Logic.dm +++ b/code/modules/scripting/Implementations/_Logic.dm @@ -26,7 +26,7 @@ return pick(finalpick) // Gets/Sets a value at a key in the list -/proc/n_listpos(var/list/L, var/pos, var/value) +/proc/n_listpos(list/L, pos, value) if(!istype(L, /list)) return if(isnum(pos)) if(!value) @@ -42,7 +42,7 @@ L[pos] = value // Copies the list into a new one -/proc/n_listcopy(var/list/L, var/start, var/end) +/proc/n_listcopy(list/L, start, end) if(!istype(L, /list)) return return L.Copy(start, end) @@ -75,25 +75,25 @@ chosenlist.Remove(e) // Cuts out a copy of a list -/proc/n_listcut(var/list/L, var/start, var/end) +/proc/n_listcut(list/L, start, end) if(!istype(L, /list)) return return L.Cut(start, end) // Swaps two values in the list -/proc/n_listswap(var/list/L, var/firstindex, var/secondindex) +/proc/n_listswap(list/L, firstindex, secondindex) if(!istype(L, /list)) return if(L.len >= secondindex && L.len >= firstindex) return L.Swap(firstindex, secondindex) // Inserts a value into the list -/proc/n_listinsert(var/list/L, var/index, var/element) +/proc/n_listinsert(list/L, index, element) if(!istype(L, /list)) return return L.Insert(index, element) // --- String methods --- //If list, finds a value in it, if text, finds a substring in it -/proc/n_smartfind(var/haystack, var/needle, var/start = 1, var/end = 0) +/proc/n_smartfind(haystack, needle, start = 1, end = 0) if(haystack && needle) if(isobject(haystack)) if(istype(haystack, /list)) @@ -107,40 +107,40 @@ return findtext(haystack, needle, start, end) //Returns a substring of the string -/proc/n_substr(var/string, var/start = 1, var/end = 0) +/proc/n_substr(string, start = 1, end = 0) if(istext(string) && isnum(start) && isnum(end)) if(start > 0) return copytext(string, start, end) //Returns the length of the string or list -/proc/n_smartlength(var/container) +/proc/n_smartlength(container) if(container) if(istype(container, /list) || istext(container)) return length(container) return 0 //Lowercase all characters -/proc/n_lower(var/string) +/proc/n_lower(string) if(istext(string)) return lowertext(string) //Uppercase all characters -/proc/n_upper(var/string) +/proc/n_upper(string) if(istext(string)) return uppertext(string) //Converts a string to a list -/proc/n_explode(var/string, var/separator = "") +/proc/n_explode(string, separator = "") if(istext(string) && (istext(separator) || isnull(separator))) return text2list(string, separator) //Converts a list to a string -/proc/n_implode(var/list/li, var/separator) +/proc/n_implode(list/li, separator) if(istype(li) && (istext(separator) || isnull(separator))) return list2text(li, separator) //Repeats the string x times -/proc/n_repeat(var/string, var/amount) +/proc/n_repeat(string, amount) if(istext(string) && isnum(amount)) var/i var/newstring = "" @@ -154,7 +154,7 @@ return newstring //Reverses the order of the string. "Clown" becomes "nwolC" -/proc/n_reverse(var/string) +/proc/n_reverse(string) if(istext(string)) var/newstring = "" var/i @@ -166,11 +166,11 @@ return newstring // String -> Number -/proc/n_str2num(var/string) +/proc/n_str2num(string) if(istext(string)) return text2num(string) -/proc/n_proper(var/string) +/proc/n_proper(string) if(!istext(string)) return "" @@ -203,53 +203,53 @@ return min -/proc/n_prob(var/chance) +/proc/n_prob(chance) return prob(chance) -/proc/n_randseed(var/seed) +/proc/n_randseed(seed) rand_seed(seed) return 0 -/proc/n_rand(var/low, var/high) +/proc/n_rand(low, high) if(isnull(low) && isnull(high)) return rand() return rand(low, high) // Number -> String -/proc/n_num2str(var/num) +/proc/n_num2str(num) if(isnum(num)) return num2text(num) // Squareroot -/proc/n_sqrt(var/num) +/proc/n_sqrt(num) if(isnum(num)) return sqrt(num) // Magnitude of num -/proc/n_abs(var/num) +/proc/n_abs(num) if(isnum(num)) return abs(num) // Round down -/proc/n_floor(var/num) +/proc/n_floor(num) if(isnum(num)) return round(num) // Round up -/proc/n_ceil(var/num) +/proc/n_ceil(num) if(isnum(num)) return round(num)+1 // Round to nearest integer -/proc/n_round(var/num) +/proc/n_round(num) if(isnum(num)) if(num-round(num)<0.5) return round(num) return n_ceil(num) // Clamps N between min and max -/proc/n_clamp(var/num, var/min=-1, var/max=1) +/proc/n_clamp(num, min=-1, max=1) if(isnum(num)&&isnum(min)&&isnum(max)) if(num<=min) return min @@ -258,32 +258,32 @@ return num // Returns 1 if N is inbetween Min and Max -/proc/n_inrange(var/num, var/min=-1, var/max=1) +/proc/n_inrange(num, min=-1, max=1) if(isnum(num)&&isnum(min)&&isnum(max)) return ((min <= num) && (num <= max)) // Returns the sine of num -/proc/n_sin(var/num) +/proc/n_sin(num) if(isnum(num)) return sin(num) // Returns the cosine of num -/proc/n_cos(var/num) +/proc/n_cos(num) if(isnum(num)) return cos(num) // Returns the arcsine of num -/proc/n_asin(var/num) +/proc/n_asin(num) if(isnum(num)&&-1<=num&&num<=1) return arcsin(num) // Returns the arccosine of num -/proc/n_acos(var/num) +/proc/n_acos(num) if(isnum(num)&&-1<=num&&num<=1) return arccos(num) // Returns the natural log of num -/proc/n_log(var/num) +/proc/n_log(num) if(isnum(num)&&0 */ - ParseParamExpression(var/check_functions = 0) + ParseParamExpression(check_functions = 0) var/cf = check_functions return ParseExpression(list(",", ")"), check_functions = cf) \ No newline at end of file diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 2a1909a15dd..d87e5fdf524 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -20,15 +20,15 @@ active_power_usage = 6 power_channel = ENVIRON -/obj/machinery/keycard_auth/attack_ai(mob/user as mob) +/obj/machinery/keycard_auth/attack_ai(mob/user) user << "The station AI is not to interact with these devices." return -/obj/machinery/keycard_auth/attack_paw(mob/user as mob) +/obj/machinery/keycard_auth/attack_paw(mob/user) user << "You are too primitive to use this device!" return -/obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/keycard_auth/attackby(obj/item/weapon/W, mob/user, params) if(stat & (NOPOWER|BROKEN)) user << "This device is not powered." return @@ -51,7 +51,7 @@ else stat |= NOPOWER -/obj/machinery/keycard_auth/attack_hand(mob/user as mob) +/obj/machinery/keycard_auth/attack_hand(mob/user) if(user.stat || stat & (NOPOWER|BROKEN)) user << "This device is not powered!" return @@ -120,7 +120,7 @@ message_admins("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]") reset() -/obj/machinery/keycard_auth/proc/receive_request(var/obj/machinery/keycard_auth/source) +/obj/machinery/keycard_auth/proc/receive_request(obj/machinery/keycard_auth/source) if(stat & (BROKEN|NOPOWER)) return event_source = source diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index 29a04c4f92a..da714890067 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -6,7 +6,7 @@ //config.alert_desc_blue_downto -/proc/set_security_level(var/level) +/proc/set_security_level(level) switch(level) if("green") level = SEC_LEVEL_GREEN @@ -70,7 +70,7 @@ if(SEC_LEVEL_DELTA) return "delta" -/proc/num2seclevel(var/num) +/proc/num2seclevel(num) switch(num) if(SEC_LEVEL_GREEN) return "green" @@ -81,7 +81,7 @@ if(SEC_LEVEL_DELTA) return "delta" -/proc/seclevel2num(var/seclevel) +/proc/seclevel2num(seclevel) switch( lowertext(seclevel) ) if("green") return SEC_LEVEL_GREEN diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 673e7176eaa..dfbb6085368 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -496,7 +496,7 @@ possible_destinations = C.possible_destinations shuttleId = C.shuttleId -/obj/machinery/computer/shuttle/attack_hand(user as mob) +/obj/machinery/computer/shuttle/attack_hand(mob/user) if(..(user)) return src.add_fingerprint(usr) @@ -540,7 +540,7 @@ if(1) usr << "Invalid shuttle requested." else usr << "Unable to comply." -/obj/machinery/computer/shuttle/emag_act(mob/user as mob) +/obj/machinery/computer/shuttle/emag_act(mob/user) if(!emagged) src.req_access = list() emagged = 1 diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 2025f3c155b..05ae58ccc21 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -137,7 +137,7 @@ //Heals brute and burn damage for the organ. Returns 1 if the damage-icon states changed at all. //Damage cannot go below zero. //Cannot remove negative damage (i.e. apply damage) -/obj/item/organ/limb/proc/heal_damage(brute, burn, var/robotic) +/obj/item/organ/limb/proc/heal_damage(brute, burn, robotic) if(robotic && status != ORGAN_ROBOTIC) // This makes organic limbs not heal when the proc is in Robotic mode. brute = max(0, brute - 3) diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index 74b9807dade..589731a3635 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -16,7 +16,7 @@ pixel_y = rand(-5, 5) -/obj/item/bluespace_crystal/attack_self(var/mob/user) +/obj/item/bluespace_crystal/attack_self(mob/user) user.visible_message("[user] crushes [src]!", "You crush [src]!") PoolOrNew(/obj/effect/effect/sparks, loc) playsound(src.loc, "sparks", 50, 1) @@ -24,7 +24,7 @@ user.unEquip(src) qdel(src) -/obj/item/bluespace_crystal/proc/blink_mob(var/mob/living/L) +/obj/item/bluespace_crystal/proc/blink_mob(mob/living/L) do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg') /obj/item/bluespace_crystal/throw_impact(atom/hit_atom) diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 883a6fc01cd..05eaa989580 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -30,7 +30,7 @@ var/list/GPS_list = list() overlays -= "emp" overlays += "working" -/obj/item/device/gps/attack_self(mob/user as mob) +/obj/item/device/gps/attack_self(mob/user) var/obj/item/device/gps/t = "" var/gps_window_height = 110 + GPS_list.len * 20 // Variable window height, depending on how many GPS units there are to show diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index e1f4a37d288..4d585a48c8f 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -54,7 +54,7 @@ idle_power_usage = 20 active_power_usage = 500 var/stage = 0 -/obj/machinery/telepad_cargo/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/telepad_cargo/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) anchored = 0 playsound(src, 'sound/items/Ratchet.ogg', 50, 1) @@ -89,7 +89,7 @@ item_state = "signaler" origin_tech = "bluespace=3" -/obj/item/device/telepad_beacon/attack_self(mob/user as mob) +/obj/item/device/telepad_beacon/attack_self(mob/user) if(user) user << "Locked In" new /obj/machinery/telepad_cargo(user.loc) @@ -148,7 +148,7 @@ playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) user << "You calibrate the telepad locator." -/obj/item/weapon/rcs/emag_act(mob/user as mob) +/obj/item/weapon/rcs/emag_act(mob/user) if(!emagged) emagged = 1 var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/orphaned procs/AStar.dm b/code/orphaned procs/AStar.dm index eb491ee48ff..4f79d75e9d7 100644 --- a/code/orphaned procs/AStar.dm +++ b/code/orphaned procs/AStar.dm @@ -63,7 +63,7 @@ length to avoid portals or something i guess?? Not that they're counted right no //add an element in the list, //immediatly ordering it to its position using Insertion sort -/PriorityQueue/proc/Enqueue(var/atom/A) +/PriorityQueue/proc/Enqueue(atom/A) var/i L.Add(A) i = L.len -1 @@ -80,7 +80,7 @@ length to avoid portals or something i guess?? Not that they're counted right no return . //removes an element -/PriorityQueue/proc/Remove(var/atom/A) +/PriorityQueue/proc/Remove(atom/A) return L.Remove(A) //returns a copy of the elements list @@ -89,17 +89,17 @@ length to avoid portals or something i guess?? Not that they're counted right no return ret //return the position of an element or 0 if not found -/PriorityQueue/proc/Seek(var/atom/A) +/PriorityQueue/proc/Seek(atom/A) return L.Find(A) //return the element at the i_th position -/PriorityQueue/proc/Get(var/i) +/PriorityQueue/proc/Get(i) if(i > L.len || i < 1) return 0 return L[i] //replace the passed element at it's right position using the cmp proc -/PriorityQueue/proc/ReSort(var/atom/A) +/PriorityQueue/proc/ReSort(atom/A) var/i = Seek(A) if(i == 0) return @@ -144,7 +144,7 @@ length to avoid portals or something i guess?? Not that they're counted right no return a.f - b.f //search if there's a PathNode that points to turf T in the Priority Queue -/proc/SeekTurf(var/PriorityQueue/Queue, var/turf/T) +/proc/SeekTurf(var/PriorityQueue/Queue, turf/T) var/i = 1 var/PathNode/PN while(i < Queue.L.len + 1) @@ -162,7 +162,7 @@ length to avoid portals or something i guess?? Not that they're counted right no return path //the actual algorithm -/proc/AStar(start, end, atom, dist, maxnodes, maxnodedepth = 30, mintargetdist, minnodedist, id=null, var/turf/exclude=null) +/proc/AStar(start, end, atom, dist, maxnodes, maxnodedepth = 30, mintargetdist, minnodedist, id=null, turf/exclude=null) var/PriorityQueue/open = new /PriorityQueue(/proc/PathWeightCompare) //the open list, ordered using the PathWeightCompare proc, from lower f to higher var/list/closed = new() //the closed list var/list/path = null //the returned path, if any diff --git a/code/orphaned procs/priority_announce.dm b/code/orphaned procs/priority_announce.dm index 3630b9d58df..de3599f614b 100644 --- a/code/orphaned procs/priority_announce.dm +++ b/code/orphaned procs/priority_announce.dm @@ -1,4 +1,4 @@ -/proc/priority_announce(var/text, var/title = "", var/sound = 'sound/AI/attention.ogg', var/type) +/proc/priority_announce(text, title = "", sound = 'sound/AI/attention.ogg', type) if(!text) return @@ -29,7 +29,7 @@ M << announcement M << sound(sound) -/proc/print_command_report(var/text = "", var/title = "Central Command Update") +/proc/print_command_report(text = "", title = "Central Command Update") for (var/obj/machinery/computer/communications/C in machines) if(!(C.stat & (BROKEN|NOPOWER)) && C.z == ZLEVEL_STATION) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) @@ -38,7 +38,7 @@ C.messagetitle.Add("[title]") C.messagetext.Add(text) -/proc/minor_announce(var/message, var/title = "Attention:", var/alert) +/proc/minor_announce(message, title = "Attention:", alert) if(!message) return diff --git a/code/orphaned procs/statistics.dm b/code/orphaned procs/statistics.dm index 3f979dbc302..55acae66087 100644 --- a/code/orphaned procs/statistics.dm +++ b/code/orphaned procs/statistics.dm @@ -40,7 +40,7 @@ if(!config.sql_enabled) return -/proc/sql_report_death(var/mob/living/carbon/human/H) +/proc/sql_report_death(mob/living/carbon/human/H) if(!config.sql_enabled) return if(!H) @@ -75,7 +75,7 @@ log_game("SQL ERROR during death reporting. Error : \[[err]\]\n") -/proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H) +/proc/sql_report_cyborg_death(mob/living/silicon/robot/H) if(!config.sql_enabled) return if(!H) diff --git a/code/world.dm b/code/world.dm index 2eefe8ed0b7..d515df42aed 100644 --- a/code/world.dm +++ b/code/world.dm @@ -181,7 +181,7 @@ master_mode = Lines[1] diary << "Saved mode is '[master_mode]'" -/world/proc/save_mode(var/the_mode) +/world/proc/save_mode(the_mode) var/F = file("data/mode.txt") fdel(F) F << the_mode diff --git a/tgstation.dme b/tgstation.dme index 8144137aef2..82e85b7b2a3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,6 +6,63 @@ // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "code" +#define FILE_DIR "code/modules" +#define FILE_DIR "code/modules/games" +#define FILE_DIR "code/modules/html_interface" +#define FILE_DIR "code/modules/html_interface/cards" +#define FILE_DIR "code/modules/html_interface/nanotrasen" +#define FILE_DIR "html" +#define FILE_DIR "icons" +#define FILE_DIR "icons/ass" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/mob/inhands" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/atmospherics/pipes" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/food" +#define FILE_DIR "icons/obj/guns" +#define FILE_DIR "icons/obj/hydroponics" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/power_cond" +#define FILE_DIR "icons/obj/smooth_structures" +#define FILE_DIR "icons/obj/smooth_structures/alien" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/stamp_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/turf/floors" +#define FILE_DIR "icons/turf/walls" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "nano" +#define FILE_DIR "nano/images" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/arcade" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/guitar" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/magic" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/spookoween" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/voice/complionator" +#define FILE_DIR "sound/vox_fem" +#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES From 280373489ba120cd1ed02a7797407db7e8771e07 Mon Sep 17 00:00:00 2001 From: duncathan Date: Thu, 16 Jul 2015 03:34:18 -0600 Subject: [PATCH 51/52] fixes things per aran's request --- TODO.txt | 2 -- .../components/binary_devices/circulator.dm | 4 +-- .../components/binary_devices/dp_vent_pump.dm | 16 ++++++---- .../components/binary_devices/passive_gate.dm | 4 +-- .../components/binary_devices/pump.dm | 4 +-- .../components/binary_devices/valve.dm | 3 +- .../components/binary_devices/volume_pump.dm | 6 ++-- .../components/components_base.dm | 30 +++++++++++++------ .../components/trinary_devices/filter.dm | 12 ++++---- .../components/trinary_devices/mixer.dm | 24 ++++++++------- .../components/unary_devices/Freezer.dm | 4 +-- .../components/unary_devices/cold_sink.dm | 4 +-- .../components/unary_devices/cryo.dm | 14 ++++----- .../unary_devices/generator_input.dm | 4 +-- .../unary_devices/heat_exchanger.dm | 8 ++--- .../components/unary_devices/heat_source.dm | 4 +-- .../unary_devices/outlet_injector.dm | 8 ++--- .../unary_devices/oxygen_generator.dm | 9 +++--- .../components/unary_devices/tank.dm | 12 ++++---- .../components/unary_devices/unary_base.dm | 6 ++-- .../components/unary_devices/vent_pump.dm | 8 ++--- .../components/unary_devices/vent_scrubber.dm | 12 ++++---- 22 files changed, 109 insertions(+), 89 deletions(-) delete mode 100644 TODO.txt diff --git a/TODO.txt b/TODO.txt deleted file mode 100644 index 1187050192d..00000000000 --- a/TODO.txt +++ /dev/null @@ -1,2 +0,0 @@ -make air flow - likely an issue with multiple devices' process_atmos procs; who knows \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 403a49ab00b..f5da3152aae 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -18,8 +18,8 @@ /obj/machinery/atmospherics/components/binary/circulator/proc/return_transfer_air() - var/datum/gas_mixture/air1 = airs["a1"] - var/datum/gas_mixture/air2 = airs["a2"] + var/datum/gas_mixture/air1 = airs[AIR1] + var/datum/gas_mixture/air2 = airs[AIR2] var/output_starting_pressure = air1.return_pressure() var/input_starting_pressure = air2.return_pressure() diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index e9adc87ad1a..0064bad9fe5 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -42,8 +42,10 @@ Acts like a normal vent, but has an input AND output. /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/New() ..() - var/datum/gas_mixture/air1 = airs["a1"] ; air1.volume = 1000 - var/datum/gas_mixture/air2 = airs["a2"] ; air2.volume = 1000 + var/datum/gas_mixture/air1 = airs[AIR1] + var/datum/gas_mixture/air2 = airs[AIR2] + air1.volume = 1000 + air2.volume = 1000 /obj/machinery/atmospherics/components/binary/dp_vent_pump/update_icon_nopipes() overlays.Cut() @@ -64,8 +66,8 @@ Acts like a normal vent, but has an input AND output. if(!on) return 0 - var/datum/gas_mixture/air1 = airs["a1"] - var/datum/gas_mixture/air2 = airs["a2"] + var/datum/gas_mixture/air1 = airs[AIR1] + var/datum/gas_mixture/air2 = airs[AIR2] var/datum/gas_mixture/environment = loc.return_air() var/environment_pressure = environment.return_pressure() @@ -87,7 +89,8 @@ Acts like a normal vent, but has an input AND output. loc.assume_air(removed) air_update_turf() - var/datum/pipeline/parent1 = parents["p1"] ; parent1.update = 1 + var/datum/pipeline/parent1 = parents[PARENT1] + parent1.update = 1 else //external -> output var/pressure_delta = 10000 @@ -106,7 +109,8 @@ Acts like a normal vent, but has an input AND output. air2.merge(removed) air_update_turf() - var/datum/pipeline/parent2 = parents["p2"] ; parent2.update = 1 + var/datum/pipeline/parent2 = parents[PARENT2] + parent2.update = 1 return 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index d7626277dba..d7005553973 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -40,8 +40,8 @@ Passive gate is similar to the regular pump except: if(!on) return 0 - var/datum/gas_mixture/air1 = airs["a1"] - var/datum/gas_mixture/air2 = airs["a2"] + var/datum/gas_mixture/air1 = airs[AIR1] + var/datum/gas_mixture/air2 = airs[AIR2] var/output_starting_pressure = air2.return_pressure() var/input_starting_pressure = air1.return_pressure() diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 457b8784672..92c36696cc0 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -48,8 +48,8 @@ Thus, the two variables affect pump operation are set in New(): if(!on) return 0 - var/datum/gas_mixture/air1 = airs["a1"] - var/datum/gas_mixture/air2 = airs["a2"] + var/datum/gas_mixture/air1 = airs[AIR1] + var/datum/gas_mixture/air2 = airs[AIR2] var/output_starting_pressure = air2.return_pressure() diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index 81783404ac8..3239d3a6ec4 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -28,7 +28,8 @@ It's like a regular ol' straight pipe, but you can turn it on and off. open = 1 update_icon_nopipes() update_parents() - var/datum/pipeline/parent1 = parents["p1"] ; parent1.reconcile_air() + var/datum/pipeline/parent1 = parents[PARENT1] + parent1.reconcile_air() investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", "atmos") /obj/machinery/atmospherics/components/binary/valve/proc/close() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 6d41f7ea062..df9fa68fae2 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -48,8 +48,8 @@ Thus, the two variables affect pump operation are set in New(): if(!on) return 0 - var/datum/gas_mixture/air1 = airs["a1"] - var/datum/gas_mixture/air2 = airs["a2"] + var/datum/gas_mixture/air1 = airs[AIR1] + var/datum/gas_mixture/air2 = airs[AIR2] // Pump mechanism just won't do anything if the pressure is too high/too low @@ -125,7 +125,7 @@ Thus, the two variables affect pump operation are set in New(): on = !on if("set_transfer_rate" in signal.data) - var/datum/gas_mixture/air1 = airs["a1"] + var/datum/gas_mixture/air1 = airs[AIR1] transfer_rate = Clamp( text2num(signal.data["set_transfer_rate"]), 0, diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm index a096a58d519..d0326540320 100644 --- a/code/ATMOSPHERICS/components/components_base.dm +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -7,19 +7,31 @@ On top of that, now people can add component-speciic procs/vars if they want! #define BINARY 2 #define TRINARY 3 +#define AIR1 "a1" +#define AIR2 "a2" +#define AIR3 "a3" + +#define PARENT1 "p1" +#define PARENT2 "p2" +#define PARENT3 "p3" + +#define NODE1 "n1" +#define NODE2 "n2" +#define NODE3 "n3" + /obj/machinery/atmospherics/components/ var/welded = 0 //Used on pumps and scrubbers var/showpipe = 0 - var/list/obj/machinery/atmospherics/nodes = list() - var/list/datum/pipeline/parents = list() - var/list/datum/gas_mixture/airs = list() - - var/device_type //used for initialization stuff + var/device_type = 0//used for initialization stuff //UNARY = 1 //BINARY = 2 //TRINARY = 3 + var/list/obj/machinery/atmospherics/nodes = list() + var/list/datum/pipeline/parents = list() + var/list/datum/gas_mixture/airs = list() + /obj/machinery/atmospherics/components/New() ..() for(var/I = 1; I <= device_type; I++) @@ -156,15 +168,15 @@ Pipenet stuff; housekeeping var/datum/gas_mixture/environment = T.return_air() var/lost = null var/times_lost = 0 - for(var/A = 1; A <= device_type; A++) - var/datum/gas_mixture/air = airs["a[A]"] + for(var/I = 1; I <= device_type; I++) + var/datum/gas_mixture/air = airs["a[I]"] lost += pressures*environment.volume/(air.temperature * R_IDEAL_GAS_EQUATION) times_lost++ var/shared_loss = lost/times_lost var/datum/gas_mixture/to_release - for(var/A = 1; A <= device_type; A++) - var/datum/gas_mixture/air = airs["a[A]"] + for(var/I = 1; I <= device_type; I++) + var/datum/gas_mixture/air = airs["a[I]"] if(!to_release) to_release = air.remove(shared_loss) continue diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 6c43ba705f8..70a9748c9bb 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -28,7 +28,7 @@ Filter types: 1: Oxygen: Oxygen ONLY 2: Nitrogen: Nitrogen ONLY 3: Carbon Dioxide: Carbon Dioxide ONLY - 4: Sleeping Agent (N2O) + 4: Sleeping Agent (NODE2O) */ var/frequency = 0 @@ -62,7 +62,7 @@ Filter types: /obj/machinery/atmospherics/components/trinary/filter/update_icon_nopipes() - if(!(stat & NOPOWER) && on && nodes["n1"] && nodes["n2"] && nodes["n3"]) + if(!(stat & NOPOWER) && on && nodes[NODE1] && nodes[NODE2] && nodes[NODE3]) icon_state = "filter_on[flipped?"_f":""]" return @@ -80,12 +80,12 @@ Filter types: ..() if(!on) return 0 - if(!(nodes["n1"] && nodes["n2"] && nodes["n3"])) + if(!(nodes[NODE1] && nodes[NODE2] && nodes[NODE3])) return 0 - var/datum/gas_mixture/air1 = airs["a1"] - var/datum/gas_mixture/air2 = airs["a2"] - var/datum/gas_mixture/air3 = airs["a3"] + var/datum/gas_mixture/air1 = airs[AIR1] + var/datum/gas_mixture/air2 = airs[AIR2] + var/datum/gas_mixture/air3 = airs[AIR3] var/output_starting_pressure = air3.return_pressure() diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index e9e42e51d28..567ccc953fb 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -32,7 +32,7 @@ ..() /obj/machinery/atmospherics/components/trinary/mixer/update_icon_nopipes() - if(!(stat & NOPOWER) && on && nodes["n1"] && nodes["n2"] && nodes["n3"]) + if(!(stat & NOPOWER) && on && nodes[NODE1] && nodes[NODE2] && nodes[NODE3]) icon_state = "mixer_on[flipped?"_f":""]" return @@ -48,19 +48,20 @@ /obj/machinery/atmospherics/components/trinary/mixer/New() ..() - var/datum/gas_mixture/air3 = airs["a3"] ; air3.volume = 300 - airs["a3"] = air3 + var/datum/gas_mixture/air3 = airs[AIR3] + air3.volume = 300 + airs[AIR3] = air3 /obj/machinery/atmospherics/components/trinary/mixer/process_atmos() ..() if(!on) return 0 - if(!(nodes["n1"] && nodes["n2"] && nodes["n3"])) + if(!(nodes[NODE1] && nodes[NODE2] && nodes[NODE3])) return 0 - var/datum/gas_mixture/air1 = airs["a1"] - var/datum/gas_mixture/air2 = airs["a2"] - var/datum/gas_mixture/air3 = airs["a3"] + var/datum/gas_mixture/air1 = airs[AIR1] + var/datum/gas_mixture/air2 = airs[AIR2] + var/datum/gas_mixture/air3 = airs[AIR3] var/output_starting_pressure = air3.return_pressure() @@ -106,12 +107,15 @@ air3.merge(removed2) if(transfer_moles1) - var/datum/pipeline/parent1 = parents["p1"] ; parent1.update = 1 + var/datum/pipeline/parent1 = parents[PARENT1] + parent1.update = 1 if(transfer_moles2) - var/datum/pipeline/parent2 = parents["p2"] ; parent2.update = 1 + var/datum/pipeline/parent2 = parents[PARENT2] + parent2.update = 1 - var/datum/pipeline/parent3 = parents["p3"] ; parent3.update = 1 + var/datum/pipeline/parent3 = parents[PARENT3] + parent3.update = 1 return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/Freezer.dm b/code/ATMOSPHERICS/components/unary_devices/Freezer.dm index 025e5418735..187af539a37 100644 --- a/code/ATMOSPHERICS/components/unary_devices/Freezer.dm +++ b/code/ATMOSPHERICS/components/unary_devices/Freezer.dm @@ -69,7 +69,7 @@ /obj/machinery/atmospherics/components/unary/cold_sink/freezer/interact(mob/user) if(stat & (NOPOWER|BROKEN)) return - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] user.set_machine(src) var/temp_text = "" if(air_contents.temperature > (T0C - 20)) @@ -194,7 +194,7 @@ return interact(user) /obj/machinery/atmospherics/components/unary/heat_reservoir/heater/interact(mob/user) - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] if(stat & (NOPOWER|BROKEN)) return diff --git a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm index 7cfbd6a9f06..7750a7c7b14 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm @@ -16,7 +16,7 @@ if(showpipe) overlays += getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now - if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[NODE1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "cold_off" return @@ -27,7 +27,7 @@ ..() if(!on) return 0 - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] var/air_heat_capacity = air_contents.heat_capacity() var/combined_heat_capacity = current_heat_capacity + air_heat_capacity diff --git a/code/ATMOSPHERICS/components/unary_devices/cryo.dm b/code/ATMOSPHERICS/components/unary_devices/cryo.dm index bcacd991678..0f3906d31b8 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cryo.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cryo.dm @@ -47,7 +47,7 @@ ..() /obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos() ..() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] if(air_contents) temperature_archived = air_contents.temperature @@ -62,14 +62,14 @@ on = 0 open_machine() playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) - if(!nodes["n1"] || !is_operational()) + if(!nodes[NODE1] || !is_operational()) return if(!on) updateDialog() return - if(airs["a1"]) + if(airs[AIR1]) if (occupant) process_occupant() expel_gas() @@ -146,7 +146,7 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/get_ui_data() // this is the data which will be sent to the ui - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] var/data = list() data["isOperating"] = on @@ -290,7 +290,7 @@ update_icon() /obj/machinery/atmospherics/components/unary/cryo_cell/proc/process_occupant() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] if(air_contents.total_moles() < 10) return if(occupant) @@ -322,7 +322,7 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/proc/heat_gas_contents() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] if(air_contents.total_moles() < 1) return @@ -333,7 +333,7 @@ air_contents.temperature = combined_energy/combined_heat_capacity /obj/machinery/atmospherics/components/unary/cryo_cell/proc/expel_gas() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] if(air_contents.total_moles() < 1) return diff --git a/code/ATMOSPHERICS/components/unary_devices/generator_input.dm b/code/ATMOSPHERICS/components/unary_devices/generator_input.dm index 987d5e53a74..20d1474ffd3 100644 --- a/code/ATMOSPHERICS/components/unary_devices/generator_input.dm +++ b/code/ATMOSPHERICS/components/unary_devices/generator_input.dm @@ -9,7 +9,7 @@ var/update_cycle /obj/machinery/atmospherics/components/unary/generator_input/update_icon() - if(nodes["n1"]) + if(nodes[NODE1]) icon_state = "intact" else icon_state = "exposed" @@ -17,4 +17,4 @@ return /obj/machinery/atmospherics/components/unary/generator_input/proc/return_exchange_air() - return airs["a1"] + return airs[AIR1] diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm index ec744484425..21746bc4e97 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm @@ -11,9 +11,9 @@ var/update_cycle /obj/machinery/atmospherics/components/unary/heat_exchanger/update_icon() - if(nodes["n1"]) + if(nodes[NODE1]) icon_state = "he_intact" - var/obj/machinery/atmospherics/node = nodes["n1"] + var/obj/machinery/atmospherics/node = nodes[NODE1] color = node.color else icon_state = "he_exposed" @@ -43,8 +43,8 @@ update_cycle = SSair.times_fired partner.update_cycle = SSair.times_fired - var/datum/gas_mixture/air_contents = airs["a1"] - var/datum/gas_mixture/partner_air_contents = partner.airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] + var/datum/gas_mixture/partner_air_contents = partner.airs[AIR1] var/air_heat_capacity = air_contents.heat_capacity() var/other_air_heat_capacity = partner_air_contents.heat_capacity() diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm index ab107de56e0..ceba342a5fa 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm @@ -17,7 +17,7 @@ if(showpipe) overlays += getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions) //scrub_cap works for now - if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[NODE1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "cold_off" return @@ -29,7 +29,7 @@ if(!on) return 0 - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] var/air_heat_capacity = air_contents.heat_capacity() var/combined_heat_capacity = current_heat_capacity + air_heat_capacity diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index 56c534d43ad..ca0cf4d90ac 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -25,7 +25,7 @@ on = 1 /obj/machinery/atmospherics/components/unary/outlet_injector/update_icon_nopipes() - if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[NODE1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "inje_off" return @@ -45,7 +45,7 @@ if(!on || stat & NOPOWER) return 0 - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] if(air_contents.temperature > 0) var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION) @@ -63,7 +63,7 @@ if(on || injecting) return 0 - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] injecting = 1 @@ -130,7 +130,7 @@ if("set_volume_rate" in signal.data) var/number = text2num(signal.data["set_volume_rate"]) - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] volume_rate = Clamp(number, 0, air_contents.volume) if("status" in signal.data) diff --git a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm index 6c3d654be14..d8c1d69e200 100644 --- a/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm +++ b/code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm @@ -18,7 +18,7 @@ if(showpipe) overlays += getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions) //it works for now - if(!nodes["n1"] || !on || stat & BROKEN) + if(!nodes[NODE1] || !on || stat & BROKEN) icon_state = "o2gen_off" return @@ -27,15 +27,16 @@ /obj/machinery/atmospherics/components/unary/oxygen_generator/New() ..() - var/datum/gas_mixture/air_contents = airs["a1"] ; air_contents.volume = 50 - airs["a1"] = air_contents + var/datum/gas_mixture/air_contents = airs[AIR1] + air_contents.volume = 50 + airs[AIR1] = air_contents /obj/machinery/atmospherics/components/unary/oxygen_generator/process_atmos() ..() if(!on) return 0 - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] var/total_moles = air_contents.total_moles() diff --git a/code/ATMOSPHERICS/components/unary_devices/tank.dm b/code/ATMOSPHERICS/components/unary_devices/tank.dm index a9ecac258ae..8f8f6b9e831 100644 --- a/code/ATMOSPHERICS/components/unary_devices/tank.dm +++ b/code/ATMOSPHERICS/components/unary_devices/tank.dm @@ -11,7 +11,7 @@ /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide/New() ..() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] air_contents.volume = volume air_contents.temperature = T20C air_contents.carbon_dioxide = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) @@ -22,7 +22,7 @@ /obj/machinery/atmospherics/components/unary/tank/toxins/New() ..() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] air_contents.volume = volume air_contents.temperature = T20C air_contents.toxins = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) @@ -33,7 +33,7 @@ /obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b/New() ..() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] air_contents.volume = volume air_contents.temperature = T0C var/datum/gas/oxygen_agent_b/trace_gas = new @@ -46,7 +46,7 @@ /obj/machinery/atmospherics/components/unary/tank/oxygen/New() ..() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] air_contents.volume = volume air_contents.temperature = T20C air_contents.oxygen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) @@ -57,7 +57,7 @@ /obj/machinery/atmospherics/components/unary/tank/nitrogen/New() ..() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] air_contents.volume = volume air_contents.temperature = T20C air_contents.nitrogen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) @@ -68,7 +68,7 @@ /obj/machinery/atmospherics/components/unary/tank/air/New() ..() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] air_contents.volume = volume air_contents.temperature = T20C air_contents.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index bf8a767db29..1a552848531 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -31,11 +31,11 @@ Housekeeping and pipe network stuff below if(..()) return 0 initialize_directions = dir - var/obj/machinery/atmospherics/node = nodes["n1"] + var/obj/machinery/atmospherics/node = nodes[NODE1] if(node) node.disconnect(src) node = null - nullifyPipenet(parents["p1"]) + nullifyPipenet(parents[PARENT1]) atmosinit() initialize() if(node) @@ -44,4 +44,4 @@ Housekeeping and pipe network stuff below node.addMember(src) build_network() . = 1 - nodes["n1"] = node \ No newline at end of file + nodes[NODE1] = node \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 4e9e04f8958..3f74b8c7de5 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -69,7 +69,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/New() ..() - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] air_contents.volume = 1000 /obj/machinery/atmospherics/components/unary/vent_pump/update_icon_nopipes() @@ -81,7 +81,7 @@ icon_state = "vent_welded" return - if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[NODE1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "vent_off" return @@ -94,7 +94,7 @@ ..() if(stat & (NOPOWER|BROKEN)) return - if (!nodes["n1"]) + if (!nodes[NODE1]) on = 0 //broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0 if(!on) @@ -103,7 +103,7 @@ if(welded) return 0 - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] var/datum/gas_mixture/environment = loc.return_air() var/environment_pressure = environment.return_pressure() diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 7be2de5d991..a0888876de9 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -56,7 +56,7 @@ icon_state = "scrub_welded" return - if(!nodes["n1"] || !on || stat & (NOPOWER|BROKEN)) + if(!nodes[NODE1] || !on || stat & (NOPOWER|BROKEN)) icon_state = "scrub_off" return @@ -87,7 +87,7 @@ "panic" = panic, "filter_co2" = scrub_CO2, "filter_toxins" = scrub_Toxins, - "filter_n2o" = scrub_N2O, + "filter_NODE2o" = scrub_N2O, "sigtype" = "status" ) if(!initial_loc.air_scrub_names[id_tag]) @@ -114,13 +114,13 @@ ..() if(stat & (NOPOWER|BROKEN)) return - if (!nodes["n1"]) + if (!nodes[NODE1]) on = 0 //broadcast_status() if(!on || welded) return 0 - var/datum/gas_mixture/air_contents = airs["a1"] + var/datum/gas_mixture/air_contents = airs[AIR1] var/datum/gas_mixture/environment = loc.return_air() if(scrubbing) @@ -218,9 +218,9 @@ if("toggle_tox_scrub" in signal.data) scrub_Toxins = !scrub_Toxins - if("n2o_scrub" in signal.data) + if("NODE2o_scrub" in signal.data) scrub_N2O = text2num(signal.data["n2o_scrub"]) - if("toggle_n2o_scrub" in signal.data) + if("toggle_NODE2o_scrub" in signal.data) scrub_N2O = !scrub_N2O if("init" in signal.data) From 8c2519e11532182cd605d6cd7ec19336eb4bb3c5 Mon Sep 17 00:00:00 2001 From: duncathan Date: Thu, 16 Jul 2015 04:54:11 -0600 Subject: [PATCH 52/52] merge conflicts --- .../binary_devices/binary_atmos_base.dm | 1 - .../components/binary_devices/passive_gate.dm | 6 +- .../components/binary_devices/pump.dm | 9 ++- .../components/binary_devices/volume_pump.dm | 9 ++- .../components/trinary_devices/filter.dm | 6 +- .../components/trinary_devices/mixer.dm | 6 +- .../components/unary_devices/cryo.dm | 3 +- .../components/unary_devices/vent_scrubber.dm | 3 +- .../mob/living/carbon/human/species.dm | 4 +- tgstation.dme | 58 ------------------- 10 files changed, 31 insertions(+), 74 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index be613640869..b78301584cb 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -32,7 +32,6 @@ Housekeeping and pipe network stuff var/node2_connect = dir var/node1_connect = turn(dir, 180) -/obj/machinery/atmospherics/binary/unsafe_pressure_release(mob/user,pressures) var/list/node_connects = new/list() node_connects.Add(node1_connect, node2_connect) ..(node_connects) \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index a38c408ca3a..d75d045a636 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -145,7 +145,8 @@ Passive gate is similar to the regular pump except: -/obj/machinery/atmospherics/components/binary/passive_gate/attack_hand(mob/user) if(..()) +/obj/machinery/atmospherics/components/binary/passive_gate/attack_hand(mob/user) + if(..()) return src.add_fingerprint(usr) if(!src.allowed(user)) @@ -178,7 +179,8 @@ Passive gate is similar to the regular pump except: -/obj/machinery/atmospherics/components/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench)) +/obj/machinery/atmospherics/components/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params) + if (!istype(W, /obj/item/weapon/wrench)) return ..() if (on) user << "You cannot unwrench this [src], turn it off first!" diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 757e55f938b..73482b9c864 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -97,7 +97,8 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) +/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) + if(stat & (BROKEN|NOPOWER)) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_gas_pump.tmpl", name, 400, 120, 0) @@ -147,7 +148,8 @@ Thus, the two variables affect pump operation are set in New(): return -/obj/machinery/atmospherics/components/binary/pump/attack_hand(mod/user) if(..()) +/obj/machinery/atmospherics/components/binary/pump/attack_hand(mob/user) + if(..()) return src.add_fingerprint(usr) if(!src.allowed(user)) @@ -178,7 +180,8 @@ Thus, the two variables affect pump operation are set in New(): ..() update_icon() -/obj/machinery/atmospherics/binary/pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench)) +/obj/machinery/atmospherics/components/binary/pump/attackby(obj/item/weapon/W, mob/user, params) + if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) user << "You cannot unwrench this [src], turn it off first!" diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 415a937cda4..a87f2964480 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -94,7 +94,8 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui = null) if(stat & (BROKEN|NOPOWER)) +/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) + if(stat & (BROKEN|NOPOWER)) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_gas_pump.tmpl", name, 400, 120, 0) @@ -144,7 +145,8 @@ Thus, the two variables affect pump operation are set in New(): update_icon() -/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(mob/user) if(..()) +/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(mob/user) + if(..()) return src.add_fingerprint(usr) if(!src.allowed(user)) @@ -177,7 +179,8 @@ Thus, the two variables affect pump operation are set in New(): -/obj/machinery/atmospherics/components/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench)) +/obj/machinery/atmospherics/components/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params) + if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) user << "You cannot unwrench this [src], turn it off first!" diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index e5731e28236..a1190f5d705 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -156,7 +156,8 @@ Filter types: set_frequency(frequency) return ..() -/obj/machinery/atmospherics/components/trinary/filter/attack_hand(mob/user) if(..()) +/obj/machinery/atmospherics/components/trinary/filter/attack_hand(mob/user) + if(..()) return if(!src.allowed(user)) @@ -165,7 +166,8 @@ Filter types: ui_interact(user) -/obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) +/obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) + if(stat & (BROKEN|NOPOWER)) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_filter.tmpl", name, 400, 320, 0) diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index eea96501e8c..56062f70d83 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -119,7 +119,8 @@ return 1 -/obj/machinery/atmospherics/components/trinary/mxer/attack_hand(mob/user) if(..()) +/obj/machinery/atmospherics/components/trinary/mxer/attack_hand(mob/user) + if(..()) return if(!src.allowed(user)) @@ -128,7 +129,8 @@ ui_interact(user) -/obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) +/obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) + if(stat & (BROKEN|NOPOWER)) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_mixer.tmpl", name, 400, 320, 0) diff --git a/code/ATMOSPHERICS/components/unary_devices/cryo.dm b/code/ATMOSPHERICS/components/unary_devices/cryo.dm index 763aecb36ea..f0b549c9d1f 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cryo.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cryo.dm @@ -136,7 +136,8 @@ * * @return nothing */ -/obj/machinery/atmospherics/components/unary/cry_cell/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(user == occupant || user.stat || panel_open) +/obj/machinery/atmospherics/components/unary/cry_cell/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) + if(user == occupant || user.stat || panel_open) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "cryo.tmpl", "Cryo Cell Control System", 520, 410, 1) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index e9bd3b2b9a3..7c8ed4b389c 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -245,7 +245,8 @@ stat |= NOPOWER update_icon_nopipes() -/obj/machinery/atmospherics/components/unary/vent_scrubber/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/weldingtool)) +/obj/machinery/atmospherics/components/unary/vent_scrubber/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) playsound(loc, 'sound/items/Welder.ogg', 40, 1) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c76942bb250..887f52a85d4 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1138,7 +1138,9 @@ //BREATHING// ///////////// - if(istype(H.loc, /obj/machinery/atmospherics/unary/cryo_cell)) return +/datum/species/proc/breathe(mob/living/carbon/human/H) + return + /datum/species/proc/check_breath(datum/gas_mixture/breath, var/mob/living/carbon/human/H) if((H.status_flags & GODMODE)) return diff --git a/tgstation.dme b/tgstation.dme index a29f5191935..5bd5b7aa3de 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,63 +6,6 @@ // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/modules" -#define FILE_DIR "code/modules/games" -#define FILE_DIR "code/modules/html_interface" -#define FILE_DIR "code/modules/html_interface/cards" -#define FILE_DIR "code/modules/html_interface/nanotrasen" -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/ass" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/inhands" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/atmospherics/pipes" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/food" -#define FILE_DIR "icons/obj/guns" -#define FILE_DIR "icons/obj/hydroponics" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/power_cond" -#define FILE_DIR "icons/obj/smooth_structures" -#define FILE_DIR "icons/obj/smooth_structures/alien" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/stamp_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/turf/floors" -#define FILE_DIR "icons/turf/walls" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "nano" -#define FILE_DIR "nano/images" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/arcade" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/guitar" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/magic" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/spookoween" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/complionator" -#define FILE_DIR "sound/vox_fem" -#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES @@ -1311,7 +1254,6 @@ #include "code\modules\mob\living\simple_animal\hostile\retaliate\bat.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm" -#include "code\modules\mob\living\simple_animal\morph\morph.dm" #include "code\modules\mob\living\simple_animal\revenant\revenant.dm" #include "code\modules\mob\living\simple_animal\revenant\revenant_abilities.dm" #include "code\modules\mob\living\simple_animal\revenant\revenant_spawn_event.dm"
    +

    14 July 2015

    +

    AnturK updated:

    +
      +
    • New species of mimic was spotted in the wilderness of space. Watch out!
      • +
    +

    Jordie0608 updated:

    +
      +
    • Added a Local Narrate verb for admins.
      • +
    +

    13 July 2015

    Ikarrus updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 46dc91303a0..14be84fdf64 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1211,3 +1211,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. pipes in general. - rscadd: Added Optical T-Ray scanners to R&D and Atmospheric Technician closets. Optical T-Ray Scanners function identically to a handheld scanner. +2015-07-14: + AnturK: + - rscadd: New species of mimic was spotted in the wilderness of space. Watch out! + Jordie0608: + - rscadd: Added a Local Narrate verb for admins. diff --git a/html/changelogs/AnturK-Morph.yml b/html/changelogs/AnturK-Morph.yml deleted file mode 100644 index f8af17015e9..00000000000 --- a/html/changelogs/AnturK-Morph.yml +++ /dev/null @@ -1,37 +0,0 @@ - -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# spellcheck (typo fixes) -# experiment -# tgs (TG-ported fixes?) -################################# - -# Your name. -author: AnturK - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "New species of mimic was spotted in the wilderness of space. Watch out!" \ No newline at end of file diff --git a/html/changelogs/jordie ln.yml b/html/changelogs/jordie ln.yml deleted file mode 100644 index 31ccda78706..00000000000 --- a/html/changelogs/jordie ln.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Jordie0608 - -delete-after: True - -changes: - - rscadd: "Added a Local Narrate verb for admins." From c5052497655f3409de7c7c7117b76a532a221713 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 14 Jul 2015 06:48:11 -0500 Subject: [PATCH 49/52] Update who.dm --- code/game/verbs/who.dm | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 0d831857934..bd5cd555a65 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -8,34 +8,11 @@ var/list/Lines = list() if(holder) - if(check_rights(R_ADMIN,0))//If they have +ADMIN, show hidden admins, player IC names and IC status - for(var/client/C in clients) - var/entry = "\t[C.key]" - if(C.holder && C.holder.fakekey) - entry += " (as [C.holder.fakekey])" - entry += " - Playing as [C.mob.real_name]" - switch(C.mob.stat) - if(UNCONSCIOUS) - entry += " - Unconscious" - if(DEAD) - if(isobserver(C.mob)) - var/mob/dead/observer/O = C.mob - if(O.started_as_observer) - entry += " - Observing" - else - entry += " - DEAD" - else - entry += " - DEAD" - if(is_special_character(C.mob)) - entry += " - Antagonist" - entry += " (?)" - Lines += entry - else//If they don't have +ADMIN, only show hidden admins - for(var/client/C in clients) - var/entry = "\t[C.key]" - if(C.holder && C.holder.fakekey) - entry += " (as [C.holder.fakekey])" - Lines += entry + for(var/client/C in clients) + var/entry = "\t[C.key]" + if(C.holder && C.holder.fakekey) + entry += " (as [C.holder.fakekey])" + Lines += entry else for(var/client/C in clients) if(C.holder && C.holder.fakekey) @@ -76,4 +53,4 @@ if(!C.holder.fakekey) msg += "\t[C] is a [C.holder.rank]\n" - src << msg \ No newline at end of file + src << msg From 4688c2c9697b0a519bf3071c01cd4998d45aa032 Mon Sep 17 00:00:00 2001 From: Firecage Date: Wed, 15 Jul 2015 23:52:35 +0200 Subject: [PATCH 50/52] Fixes proc arguments --- code/ATMOSPHERICS/atmospherics.dm | 20 +-- .../binary_devices/binary_atmos_base.dm | 2 +- .../components/binary_devices/passive_gate.dm | 4 +- .../components/binary_devices/pump.dm | 6 +- .../components/binary_devices/volume_pump.dm | 6 +- .../components/trinary_devices/filter.dm | 4 +- .../components/trinary_devices/mixer.dm | 4 +- .../trinary_devices/trinary_base.dm | 6 +- .../components/unary_devices/unary_base.dm | 2 +- .../components/unary_devices/vent_scrubber.dm | 2 +- code/ATMOSPHERICS/pipes/manifold.dm | 2 +- code/ATMOSPHERICS/pipes/manifold4w.dm | 2 +- code/ATMOSPHERICS/pipes/simple.dm | 2 +- code/LINDA/LINDA_system.dm | 12 +- code/LINDA/LINDA_turf_tile.dm | 8 +- code/__HELPERS/game.dm | 18 +-- code/__HELPERS/icons.dm | 6 +- code/__HELPERS/lists.dm | 26 ++-- code/__HELPERS/maths.dm | 2 +- code/__HELPERS/mobs.dm | 2 +- code/__HELPERS/names.dm | 2 +- code/__HELPERS/text.dm | 32 ++--- code/__HELPERS/time.dm | 6 +- code/__HELPERS/type2type.dm | 10 +- code/__HELPERS/unsorted.dm | 72 +++++------ code/_onclick/adjacent.dm | 4 +- code/_onclick/ai.dm | 4 +- code/_onclick/click.dm | 42 +++--- code/_onclick/cyborg.dm | 20 +-- code/_onclick/hud/action.dm | 6 +- code/_onclick/hud/hud.dm | 2 +- code/_onclick/item_attack.dm | 4 +- code/_onclick/observer.dm | 12 +- code/_onclick/other_mobs.dm | 38 +++--- code/_onclick/overmind.dm | 6 +- code/_onclick/telekinesis.dm | 10 +- code/controllers/subsystem/air.dm | 4 +- code/controllers/subsystem/jobs.dm | 2 +- code/controllers/subsystem/npcpool.dm | 2 +- code/controllers/subsystem/pai.dm | 6 +- code/controllers/subsystem/radio.dm | 4 +- code/controllers/subsystem/shuttles/supply.dm | 6 +- code/controllers/subsystem/ticker.dm | 2 +- code/controllers/subsystem/timer.dm | 4 +- code/controllers/subsystem/voting.dm | 6 +- code/controllers/subsystems.dm | 2 +- code/datums/ai_laws.dm | 14 +- code/datums/browser.dm | 6 +- code/datums/datacore.dm | 12 +- code/datums/datumvars.dm | 2 +- code/datums/diseases/_MobProcs.dm | 18 +-- code/datums/diseases/_disease.dm | 4 +- code/datums/diseases/advance/advance.dm | 34 ++--- .../datums/diseases/advance/symptoms/beard.dm | 2 +- .../diseases/advance/symptoms/choking.dm | 2 +- .../diseases/advance/symptoms/confusion.dm | 2 +- .../datums/diseases/advance/symptoms/cough.dm | 2 +- .../advance/symptoms/damage_converter.dm | 4 +- .../diseases/advance/symptoms/deafness.dm | 2 +- .../datums/diseases/advance/symptoms/dizzy.dm | 2 +- .../datums/diseases/advance/symptoms/fever.dm | 2 +- code/datums/diseases/advance/symptoms/fire.dm | 2 +- .../diseases/advance/symptoms/flesh_eating.dm | 2 +- .../diseases/advance/symptoms/genetics.dm | 8 +- .../diseases/advance/symptoms/hallucigen.dm | 2 +- .../diseases/advance/symptoms/headache.dm | 2 +- code/datums/diseases/advance/symptoms/heal.dm | 12 +- .../diseases/advance/symptoms/itching.dm | 2 +- .../diseases/advance/symptoms/oxygen.dm | 2 +- .../diseases/advance/symptoms/shedding.dm | 2 +- .../diseases/advance/symptoms/shivering.dm | 2 +- code/datums/diseases/advance/symptoms/skin.dm | 4 +- .../diseases/advance/symptoms/sneeze.dm | 2 +- .../diseases/advance/symptoms/stimulant.dm | 2 +- .../diseases/advance/symptoms/symptoms.dm | 6 +- .../diseases/advance/symptoms/vision.dm | 4 +- .../diseases/advance/symptoms/voice_change.dm | 4 +- .../datums/diseases/advance/symptoms/vomit.dm | 6 +- .../diseases/advance/symptoms/weight.dm | 6 +- .../datums/diseases/advance/symptoms/youth.dm | 2 +- code/datums/diseases/transformation.dm | 4 +- code/datums/diseases/wizarditis.dm | 2 +- code/datums/gas_mixture.dm | 8 +- .../helper_datums/construction_datum.dm | 8 +- code/datums/hud.dm | 12 +- code/datums/martial.dm | 64 +++++----- code/datums/mind.dm | 8 +- code/datums/modules.dm | 6 +- code/datums/mutations.dm | 16 +-- code/datums/recipe.dm | 10 +- code/datums/spells/construct_spells.dm | 6 +- code/datums/spells/ethereal_jaunt.dm | 6 +- code/datums/spells/wizard.dm | 2 +- code/datums/supplypacks.dm | 2 +- code/datums/uplink_item.dm | 6 +- code/datums/wires/airlock.dm | 2 +- code/datums/wires/alarm.dm | 6 +- code/datums/wires/apc.dm | 6 +- code/datums/wires/autolathe.dm | 2 +- code/datums/wires/explosive.dm | 10 +- code/datums/wires/mulebot.dm | 6 +- code/datums/wires/particle_accelerator.dm | 6 +- code/datums/wires/radio.dm | 6 +- code/datums/wires/robot.dm | 6 +- code/datums/wires/syndicatebomb.dm | 6 +- code/datums/wires/taperecorder.dm | 4 +- code/datums/wires/vending.dm | 8 +- code/datums/wires/wires.dm | 32 ++--- code/game/area/areas.dm | 16 +-- code/game/asteroid.dm | 2 +- code/game/atoms.dm | 10 +- code/game/atoms_movable.dm | 2 +- code/game/communications.dm | 10 +- code/game/data_huds.dm | 6 +- code/game/dna.dm | 12 +- code/game/gamemodes/abduction/abduction.dm | 14 +- .../gamemodes/abduction/abduction_gear.dm | 26 ++-- code/game/gamemodes/abduction/gland.dm | 2 +- .../gamemodes/abduction/machinery/camera.dm | 8 +- .../gamemodes/abduction/machinery/console.dm | 16 +-- .../abduction/machinery/dispenser.dm | 4 +- .../abduction/machinery/experiment.dm | 6 +- .../game/gamemodes/abduction/machinery/pad.dm | 10 +- code/game/gamemodes/antag_hud.dm | 8 +- code/game/gamemodes/antag_spawner.dm | 18 +-- code/game/gamemodes/blob/blob.dm | 12 +- code/game/gamemodes/blob/blob_report.dm | 6 +- code/game/gamemodes/blob/blobs/blob_mobs.dm | 6 +- code/game/gamemodes/blob/blobs/core.dm | 4 +- code/game/gamemodes/blob/blobs/factory.dm | 2 +- code/game/gamemodes/blob/blobs/node.dm | 2 +- code/game/gamemodes/blob/blobs/resource.dm | 2 +- code/game/gamemodes/blob/blobs/storage.dm | 4 +- code/game/gamemodes/blob/overmind.dm | 8 +- code/game/gamemodes/blob/powers.dm | 8 +- code/game/gamemodes/blob/theblob.dm | 16 +-- code/game/gamemodes/changeling/changeling.dm | 12 +- .../gamemodes/changeling/changeling_power.dm | 14 +- .../gamemodes/changeling/evolution_menu.dm | 8 +- .../gamemodes/changeling/powers/absorb.dm | 12 +- .../gamemodes/changeling/powers/adrenaline.dm | 8 +- .../changeling/powers/augmented_eyesight.dm | 2 +- .../changeling/powers/digitalcamo.dm | 2 +- .../gamemodes/changeling/powers/fakedeath.dm | 4 +- .../gamemodes/changeling/powers/fleshmend.dm | 2 +- .../gamemodes/changeling/powers/glands.dm | 2 +- .../gamemodes/changeling/powers/headcrab.dm | 2 +- .../gamemodes/changeling/powers/hivemind.dm | 4 +- .../gamemodes/changeling/powers/humanform.dm | 2 +- .../gamemodes/changeling/powers/lesserform.dm | 2 +- .../changeling/powers/mimic_voice.dm | 2 +- .../gamemodes/changeling/powers/mutations.dm | 10 +- .../gamemodes/changeling/powers/panacea.dm | 2 +- .../gamemodes/changeling/powers/revive.dm | 2 +- .../gamemodes/changeling/powers/shriek.dm | 4 +- .../gamemodes/changeling/powers/spiders.dm | 2 +- .../changeling/powers/strained_muscles.dm | 2 +- .../gamemodes/changeling/powers/tiny_prick.dm | 28 ++-- .../gamemodes/changeling/powers/transform.dm | 2 +- .../game/gamemodes/changeling/traitor_chan.dm | 2 +- code/game/gamemodes/cult/cult.dm | 8 +- code/game/gamemodes/cult/cult_items.dm | 4 +- code/game/gamemodes/cult/ritual.dm | 12 +- code/game/gamemodes/cult/runes.dm | 16 +-- code/game/gamemodes/cult/talisman.dm | 6 +- code/game/gamemodes/game_mode.dm | 10 +- code/game/gamemodes/gang/dominator.dm | 10 +- code/game/gamemodes/gang/gang.dm | 10 +- code/game/gamemodes/gang/gang_datum.dm | 6 +- code/game/gamemodes/gang/recaller.dm | 4 +- code/game/gamemodes/intercept_report.dm | 2 +- .../gamemodes/malfunction/Malf_Modules.dm | 12 +- .../game/gamemodes/malfunction/malfunction.dm | 4 +- code/game/gamemodes/meteor/meteors.dm | 14 +- code/game/gamemodes/monkey/monkey.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 10 +- code/game/gamemodes/nuclear/nuclearbomb.dm | 6 +- code/game/gamemodes/nuclear/pinpointer.dm | 2 +- code/game/gamemodes/objective.dm | 8 +- code/game/gamemodes/objective_items.dm | 10 +- code/game/gamemodes/revolution/revolution.dm | 6 +- .../shadowling/ascendant_shadowling.dm | 2 +- code/game/gamemodes/shadowling/shadowling.dm | 6 +- .../shadowling/shadowling_abilities.dm | 8 +- .../gamemodes/shadowling/shadowling_items.dm | 2 +- code/game/gamemodes/traitor/double_agents.dm | 4 +- code/game/gamemodes/traitor/traitor.dm | 12 +- code/game/gamemodes/wizard/artefact.dm | 8 +- code/game/gamemodes/wizard/raginmages.dm | 4 +- code/game/gamemodes/wizard/rightandwrong.dm | 2 +- code/game/gamemodes/wizard/soulstone.dm | 12 +- code/game/gamemodes/wizard/spellbook.dm | 56 ++++---- code/game/gamemodes/wizard/wizard.dm | 8 +- code/game/jobs/access.dm | 8 +- code/game/jobs/job/assistant.dm | 2 +- code/game/jobs/job/captain.dm | 4 +- code/game/jobs/job/cargo_service.dm | 16 +-- code/game/jobs/job/civilian.dm | 12 +- code/game/jobs/job/civilian_chaplain.dm | 2 +- code/game/jobs/job/engineering.dm | 6 +- code/game/jobs/job/job.dm | 8 +- code/game/jobs/job/medical.dm | 10 +- code/game/jobs/job/science.dm | 6 +- code/game/jobs/job/security.dm | 10 +- code/game/jobs/job/silicon.dm | 4 +- code/game/jobs/jobs.dm | 2 +- code/game/machinery/Beacon.dm | 2 +- code/game/machinery/Freezer.dm | 12 +- code/game/machinery/PDApainter.dm | 4 +- code/game/machinery/Sleeper.dm | 4 +- code/game/machinery/ai_slipper.dm | 6 +- code/game/machinery/alarm.dm | 26 ++-- .../atmoalter/area_atmos_computer.dm | 6 +- code/game/machinery/atmoalter/canister.dm | 14 +- code/game/machinery/atmoalter/meter.dm | 8 +- .../atmoalter/portable_atmospherics.dm | 2 +- code/game/machinery/atmoalter/pump.dm | 6 +- code/game/machinery/atmoalter/scrubber.dm | 10 +- code/game/machinery/autolathe.dm | 8 +- code/game/machinery/bots/bots.dm | 32 ++--- code/game/machinery/bots/cleanbot.dm | 14 +- code/game/machinery/bots/ed209bot.dm | 16 +-- code/game/machinery/bots/floorbot.dm | 24 ++-- code/game/machinery/bots/medbot.dm | 20 +-- code/game/machinery/bots/mulebot.dm | 34 ++--- code/game/machinery/bots/secbot.dm | 12 +- code/game/machinery/camera/camera.dm | 10 +- code/game/machinery/camera/camera_assembly.dm | 6 +- code/game/machinery/camera/motion.dm | 4 +- code/game/machinery/camera/tracking.dm | 12 +- code/game/machinery/cloning.dm | 20 +-- .../machinery/computer/HolodeckControl.dm | 38 +++--- code/game/machinery/computer/aifixer.dm | 6 +- code/game/machinery/computer/arcade.dm | 8 +- .../game/machinery/computer/buildandrepair.dm | 12 +- code/game/machinery/computer/camera.dm | 4 +- .../machinery/computer/camera_advanced.dm | 8 +- code/game/machinery/computer/card.dm | 10 +- code/game/machinery/computer/cloning.dm | 4 +- .../game/machinery/computer/communications.dm | 16 +-- code/game/machinery/computer/computer.dm | 4 +- code/game/machinery/computer/law.dm | 12 +- code/game/machinery/computer/medical.dm | 4 +- code/game/machinery/computer/message.dm | 8 +- code/game/machinery/computer/prisoner.dm | 4 +- code/game/machinery/computer/robot.dm | 6 +- code/game/machinery/computer/security.dm | 6 +- code/game/machinery/computer/shuttle.dm | 4 +- code/game/machinery/computer/station_alert.dm | 4 +- .../machinery/computer/telecrystalconsoles.dm | 14 +- code/game/machinery/constructable_frame.dm | 2 +- code/game/machinery/cryo.dm | 4 +- code/game/machinery/deployable.dm | 6 +- code/game/machinery/door_control.dm | 18 +-- code/game/machinery/doors/airlock.dm | 26 ++-- .../machinery/doors/airlock_electronics.dm | 4 +- code/game/machinery/doors/brigdoors.dm | 8 +- code/game/machinery/doors/door.dm | 14 +- code/game/machinery/doors/firedoor.dm | 8 +- code/game/machinery/doors/unpowered.dm | 2 +- code/game/machinery/doors/windowdoor.dm | 34 ++--- code/game/machinery/doppler_array.dm | 6 +- .../embedded_controller/access_controller.dm | 2 +- .../embedded_controller_base.dm | 4 +- code/game/machinery/hologram.dm | 4 +- code/game/machinery/igniter.dm | 16 +-- code/game/machinery/iv_drip.dm | 2 +- code/game/machinery/machinery.dm | 14 +- code/game/machinery/magnet.dm | 8 +- code/game/machinery/navbeacon.dm | 10 +- code/game/machinery/overview.dm | 2 +- code/game/machinery/pipe/construction.dm | 8 +- code/game/machinery/pipe/pipe_dispenser.dm | 12 +- code/game/machinery/portable_turret.dm | 20 +-- code/game/machinery/rechargestation.dm | 10 +- code/game/machinery/recycler.dm | 14 +- code/game/machinery/requests_console.dm | 6 +- code/game/machinery/robot_fabricator.dm | 6 +- code/game/machinery/shieldgen.dm | 22 ++-- code/game/machinery/spaceheater.dm | 2 +- code/game/machinery/status_display.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 24 ++-- code/game/machinery/syndicatebeacon.dm | 10 +- code/game/machinery/syndicatebomb.dm | 12 +- code/game/machinery/telecomms/broadcasting.dm | 2 +- .../telecomms/computers/logbrowser.dm | 4 +- .../telecomms/computers/telemonitor.dm | 4 +- .../telecomms/computers/traffic_control.dm | 8 +- .../telecomms/machine_interactions.dm | 10 +- .../machinery/telecomms/machines/allinone.dm | 2 +- .../machinery/telecomms/machines/server.dm | 8 +- .../machinery/telecomms/telecomunications.dm | 2 +- code/game/machinery/teleporter.dm | 4 +- code/game/machinery/transformer.dm | 4 +- code/game/machinery/turrets.dm | 22 ++-- code/game/machinery/vending.dm | 4 +- code/game/machinery/washing_machine.dm | 4 +- code/game/machinery/wishgranter.dm | 2 +- code/game/mecha/combat/combat.dm | 4 +- code/game/mecha/combat/gygax.dm | 2 +- code/game/mecha/combat/marauder.dm | 2 +- code/game/mecha/combat/phazon.dm | 2 +- code/game/mecha/equipment/mecha_equipment.dm | 4 +- .../mecha/equipment/tools/medical_tools.dm | 6 +- code/game/mecha/equipment/tools/tools.dm | 44 +++---- code/game/mecha/equipment/weapons/weapons.dm | 10 +- code/game/mecha/mech_fabricator.dm | 6 +- code/game/mecha/mecha.dm | 34 ++--- code/game/mecha/mecha_construction_paths.dm | 30 ++--- code/game/mecha/mecha_control_console.dm | 2 +- code/game/mecha/mecha_parts.dm | 2 +- code/game/mecha/medical/odysseus.dm | 2 +- code/game/mecha/working/ripley.dm | 4 +- code/game/objects/effects/aliens.dm | 2 +- code/game/objects/effects/anomalies.dm | 6 +- .../effects/decals/Cleanable/aliens.dm | 2 +- .../effects/decals/Cleanable/humans.dm | 2 +- .../effects/decals/Cleanable/robots.dm | 2 +- code/game/objects/effects/decals/cleanable.dm | 2 +- .../effects/effect_system/effects_foam.dm | 22 ++-- .../effects/effect_system/effects_smoke.dm | 14 +- code/game/objects/effects/gibs.dm | 10 +- code/game/objects/effects/glowshroom.dm | 4 +- .../objects/effects/spawners/vaultspawner.dm | 2 +- code/game/objects/effects/spiders.dm | 4 +- code/game/objects/effects/step_triggers.dm | 14 +- code/game/objects/explosion.dm | 4 +- code/game/objects/items.dm | 22 ++-- code/game/objects/items/apc_frame.dm | 2 +- code/game/objects/items/blueprints.dm | 16 +-- code/game/objects/items/candle.dm | 4 +- code/game/objects/items/crayons.dm | 14 +- code/game/objects/items/dehy_carp.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 22 ++-- code/game/objects/items/devices/PDA/cart.dm | 4 +- code/game/objects/items/devices/camera_bug.dm | 12 +- .../objects/items/devices/chameleonproj.dm | 6 +- code/game/objects/items/devices/flash.dm | 10 +- code/game/objects/items/devices/flashlight.dm | 10 +- .../game/objects/items/devices/instruments.dm | 4 +- .../objects/items/devices/laserpointer.dm | 4 +- .../objects/items/devices/lightreplacer.dm | 8 +- code/game/objects/items/devices/megaphone.dm | 2 +- code/game/objects/items/devices/paicard.dm | 2 +- .../objects/items/devices/pipe_painter.dm | 4 +- code/game/objects/items/devices/pizza_bomb.dm | 2 +- code/game/objects/items/devices/powersink.dm | 4 +- .../items/devices/radio/electropack.dm | 2 +- .../items/devices/radio/encryptionkey.dm | 2 +- .../objects/items/devices/radio/headset.dm | 4 +- .../objects/items/devices/radio/intercom.dm | 6 +- .../game/objects/items/devices/radio/radio.dm | 16 +-- code/game/objects/items/devices/scanners.dm | 12 +- .../objects/items/devices/sensor_device.dm | 2 +- .../objects/items/devices/traitordevices.dm | 10 +- .../objects/items/devices/transfer_valve.dm | 4 +- code/game/objects/items/devices/uplinks.dm | 10 +- code/game/objects/items/holotape.dm | 8 +- code/game/objects/items/latexballoon.dm | 4 +- code/game/objects/items/robot/robot_items.dm | 2 +- code/game/objects/items/robot/robot_parts.dm | 6 +- .../objects/items/robot/robot_upgrades.dm | 22 ++-- code/game/objects/items/stacks/medical.dm | 2 +- code/game/objects/items/stacks/rods.dm | 2 +- .../game/objects/items/stacks/sheets/glass.dm | 14 +- .../objects/items/stacks/sheets/leather.dm | 2 +- .../game/objects/items/stacks/sheets/light.dm | 2 +- code/game/objects/items/stacks/stack.dm | 12 +- code/game/objects/items/stacks/tiles/light.dm | 2 +- .../objects/items/stacks/tiles/tile_types.dm | 2 +- code/game/objects/items/toys.dm | 38 +++--- code/game/objects/items/weapons/AI_modules.dm | 46 +++---- code/game/objects/items/weapons/RCD.dm | 12 +- code/game/objects/items/weapons/RPD.dm | 14 +- code/game/objects/items/weapons/RSF.dm | 6 +- .../objects/items/weapons/airlock_painter.dm | 4 +- code/game/objects/items/weapons/cards_ids.dm | 10 +- .../objects/items/weapons/chrono_eraser.dm | 14 +- .../objects/items/weapons/cigs_lighters.dm | 22 ++-- .../game/objects/items/weapons/clown_items.dm | 6 +- code/game/objects/items/weapons/defib.dm | 12 +- code/game/objects/items/weapons/dice.dm | 8 +- code/game/objects/items/weapons/explosives.dm | 10 +- .../objects/items/weapons/extinguisher.dm | 4 +- .../objects/items/weapons/flamethrower.dm | 4 +- .../objects/items/weapons/gift_wrappaper.dm | 2 +- .../items/weapons/grenades/chem_grenade.dm | 2 +- .../items/weapons/grenades/flashbang.dm | 2 +- .../items/weapons/grenades/ghettobomb.dm | 2 +- .../objects/items/weapons/grenades/grenade.dm | 8 +- code/game/objects/items/weapons/handcuffs.dm | 4 +- .../objects/items/weapons/implants/implant.dm | 10 +- .../items/weapons/implants/implantchair.dm | 12 +- .../items/weapons/implants/implantpad.dm | 2 +- code/game/objects/items/weapons/melee/misc.dm | 4 +- code/game/objects/items/weapons/paint.dm | 6 +- code/game/objects/items/weapons/paiwire.dm | 4 +- .../objects/items/weapons/pneumaticCannon.dm | 2 +- code/game/objects/items/weapons/scrolls.dm | 4 +- code/game/objects/items/weapons/shields.dm | 2 +- .../items/weapons/singularityhammer.dm | 8 +- .../objects/items/weapons/storage/backpack.dm | 4 +- .../objects/items/weapons/storage/bags.dm | 10 +- .../objects/items/weapons/storage/book.dm | 10 +- .../objects/items/weapons/storage/fancy.dm | 2 +- .../objects/items/weapons/storage/firstaid.dm | 2 +- .../objects/items/weapons/storage/lockbox.dm | 6 +- .../objects/items/weapons/storage/secure.dm | 10 +- .../objects/items/weapons/storage/wallets.dm | 4 +- code/game/objects/items/weapons/stunbaton.dm | 2 +- .../objects/items/weapons/tanks/jetpack.dm | 2 +- .../objects/items/weapons/tanks/tank_types.dm | 2 +- .../game/objects/items/weapons/tanks/tanks.dm | 4 +- .../objects/items/weapons/tanks/watertank.dm | 12 +- .../objects/items/weapons/teleportation.dm | 4 +- code/game/objects/items/weapons/tools.dm | 2 +- code/game/objects/items/weapons/twohanded.dm | 16 +-- code/game/objects/items/weapons/weaponry.dm | 2 +- code/game/objects/objs.dm | 4 +- code/game/objects/structures/ai_core.dm | 8 +- code/game/objects/structures/artstuff.dm | 6 +- code/game/objects/structures/barsigns.dm | 8 +- code/game/objects/structures/bedsheet_bin.dm | 10 +- .../objects/structures/crates_lockers/bins.dm | 8 +- .../structures/crates_lockers/closets.dm | 26 ++-- .../crates_lockers/closets/crittercrate.dm | 2 +- .../crates_lockers/closets/secure/personal.dm | 2 +- .../crates_lockers/closets/statue.dm | 8 +- .../structures/crates_lockers/crates.dm | 16 +-- .../structures/crates_lockers/largecrate.dm | 4 +- code/game/objects/structures/displaycase.dm | 8 +- code/game/objects/structures/door_assembly.dm | 2 +- code/game/objects/structures/dresser.dm | 2 +- code/game/objects/structures/electricchair.dm | 2 +- code/game/objects/structures/fireaxe.dm | 10 +- code/game/objects/structures/girders.dm | 4 +- code/game/objects/structures/grille.dm | 16 +-- code/game/objects/structures/janicart.dm | 2 +- code/game/objects/structures/kitchen_spike.dm | 6 +- code/game/objects/structures/ladders.dm | 6 +- code/game/objects/structures/lamarr_cage.dm | 8 +- code/game/objects/structures/lattice.dm | 4 +- code/game/objects/structures/mirror.dm | 14 +- code/game/objects/structures/morgue.dm | 18 +-- code/game/objects/structures/musician.dm | 18 +-- code/game/objects/structures/noticeboard.dm | 4 +- code/game/objects/structures/safe.dm | 6 +- code/game/objects/structures/spirit_board.dm | 8 +- code/game/objects/structures/statues.dm | 8 +- .../stool_bed_chair_nest/alien_nests.dm | 6 +- .../structures/stool_bed_chair_nest/bed.dm | 6 +- .../structures/stool_bed_chair_nest/chairs.dm | 6 +- .../structures/stool_bed_chair_nest/stools.dm | 2 +- code/game/objects/structures/table_frames.dm | 4 +- code/game/objects/structures/tables_racks.dm | 12 +- .../game/objects/structures/tank_dispenser.dm | 6 +- .../structures/transit_tubes/station.dm | 4 +- .../transit_tube_construction.dm | 4 +- .../transit_tubes/transit_tube_pod.dm | 4 +- code/game/objects/structures/watercloset.dm | 4 +- .../objects/structures/windoor_assembly.dm | 6 +- code/game/objects/structures/window.dm | 20 +-- code/game/objects/weapons.dm | 2 +- code/game/pooling/pool.dm | 6 +- code/game/say.dm | 2 +- code/game/skincmd.dm | 2 +- code/game/sound.dm | 6 +- code/game/turfs/simulated.dm | 2 +- code/game/turfs/simulated/floor.dm | 4 +- .../game/turfs/simulated/floor/fancy_floor.dm | 4 +- .../game/turfs/simulated/floor/light_floor.dm | 6 +- code/game/turfs/simulated/floor/plating.dm | 6 +- code/game/turfs/simulated/walls.dm | 16 +-- code/game/turfs/simulated/walls_mineral.dm | 8 +- code/game/turfs/simulated/walls_reinforced.dm | 6 +- code/game/turfs/space/space.dm | 2 +- code/game/turfs/turf.dm | 4 +- code/game/verbs/ooc.dm | 2 +- code/modules/admin/DB ban/functions.dm | 10 +- code/modules/admin/NewBan.dm | 2 +- code/modules/admin/admin.dm | 14 +- code/modules/admin/admin_investigate.dm | 4 +- code/modules/admin/admin_verbs.dm | 8 +- code/modules/admin/create_mob.dm | 2 +- code/modules/admin/create_object.dm | 4 +- code/modules/admin/create_turf.dm | 2 +- code/modules/admin/newbanjob.dm | 2 +- .../admin/permissionverbs/permissionedit.dm | 4 +- code/modules/admin/player_notes.dm | 8 +- code/modules/admin/secrets.dm | 2 +- code/modules/admin/verbs/adminhelp.dm | 2 +- code/modules/admin/verbs/adminjump.dm | 12 +- code/modules/admin/verbs/adminpm.dm | 2 +- code/modules/admin/verbs/bluespacearty.dm | 2 +- code/modules/admin/verbs/buildmode.dm | 4 +- code/modules/admin/verbs/cinematic.dm | 2 +- code/modules/admin/verbs/debug.dm | 28 ++-- code/modules/admin/verbs/diagnostics.dm | 2 +- code/modules/admin/verbs/machine_upgrade.dm | 2 +- code/modules/admin/verbs/massmodvar.dm | 4 +- code/modules/admin/verbs/modifyvariables.dm | 8 +- code/modules/admin/verbs/one_click_antag.dm | 2 +- code/modules/admin/verbs/possess.dm | 6 +- code/modules/admin/verbs/pray.dm | 6 +- code/modules/admin/verbs/randomverbs.dm | 18 +-- code/modules/assembly/assembly.dm | 10 +- code/modules/assembly/bomb.dm | 6 +- code/modules/assembly/holder.dm | 12 +- code/modules/assembly/igniter.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/mousetrap.dm | 10 +- code/modules/assembly/proximity.dm | 2 +- code/modules/assembly/shock_kit.dm | 4 +- code/modules/assembly/signaler.dm | 2 +- code/modules/assembly/timer.dm | 2 +- .../awaymissions/bluespaceartillery.dm | 2 +- code/modules/awaymissions/gateway.dm | 12 +- code/modules/awaymissions/maploader/reader.dm | 16 +-- .../mission_code/stationCollision.dm | 2 +- .../awaymissions/mission_code/wildwest.dm | 2 +- code/modules/awaymissions/signpost.dm | 4 +- code/modules/client/client procs.dm | 2 +- code/modules/client/preferences.dm | 4 +- code/modules/clothing/clothing.dm | 6 +- code/modules/clothing/head/helmet.dm | 4 +- code/modules/clothing/head/misc_special.dm | 4 +- code/modules/clothing/head/soft_caps.dm | 4 +- code/modules/clothing/masks/boxing.dm | 2 +- code/modules/clothing/masks/breath.dm | 4 +- code/modules/clothing/masks/gasmask.dm | 2 +- code/modules/clothing/masks/miscellaneous.dm | 4 +- code/modules/clothing/shoes/colour.dm | 4 +- .../modules/clothing/spacesuits/chronosuit.dm | 4 +- code/modules/clothing/spacesuits/plasmamen.dm | 2 +- code/modules/clothing/suits/armor.dm | 4 +- code/modules/clothing/suits/toggles.dm | 2 +- code/modules/clothing/under/chameleon.dm | 2 +- code/modules/clothing/under/ties.dm | 2 +- code/modules/crafting/guncrafting.dm | 8 +- code/modules/crafting/table.dm | 2 +- code/modules/detectivework/detective_work.dm | 6 +- code/modules/detectivework/evidence.dm | 2 +- .../detectivework/footprints_and_rag.dm | 2 +- code/modules/detectivework/scanner.dm | 10 +- code/modules/events/shuttle_loan.dm | 2 +- code/modules/events/spacevine.dm | 8 +- code/modules/flufftext/Hallucination.dm | 18 +-- code/modules/food&drinks/drinks/drinks.dm | 6 +- .../food&drinks/drinks/drinks/bottle.dm | 4 +- .../drinks/drinks/drinkingglass.dm | 2 +- code/modules/food&drinks/food/condiment.dm | 4 +- code/modules/food&drinks/food/snacks.dm | 2 +- code/modules/food&drinks/food/snacks_egg.dm | 2 +- .../kitchen machinery/food_cart.dm | 6 +- .../food&drinks/kitchen machinery/gibber.dm | 10 +- .../kitchen machinery/icecream_vat.dm | 12 +- .../food&drinks/kitchen machinery/juicer.dm | 14 +- .../kitchen machinery/microwave.dm | 12 +- .../kitchen machinery/monkeyrecycler.dm | 4 +- .../kitchen machinery/processor.dm | 10 +- .../kitchen machinery/smartfridge.dm | 28 ++-- .../food&drinks/recipes/food_mixtures.dm | 18 +-- code/modules/games/cards.dm | 10 +- code/modules/holiday/easter.dm | 4 +- code/modules/holiday/halloween.dm | 2 +- code/modules/hydroponics/biogenerator.dm | 12 +- code/modules/hydroponics/grown.dm | 40 +++--- code/modules/hydroponics/growninedible.dm | 22 ++-- code/modules/hydroponics/hydroitemdefines.dm | 2 +- code/modules/hydroponics/hydroponics.dm | 34 ++--- code/modules/hydroponics/seed_extractor.dm | 10 +- code/modules/hydroponics/seeds.dm | 10 +- code/modules/library/lib_machines.dm | 12 +- code/modules/lighting/lighting_system.dm | 4 +- code/modules/mining/abandoned_crates.dm | 4 +- code/modules/mining/equipment_locker.dm | 20 +-- code/modules/mining/laborcamp/laborstacker.dm | 8 +- .../mining/machine_input_output_plates.dm | 2 +- code/modules/mining/machine_processing.dm | 4 +- code/modules/mining/machine_stacking.dm | 2 +- code/modules/mining/mine_turfs.dm | 18 +-- code/modules/mining/mint.dm | 4 +- code/modules/mining/money_bag.dm | 4 +- code/modules/mining/ores_coins.dm | 12 +- code/modules/mining/satchel_ore_boxdm.dm | 2 +- code/modules/mob/dead/death.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 4 +- code/modules/mob/dead/observer/say.dm | 2 +- code/modules/mob/interactive.dm | 26 ++-- code/modules/mob/inventory.dm | 12 +- code/modules/mob/living/carbon/alien/alien.dm | 6 +- .../mob/living/carbon/alien/alien_defense.dm | 12 +- code/modules/mob/living/carbon/alien/death.dm | 4 +- .../carbon/alien/humanoid/alien_powers.dm | 26 ++-- .../carbon/alien/humanoid/caste/drone.dm | 2 +- .../carbon/alien/humanoid/caste/hunter.dm | 6 +- .../mob/living/carbon/alien/humanoid/emote.dm | 2 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../mob/living/carbon/alien/humanoid/queen.dm | 2 +- .../living/carbon/alien/larva/inventory.dm | 2 +- .../mob/living/carbon/alien/larva/larva.dm | 2 +- .../mob/living/carbon/alien/larva/powers.dm | 4 +- code/modules/mob/living/carbon/alien/say.dm | 4 +- .../carbon/alien/special/alien_embryo.dm | 2 +- .../living/carbon/alien/special/facehugger.dm | 18 +-- code/modules/mob/living/carbon/brain/MMI.dm | 6 +- code/modules/mob/living/carbon/brain/brain.dm | 4 +- code/modules/mob/living/carbon/brain/death.dm | 2 +- code/modules/mob/living/carbon/brain/emote.dm | 2 +- .../mob/living/carbon/brain/posibrain.dm | 10 +- code/modules/mob/living/carbon/brain/say.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 16 +-- .../mob/living/carbon/carbon_defense.dm | 2 +- code/modules/mob/living/carbon/emote.dm | 2 +- code/modules/mob/living/carbon/human/blood.dm | 14 +- code/modules/mob/living/carbon/human/death.dm | 6 +- code/modules/mob/living/carbon/human/emote.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 8 +- .../living/carbon/human/human_attackalien.dm | 2 +- .../living/carbon/human/human_attackpaw.dm | 2 +- .../mob/living/carbon/human/human_damage.dm | 18 +-- .../mob/living/carbon/human/human_defense.dm | 20 +-- .../mob/living/carbon/human/human_helpers.dm | 8 +- .../mob/living/carbon/human/human_movement.dm | 4 +- .../mob/living/carbon/human/inventory.dm | 4 +- code/modules/mob/living/carbon/human/life.dm | 2 +- .../mob/living/carbon/human/mutantrace.dm | 2 +- code/modules/mob/living/carbon/human/say.dm | 2 +- .../mob/living/carbon/human/species.dm | 62 ++++----- .../mob/living/carbon/human/species_types.dm | 12 +- .../mob/living/carbon/human/update_icons.dm | 2 +- .../modules/mob/living/carbon/monkey/death.dm | 4 +- .../modules/mob/living/carbon/monkey/emote.dm | 2 +- .../mob/living/carbon/monkey/monkey.dm | 18 +-- .../mob/living/carbon/monkey/update_icons.dm | 12 +- code/modules/mob/living/damage_procs.dm | 8 +- code/modules/mob/living/death.dm | 12 +- code/modules/mob/living/emote.dm | 2 +- code/modules/mob/living/life.dm | 2 +- code/modules/mob/living/living.dm | 50 ++++---- code/modules/mob/living/living_defense.dm | 24 ++-- code/modules/mob/living/silicon/ai/ai.dm | 18 +-- .../living/silicon/ai/freelook/cameranet.dm | 8 +- .../mob/living/silicon/ai/freelook/chunk.dm | 2 +- .../mob/living/silicon/ai/freelook/eye.dm | 4 +- .../silicon/ai/freelook/update_triggers.dm | 2 +- code/modules/mob/living/silicon/ai/laws.dm | 2 +- code/modules/mob/living/silicon/ai/say.dm | 6 +- code/modules/mob/living/silicon/death.dm | 2 +- code/modules/mob/living/silicon/laws.dm | 10 +- code/modules/mob/living/silicon/pai/pai.dm | 8 +- .../mob/living/silicon/pai/personality.dm | 2 +- code/modules/mob/living/silicon/pai/say.dm | 2 +- .../modules/mob/living/silicon/robot/death.dm | 8 +- .../modules/mob/living/silicon/robot/emote.dm | 2 +- .../mob/living/silicon/robot/inventory.dm | 12 +- code/modules/mob/living/silicon/robot/laws.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 18 +-- .../mob/living/silicon/robot/robot_modules.dm | 6 +- .../living/silicon/robot/robot_movement.dm | 2 +- code/modules/mob/living/silicon/say.dm | 4 +- code/modules/mob/living/silicon/silicon.dm | 18 +-- .../mob/living/simple_animal/constructs.dm | 8 +- .../living/simple_animal/friendly/corgi.dm | 8 +- .../simple_animal/friendly/drone/_drone.dm | 4 +- .../friendly/drone/drones_as_items.dm | 2 +- .../simple_animal/friendly/drone/inventory.dm | 2 +- .../simple_animal/friendly/drone/say.dm | 2 +- .../simple_animal/friendly/farm_animals.dm | 8 +- .../mob/living/simple_animal/friendly/pet.dm | 2 +- .../mob/living/simple_animal/hostile/bear.dm | 2 +- .../mob/living/simple_animal/hostile/bees.dm | 2 +- .../mob/living/simple_animal/hostile/carp.dm | 2 +- .../living/simple_animal/hostile/faithless.dm | 2 +- .../simple_animal/hostile/giant_spider.dm | 2 +- .../living/simple_animal/hostile/headcrab.dm | 2 +- .../living/simple_animal/hostile/hostile.dm | 18 +-- .../mob/living/simple_animal/hostile/mimic.dm | 14 +- .../simple_animal/hostile/mining_mobs.dm | 18 +-- .../living/simple_animal/hostile/mushroom.dm | 10 +- .../hostile/retaliate/retaliate.dm | 4 +- .../living/simple_animal/hostile/statue.dm | 8 +- .../living/simple_animal/hostile/syndicate.dm | 8 +- .../mob/living/simple_animal/morph/morph.dm | 18 +-- .../mob/living/simple_animal/parrot.dm | 14 +- .../living/simple_animal/revenant/revenant.dm | 8 +- .../revenant/revenant_abilities.dm | 8 +- .../revenant/revenant_spawn_event.dm | 2 +- .../modules/mob/living/simple_animal/shade.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 28 ++-- .../simple_animal/slaughter/slaughter.dm | 10 +- .../simple_animal/slaughter/slaughterevent.dm | 2 +- .../mob/living/simple_animal/slime/emote.dm | 2 +- .../mob/living/simple_animal/slime/life.dm | 4 +- .../mob/living/simple_animal/slime/powers.dm | 6 +- .../mob/living/simple_animal/slime/slime.dm | 22 ++-- .../living/simple_animal/slime/subtypes.dm | 2 +- code/modules/mob/living/simple_animal/worm.dm | 4 +- code/modules/mob/living/ventcrawling.dm | 6 +- code/modules/mob/mob.dm | 34 ++--- code/modules/mob/mob_helpers.dm | 6 +- code/modules/mob/mob_movement.dm | 6 +- code/modules/mob/mob_transformation_simple.dm | 2 +- code/modules/mob/new_player/poll.dm | 8 +- code/modules/mob/transform_procs.dm | 4 +- code/modules/nano/nanoexternal.dm | 2 +- code/modules/nano/nanomanager.dm | 18 +-- code/modules/ninja/admin_ninja_verbs.dm | 2 +- code/modules/ninja/energy_katana.dm | 2 +- code/modules/ninja/suit/gloves.dm | 2 +- .../suit/n_suit_verbs/energy_net_nets.dm | 8 +- code/modules/ninja/suit/ninjaDrainAct.dm | 18 +-- code/modules/ninja/suit/suit.dm | 2 +- code/modules/paperwork/handlabeler.dm | 2 +- code/modules/paperwork/pen.dm | 2 +- code/modules/paperwork/photography.dm | 10 +- code/modules/paperwork/stamps.dm | 2 +- .../power/antimatter/containment_jar.dm | 2 +- code/modules/power/antimatter/control.dm | 8 +- code/modules/power/antimatter/shielding.dm | 12 +- code/modules/power/apc.dm | 16 +-- code/modules/power/cable.dm | 22 ++-- code/modules/power/cell.dm | 4 +- code/modules/power/engine.dm | 4 +- code/modules/power/generator.dm | 2 +- code/modules/power/gravitygenerator.dm | 12 +- code/modules/power/lighting.dm | 12 +- code/modules/power/port_gen.dm | 12 +- code/modules/power/power.dm | 14 +- code/modules/power/powernet.dm | 8 +- code/modules/power/singularity/collector.dm | 4 +- .../power/singularity/containment_field.dm | 16 +-- code/modules/power/singularity/emitter.dm | 6 +- .../power/singularity/field_generator.dm | 10 +- code/modules/power/singularity/investigate.dm | 2 +- code/modules/power/singularity/narsie.dm | 6 +- .../particle_accelerator/particle.dm | 4 +- .../particle_accelerator.dm | 8 +- .../particle_accelerator/particle_control.dm | 8 +- .../particle_accelerator/particle_emitter.dm | 4 +- code/modules/power/singularity/singularity.dm | 12 +- code/modules/power/smes.dm | 8 +- code/modules/power/solar.dm | 14 +- code/modules/power/supermatter/supermatter.dm | 12 +- code/modules/power/terminal.dm | 4 +- code/modules/power/tracker.dm | 8 +- code/modules/power/turbine.dm | 4 +- .../procedural mapping/mapGenerator.dm | 12 +- .../procedural mapping/mapGeneratorModule.dm | 6 +- .../mapGeneratorModules/helpers.dm | 2 +- code/modules/projectiles/ammunition.dm | 10 +- .../projectiles/ammunition/ammo_casings.dm | 4 +- .../projectiles/ammunition/magazines.dm | 4 +- code/modules/projectiles/firing.dm | 6 +- code/modules/projectiles/gun.dm | 14 +- code/modules/projectiles/guns/energy.dm | 2 +- .../projectiles/guns/energy/nuclear.dm | 2 +- code/modules/projectiles/guns/energy/pulse.dm | 4 +- .../projectiles/guns/energy/special.dm | 10 +- .../projectiles/guns/energy/temperature.dm | 2 +- .../projectiles/guns/grenade_launcher.dm | 2 +- code/modules/projectiles/guns/magic.dm | 2 +- code/modules/projectiles/guns/magic/wand.dm | 16 +-- code/modules/projectiles/guns/projectile.dm | 10 +- .../projectiles/guns/projectile/automatic.dm | 12 +- .../projectiles/guns/projectile/launchers.dm | 8 +- .../projectiles/guns/projectile/revolver.dm | 14 +- .../projectiles/guns/projectile/shotgun.dm | 20 +-- .../projectiles/guns/projectile/toy.dm | 6 +- code/modules/projectiles/guns/syringe_gun.dm | 4 +- code/modules/projectiles/pins.dm | 4 +- code/modules/projectiles/projectile.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 4 +- .../modules/projectiles/projectile/bullets.dm | 10 +- code/modules/projectiles/projectile/energy.dm | 6 +- code/modules/projectiles/projectile/magic.dm | 16 +-- .../projectiles/projectile/reusable.dm | 2 +- .../modules/projectiles/projectile/special.dm | 4 +- code/modules/reagents/Chemistry-Colours.dm | 2 +- code/modules/reagents/Chemistry-Holder.dm | 46 +++---- code/modules/reagents/Chemistry-Machinery.dm | 66 +++++----- code/modules/reagents/Chemistry-Reagents.dm | 32 ++--- .../Chemistry-Reagents/Blob-Reagents.dm | 26 ++-- .../Drink-Reagents/Alcohols.dm | 30 ++--- .../Drink-Reagents/Drinks.dm | 60 ++++----- .../Consumable-Reagents/Food-Reagents.dm | 36 +++--- .../Chemistry-Reagents/Drug-Reagents.dm | 58 ++++----- .../Chemistry-Reagents/Medicine-Reagents.dm | 120 +++++++++--------- .../Chemistry-Reagents/Other-Reagents.dm | 88 ++++++------- .../Pyrotechnic-Reagents.dm | 22 ++-- .../Chemistry-Reagents/Toxin-Reagents.dm | 76 +++++------ code/modules/reagents/Chemistry-Recipes.dm | 6 +- .../reagents/Chemistry-Recipes/Others.dm | 16 +-- .../Chemistry-Recipes/Pyrotechnics.dm | 38 +++--- .../Chemistry-Recipes/Slime_extracts.dm | 72 +++++------ code/modules/reagents/reagent_containers.dm | 6 +- .../reagents/reagent_containers/borghydro.dm | 6 +- .../reagents/reagent_containers/glass.dm | 6 +- .../reagents/reagent_containers/hypospray.dm | 2 +- .../reagents/reagent_containers/spray.dm | 12 +- code/modules/reagents/reagent_dispenser.dm | 8 +- code/modules/recycling/conveyor2.dm | 6 +- .../recycling/disposal-construction.dm | 2 +- code/modules/recycling/disposal.dm | 74 +++++------ code/modules/recycling/sortingmachinery.dm | 18 +-- code/modules/research/circuitprinter.dm | 4 +- code/modules/research/designs.dm | 2 +- code/modules/research/destructive_analyzer.dm | 4 +- code/modules/research/experimentor.dm | 42 +++--- code/modules/research/message_server.dm | 30 ++--- code/modules/research/protolathe.dm | 4 +- code/modules/research/rdconsole.dm | 12 +- code/modules/research/rdmachines.dm | 2 +- code/modules/research/research.dm | 16 +-- code/modules/research/server.dm | 8 +- code/modules/research/stock_parts.dm | 4 +- .../research/xenobiology/xenobiology.dm | 14 +- .../scripting/Implementations/Telecomms.dm | 8 +- .../scripting/Implementations/_Logic.dm | 66 +++++----- code/modules/scripting/Parser/Expressions.dm | 2 +- .../security levels/keycard authentication.dm | 10 +- .../security levels/security levels.dm | 6 +- code/modules/shuttle/shuttle.dm | 4 +- code/modules/surgery/organs/organ.dm | 2 +- code/modules/telesci/bscrystal.dm | 4 +- code/modules/telesci/gps.dm | 2 +- code/modules/telesci/telepad.dm | 6 +- code/orphaned procs/AStar.dm | 14 +- code/orphaned procs/priority_announce.dm | 6 +- code/orphaned procs/statistics.dm | 4 +- code/world.dm | 2 +- tgstation.dme | 57 +++++++++ 832 files changed, 3721 insertions(+), 3664 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index bb876640cc6..d32ebe4451e 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -61,7 +61,7 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/SetInitDirections() return -/obj/machinery/atmospherics/proc/safe_input(var/title, var/text, var/default_set) +/obj/machinery/atmospherics/proc/safe_input(title, text, default_set) var/new_value = input(usr,text,title,default_set) as num if(usr.canUseTopic(src)) return new_value @@ -86,13 +86,13 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference) return -/obj/machinery/atmospherics/proc/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) +/obj/machinery/atmospherics/proc/icon_addintact(obj/machinery/atmospherics/node, connected) var/image/img = getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color) underlays += img return connected | img.dir -/obj/machinery/atmospherics/proc/icon_addbroken(var/connected) +/obj/machinery/atmospherics/proc/icon_addbroken(connected) var/unconnected = (~connected) & initialize_directions for(var/direction in cardinal) if(unconnected & direction) @@ -101,7 +101,7 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/update_icon() return null -/obj/machinery/atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/attackby(obj/item/weapon/W, mob/user, params) if(can_unwrench && istype(W, /obj/item/weapon/wrench)) var/turf/T = get_turf(src) if (level==1 && isturf(T) && T.intact) @@ -138,7 +138,7 @@ Pipelines + Other Objects -> Pipe network //Called when an atmospherics object is unwrenched while having a large pressure difference //with it's locs air contents. -/obj/machinery/atmospherics/proc/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/proc/unsafe_pressure_release(mob/user,pressures) if(!user) return @@ -165,7 +165,7 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/nullifyPipenet(datum/pipeline/P) P.other_atmosmch -= src -/obj/machinery/atmospherics/proc/getpipeimage(var/iconset, var/iconstate, var/direction, var/col=rgb(255,255,255)) +/obj/machinery/atmospherics/proc/getpipeimage(iconset, iconstate, direction, col=rgb(255,255,255)) //Add identifiers for the iconset if(iconsetids[iconset] == null) @@ -186,7 +186,7 @@ Pipelines + Other Objects -> Pipe network return img -/obj/machinery/atmospherics/construction(D, P, var/pipe_type, var/obj_color) +/obj/machinery/atmospherics/construction(D, P, pipe_type, obj_color) dir = D initialize_directions = P if(can_unwrench) @@ -212,7 +212,7 @@ Pipelines + Other Objects -> Pipe network //Find a connecting /obj/machinery/atmospherics in specified direction -/obj/machinery/atmospherics/proc/findConnecting(var/direction) +/obj/machinery/atmospherics/proc/findConnecting(direction) for(var/obj/machinery/atmospherics/target in get_step(src, direction)) if(target.initialize_directions & get_dir(target,src)) return target @@ -220,7 +220,7 @@ Pipelines + Other Objects -> Pipe network #define VENT_SOUND_DELAY 30 -/obj/machinery/atmospherics/relaymove(var/mob/living/user, var/direction) +/obj/machinery/atmospherics/relaymove(mob/living/user, direction) if(!(direction & initialize_directions)) //cant go this way. return @@ -248,7 +248,7 @@ Pipelines + Other Objects -> Pipe network user.canmove = 1 -/obj/machinery/atmospherics/AltClick(var/mob/living/L) +/obj/machinery/atmospherics/AltClick(mob/living/L) if(is_type_in_list(src, ventcrawl_machinery)) L.handle_ventcrawl(src) return diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index e36e7989db4..eed16b29611 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -163,7 +163,7 @@ parent2 = New -/obj/machinery/atmospherics/binary/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/binary/unsafe_pressure_release(mob/user,pressures) ..() var/turf/T = get_turf(src) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 3ac13f56b51..218a65f5666 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -144,7 +144,7 @@ Passive gate is similar to the regular pump except: -/obj/machinery/atmospherics/binary/passive_gate/attack_hand(user as mob) +/obj/machinery/atmospherics/binary/passive_gate/attack_hand(mob/user) if(..()) return src.add_fingerprint(usr) @@ -178,7 +178,7 @@ Passive gate is similar to the regular pump except: -/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench)) return ..() if (on) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 8f25e7d242b..4f1dac583f6 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -97,7 +97,7 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/binary/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return @@ -148,7 +148,7 @@ Thus, the two variables affect pump operation are set in New(): return -/obj/machinery/atmospherics/binary/pump/attack_hand(user as mob) +/obj/machinery/atmospherics/binary/pump/attack_hand(mob/user) if(..()) return src.add_fingerprint(usr) @@ -180,7 +180,7 @@ Thus, the two variables affect pump operation are set in New(): ..() update_icon() -/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/binary/pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 4b920407ce8..c32d37db72b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -93,7 +93,7 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/binary/volume_pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return @@ -143,7 +143,7 @@ Thus, the two variables affect pump operation are set in New(): update_icon() -/obj/machinery/atmospherics/binary/volume_pump/attack_hand(user as mob) +/obj/machinery/atmospherics/binary/volume_pump/attack_hand(mob/user) if(..()) return src.add_fingerprint(usr) @@ -177,7 +177,7 @@ Thus, the two variables affect pump operation are set in New(): -/obj/machinery/atmospherics/binary/volume_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index cedd26af4b2..bf1d078d2fd 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -142,7 +142,7 @@ Filter types: set_frequency(frequency) return ..() -/obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) +/obj/machinery/atmospherics/trinary/filter/attack_hand(mob/user) if(..()) return @@ -152,7 +152,7 @@ Filter types: ui_interact(user) -/obj/machinery/atmospherics/trinary/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 53b1d1b27f9..6382456ed3f 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -98,7 +98,7 @@ return 1 -/obj/machinery/atmospherics/trinary/mixer/attack_hand(user as mob) +/obj/machinery/atmospherics/trinary/mixer/attack_hand(mob/user) if(..()) return @@ -108,7 +108,7 @@ ui_interact(user) -/obj/machinery/atmospherics/trinary/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 1b2cdb378b8..f5497f2c8c6 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -45,13 +45,13 @@ Iconnery /obj/machinery/atmospherics/trinary/proc/update_icon_nopipes() return -/obj/machinery/atmospherics/trinary/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) +/obj/machinery/atmospherics/trinary/icon_addintact(obj/machinery/atmospherics/node, connected) var/image/img = getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "intact", get_dir(src,node), node.pipe_color) overlays += img return connected | img.dir -/obj/machinery/atmospherics/trinary/icon_addbroken(var/connected) +/obj/machinery/atmospherics/trinary/icon_addbroken(connected) var/unconnected = (~connected) & initialize_directions for(var/direction in cardinal) if(unconnected & direction) @@ -222,7 +222,7 @@ Housekeeping and pipe network stuff below parent3 = New -/obj/machinery/atmospherics/trinary/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/trinary/unsafe_pressure_release(mob/user,pressures) ..() var/turf/T = get_turf(src) diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index 7c2ab9b622c..59781d6c713 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -120,7 +120,7 @@ Housekeeping and pipe network stuff below parent = New -/obj/machinery/atmospherics/unary/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/unary/unsafe_pressure_release(mob/user,pressures) ..() var/turf/T = get_turf(src) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 9588baa7ee7..e598ccf0354 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -247,7 +247,7 @@ stat |= NOPOWER update_icon_nopipes() -/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/unary/vent_scrubber/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) diff --git a/code/ATMOSPHERICS/pipes/manifold.dm b/code/ATMOSPHERICS/pipes/manifold.dm index 1aaf93e3ad9..8f6ac175080 100644 --- a/code/ATMOSPHERICS/pipes/manifold.dm +++ b/code/ATMOSPHERICS/pipes/manifold.dm @@ -108,7 +108,7 @@ if(node3) overlays += getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full[invis]", get_dir(src,node3)) -/obj/machinery/atmospherics/pipe/manifold/hide(var/i) +/obj/machinery/atmospherics/pipe/manifold/hide(i) if(level == 1 && istype(loc, /turf/simulated)) invisibility = i ? 101 : 0 update_icon() diff --git a/code/ATMOSPHERICS/pipes/manifold4w.dm b/code/ATMOSPHERICS/pipes/manifold4w.dm index d4c80c56b2e..4db873eed76 100644 --- a/code/ATMOSPHERICS/pipes/manifold4w.dm +++ b/code/ATMOSPHERICS/pipes/manifold4w.dm @@ -47,7 +47,7 @@ update_icon() ..() -/obj/machinery/atmospherics/pipe/manifold4w/hide(var/i) +/obj/machinery/atmospherics/pipe/manifold4w/hide(i) if(level == 1 && istype(loc, /turf/simulated)) invisibility = i ? 101 : 0 update_icon() diff --git a/code/ATMOSPHERICS/pipes/simple.dm b/code/ATMOSPHERICS/pipes/simple.dm index a280403a9df..b4685c44a1d 100644 --- a/code/ATMOSPHERICS/pipes/simple.dm +++ b/code/ATMOSPHERICS/pipes/simple.dm @@ -104,7 +104,7 @@ The regular pipe you see everywhere, including bent ones. var/have_node2 = node2?1:0 icon_state = "exposed[have_node1][have_node2][invisibility ? "-f" : "" ]" -/obj/machinery/atmospherics/pipe/simple/hide(var/i) +/obj/machinery/atmospherics/pipe/simple/hide(i) if(level == 1 && istype(loc, /turf/simulated)) invisibility = i ? 101 : 0 update_icon() diff --git a/code/LINDA/LINDA_system.dm b/code/LINDA/LINDA_system.dm index 515197b7b99..bee42ef44a1 100644 --- a/code/LINDA/LINDA_system.dm +++ b/code/LINDA/LINDA_system.dm @@ -1,4 +1,4 @@ -/turf/proc/CanAtmosPass(var/turf/T) +/turf/proc/CanAtmosPass(turf/T) if(!istype(T)) return 0 var/R if(blocks_air || T.blocks_air) @@ -79,23 +79,23 @@ T.atmos_adjacent_turfs_amount -= 1 T.atmos_adjacent_turfs &= ~counterdir -/atom/movable/proc/air_update_turf(var/command = 0) +/atom/movable/proc/air_update_turf(command = 0) if(!istype(loc,/turf) && command) return var/turf/T = get_turf(loc) T.air_update_turf(command) -/turf/proc/air_update_turf(var/command = 0) +/turf/proc/air_update_turf(command = 0) if(command) CalculateAdjacentTurfs() SSair.add_to_active(src,command) -/atom/movable/proc/move_update_air(var/turf/T) +/atom/movable/proc/move_update_air(turf/T) if(istype(T,/turf)) T.air_update_turf(1) air_update_turf(1) -/atom/movable/proc/atmos_spawn_air(var/text, var/amount) //because a lot of people loves to copy paste awful code lets just make a easy proc to spawn your plasma fires +/atom/movable/proc/atmos_spawn_air(text, amount) //because a lot of people loves to copy paste awful code lets just make a easy proc to spawn your plasma fires var/turf/simulated/T = get_turf(src) if(!istype(T)) return @@ -112,7 +112,7 @@ var/const/SPAWN_N2O = 64 var/const/SPAWN_AIR = 256 -/turf/simulated/proc/atmos_spawn_air(var/flag, var/amount) +/turf/simulated/proc/atmos_spawn_air(flag, amount) if(!text || !amount || !air) return diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index 011b627dae9..802b7a5ec59 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -240,7 +240,7 @@ if("sleeping_agent") overlays += SSair.sleeptoxin_overlay -/turf/simulated/proc/share_air(var/turf/simulated/T) +/turf/simulated/proc/share_air(turf/simulated/T) if(T.current_cycle < current_cycle) var/difference difference = air.share(T.air, atmos_adjacent_turfs_amount) @@ -251,7 +251,7 @@ T.consider_pressure_difference(src, difference) last_share_check() -/turf/proc/consider_pressure_difference(var/turf/simulated/T, var/difference) +/turf/proc/consider_pressure_difference(turf/simulated/T, difference) SSair.high_pressure_delta |= src if(difference > pressure_difference) pressure_direction = get_dir(src, T) @@ -284,13 +284,13 @@ /datum/excited_group/New() SSair.excited_groups += src -/datum/excited_group/proc/add_turf(var/turf/simulated/T) +/datum/excited_group/proc/add_turf(turf/simulated/T) turf_list += T T.excited_group = src T.recently_active = 1 reset_cooldowns() -/datum/excited_group/proc/merge_groups(var/datum/excited_group/E) +/datum/excited_group/proc/merge_groups(datum/excited_group/E) if(turf_list.len > E.turf_list.len) SSair.excited_groups -= E for(var/turf/simulated/T in E.turf_list) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 33c56635c4d..8a0b055d4b2 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -32,7 +32,7 @@ // Like view but bypasses luminosity check -/proc/get_hear(var/range, var/atom/source) +/proc/get_hear(range, atom/source) var/lum = source.luminosity source.luminosity = 6 @@ -42,7 +42,7 @@ return heard -/proc/alone_in_area(var/area/the_area, var/mob/must_be_alone, var/check_type = /mob/living/carbon) +/proc/alone_in_area(area/the_area, mob/must_be_alone, check_type = /mob/living/carbon) var/area/our_area = get_area_master(the_area) for(var/C in living_mob_list) if(!istype(C, check_type)) @@ -125,7 +125,7 @@ //This is the new version of recursive_mob_check, used for say(). //The other proc was left intact because morgue trays use it. -/proc/recursive_hear_check(var/atom/O) +/proc/recursive_hear_check(atom/O) var/list/processing_list = list(O) var/list/processed_list = list() var/list/found_atoms = list() @@ -147,7 +147,7 @@ // Better recursive loop, technically sort of not actually recursive cause that shit is retarded, enjoy. //No need for a recursive limit either -/proc/recursive_mob_check(var/atom/O,var/client_check=1,var/sight_check=1,var/include_radio=1) +/proc/recursive_mob_check(atom/O,client_check=1,sight_check=1,include_radio=1) var/list/processing_list = list(O) var/list/processed_list = list() @@ -187,7 +187,7 @@ return found_mobs -/proc/get_hearers_in_view(var/R, var/atom/source) +/proc/get_hearers_in_view(R, atom/source) // Returns a list of hearers in view(R) from source (ignoring luminosity). Used in saycode. var/turf/T = get_turf(source) var/list/hear = list() @@ -202,7 +202,7 @@ return hear -/proc/get_mobs_in_radio_ranges(var/list/obj/item/device/radio/radios) +/proc/get_mobs_in_radio_ranges(list/obj/item/device/radio/radios) set background = BACKGROUND_ENABLED @@ -247,7 +247,7 @@ #undef SIGN -/proc/isInSight(var/atom/A, var/atom/B) +/proc/isInSight(atom/A, atom/B) var/turf/Aturf = get_turf(A) var/turf/Bturf = get_turf(B) @@ -282,7 +282,7 @@ if(AM.Move(get_step(T, direction))) break -/proc/get_mob_by_key(var/key) +/proc/get_mob_by_key(key) for(var/mob/M in mob_list) if(M.ckey == lowertext(key)) return M @@ -363,7 +363,7 @@ src.dest_x = dest_x src.dest_y = dest_y -/proc/projectile_trajectory(var/src_x, var/src_y, var/rotation, var/angle, var/power) +/proc/projectile_trajectory(src_x, src_y, rotation, angle, power) // returns the destination (Vx,y) that a projectile shot at [src_x], [src_y], with an angle of [angle], // rotated at [rotation] and with the power of [power] diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 37eaa81413a..ef86ac33bfc 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -870,7 +870,7 @@ The _flatIcons list is a cache for generated icon files. //Find's the average colour of the icon //By vg's ComicIronic -/proc/AverageColour(var/icon/I) +/proc/AverageColour(icon/I) var/list/colours = list() for(var/x_pixel = 1 to I.Width()) for(var/y_pixel = 1 to I.Height()) @@ -889,7 +889,7 @@ The _flatIcons list is a cache for generated icon files. //Interface for using DrawBox() to draw 1 pixel on a coordinate. //Returns the same icon specifed in the argument, but with the pixel drawn -/proc/DrawPixel(var/icon/I,var/colour,var/drawX,var/drawY) +/proc/DrawPixel(icon/I,colour,drawX,drawY) if(!I) return 0 @@ -906,7 +906,7 @@ The _flatIcons list is a cache for generated icon files. //Interface for easy drawing of one pixel on an atom. -/atom/proc/DrawPixelOn(var/colour, var/drawX, var/drawY) +/atom/proc/DrawPixelOn(colour, drawX, drawY) var/icon/I = new(icon) var/icon/J = DrawPixel(I, colour, drawX, drawY) if(J) //Only set the icon if it succeeded, the icon without the pixel is 1000x better than a black square. diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index 461ec2c4601..2ec7b4c407f 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -10,7 +10,7 @@ */ //Returns a list in plain english as a string -/proc/english_list(var/list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" ) +/proc/english_list(list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" ) var/total = input.len if (!total) return "[nothing_text]" @@ -57,7 +57,7 @@ return 0 //Checks for specific types in a list -/proc/is_type_in_list(var/atom/A, var/list/L) +/proc/is_type_in_list(atom/A, list/L) for(var/type in L) if(istype(A, type)) return 1 @@ -84,7 +84,7 @@ * If skiprep = 1, repeated elements are treated as one. * If either of arguments is not a list, returns null */ -/proc/difflist(var/list/first, var/list/second, var/skiprep=0) +/proc/difflist(list/first, list/second, skiprep=0) if(!islist(first) || !islist(second)) return var/list/result = new @@ -101,7 +101,7 @@ * If skipref = 1, repeated elements are treated as one. * If either of arguments is not a list, returns null */ -/proc/uniquemergelist(var/list/first, var/list/second, var/skiprep=0) +/proc/uniquemergelist(list/first, list/second, skiprep=0) if(!islist(first) || !islist(second)) return var/list/result = new @@ -148,7 +148,7 @@ L.Insert(pos+1, thing) // Returns the next item in a list -/proc/next_list_item(var/item, var/list/L) +/proc/next_list_item(item, list/L) var/i i = L.Find(item) if(i == L.len) @@ -158,7 +158,7 @@ return L[i] // Returns the previous item in a list -/proc/previous_list_item(var/item, var/list/L) +/proc/previous_list_item(item, list/L) var/i i = L.Find(item) if(i == 1) @@ -172,7 +172,7 @@ */ /* //Reverses the order of items in the list -/proc/reverselist(var/list/input) +/proc/reverselist(list/input) var/list/output = list() for(var/i = input.len; i >= 1; i--) output += input[i] @@ -180,7 +180,7 @@ */ //Randomize: Return the list in a random order -/proc/shuffle(var/list/L) +/proc/shuffle(list/L) if(!L) return L = L.Copy() @@ -191,7 +191,7 @@ return L //Return a list with no duplicate entries -/proc/uniqueList(var/list/L) +/proc/uniqueList(list/L) . = list() for(var/i in L) . |= i @@ -206,11 +206,11 @@ return sortTim(L, order >= 0 ? /proc/cmp_records_asc : /proc/cmp_records_dsc) //any value in a list -/proc/sortList(var/list/L, cmp=/proc/cmp_text_asc) +/proc/sortList(list/L, cmp=/proc/cmp_text_asc) return sortTim(L.Copy(), cmp) //uses sortList() but uses the var's name specifically. This should probably be using mergeAtom() instead -/proc/sortNames(var/list/L, order=1) +/proc/sortNames(list/L, order=1) return sortTim(L, order >= 0 ? /proc/cmp_name_asc : /proc/cmp_name_dsc) @@ -232,7 +232,7 @@ return r // Returns the key based on the index -/proc/get_key_by_index(var/list/L, var/index) +/proc/get_key_by_index(list/L, index) var/i = 1 for(var/key in L) if(index == i) @@ -240,7 +240,7 @@ i++ return null -/proc/count_by_type(var/list/L, type) +/proc/count_by_type(list/L, type) var/i = 0 for(var/T in L) if(istype(T, type)) diff --git a/code/__HELPERS/maths.dm b/code/__HELPERS/maths.dm index 8402482c714..7940dae0d85 100644 --- a/code/__HELPERS/maths.dm +++ b/code/__HELPERS/maths.dm @@ -129,7 +129,7 @@ var/list/sqrtTable = list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, //A logarithm that converts an integer to a number scaled between 0 and 1 (can be tweaked to be higher). //Currently, this is used for hydroponics-produce sprite transforming, but could be useful for other transform functions. -/proc/TransformUsingVariable(var/input, var/inputmaximum, var/scaling_modifier = 0) +/proc/TransformUsingVariable(input, inputmaximum, scaling_modifier = 0) var/inputToDegrees = (input/inputmaximum)*180 //Converting from a 0 -> 100 scale to a 0 -> 180 scale. The 0 -> 180 scale corresponds to degrees var/size_factor = ((-cos(inputToDegrees) +1) /2) //returns a value from 0 to 1 diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 4642f002cbc..7e4bb267ea4 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -128,7 +128,7 @@ Proc for attack log creation, because really why not 6 is additional information, anything that needs to be added */ -/proc/add_logs(mob/user, mob/target, what_done, var/object=null, var/addition=null) +/proc/add_logs(mob/user, mob/target, what_done, object=null, addition=null) var/newhealthtxt = "" if (target && isliving(target)) var/mob/living/L = target diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 4cef32a4130..3c074ad5756 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -32,7 +32,7 @@ var/command_name = null command_name = name return name -/proc/change_command_name(var/name) +/proc/change_command_name(name) command_name = name diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 33b781ad4f8..1a7b44d0c4e 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -14,11 +14,11 @@ */ // Run all strings to be used in an SQL query through this proc first to properly escape out injection attempts. -/proc/sanitizeSQL(var/t as text) +/proc/sanitizeSQL(t as text) var/sqltext = dbcon.Quote(t); return copytext(sqltext, 2, lentext(sqltext));//Quote() adds quotes around input, we already do that -/proc/format_table_name(var/table as text) +/proc/format_table_name(table as text) return sqlfdbktableprefix + table /* @@ -26,7 +26,7 @@ */ //Simply removes < and > and limits the length of the message -/proc/strip_html_simple(var/t,var/limit=MAX_MESSAGE_LEN) +/proc/strip_html_simple(t,limit=MAX_MESSAGE_LEN) var/list/strip_chars = list("<",">") t = copytext(t,1,limit) for(var/char in strip_chars) @@ -37,7 +37,7 @@ return t //Removes a few problematic characters -/proc/sanitize_simple(var/t,var/list/repl_chars = list("\n"="#","\t"="#")) +/proc/sanitize_simple(t,list/repl_chars = list("\n"="#","\t"="#")) for(var/char in repl_chars) var/index = findtext(t, char) while(index) @@ -46,22 +46,22 @@ return t //Runs byond's sanitization proc along-side sanitize_simple -/proc/sanitize(var/t,var/list/repl_chars = null) +/proc/sanitize(t,list/repl_chars = null) return html_encode(sanitize_simple(t,repl_chars)) //Runs sanitize and strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' after sanitize() calls byond's html_encode() -/proc/strip_html(var/t,var/limit=MAX_MESSAGE_LEN) +/proc/strip_html(t,limit=MAX_MESSAGE_LEN) return copytext((sanitize(strip_html_simple(t))),1,limit) //Runs byond's sanitization proc along-side strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' that html_encode() would cause -/proc/adminscrub(var/t,var/limit=MAX_MESSAGE_LEN) +/proc/adminscrub(t,limit=MAX_MESSAGE_LEN) return copytext((html_encode(strip_html_simple(t))),1,limit) //Returns null if there is any bad text in the string -/proc/reject_bad_text(var/text, var/max_length=512) +/proc/reject_bad_text(text, max_length=512) if(length(text) > max_length) return //message too long var/non_whitespace = 0 for(var/i=1, i<=length(text), i++) @@ -74,17 +74,17 @@ if(non_whitespace) return text //only accepts the text if it has some non-spaces // Used to get a properly sanitized input, of max_length -/proc/stripped_input(var/mob/user, var/message = "", var/title = "", var/default = "", var/max_length=MAX_MESSAGE_LEN) +/proc/stripped_input(mob/user, message = "", title = "", default = "", max_length=MAX_MESSAGE_LEN) var/name = input(user, message, title, default) as text|null return html_encode(trim(name, max_length)) //trim is "inside" because html_encode can expand single symbols into multiple symbols (such as turning < into <) // Used to get a properly sanitized multiline input, of max_length -/proc/stripped_multiline_input(var/mob/user, var/message = "", var/title = "", var/default = "", var/max_length=MAX_MESSAGE_LEN) +/proc/stripped_multiline_input(mob/user, message = "", title = "", default = "", max_length=MAX_MESSAGE_LEN) var/name = input(user, message, title, default) as message|null return html_encode(trim(name, max_length)) //Filters out undesirable characters from names -/proc/reject_bad_name(var/t_in, var/allow_numbers=0, var/max_length=MAX_NAME_LEN) +/proc/reject_bad_name(t_in, allow_numbers=0, max_length=MAX_NAME_LEN) if(!t_in || length(t_in) > max_length) return //Rejects the input if it is null or if it is longer then the max length allowed @@ -149,7 +149,7 @@ //html_encode helper proc that returns the smallest non null of two numbers //or 0 if they're both null (needed because of findtext returning 0 when a value is not present) -/proc/non_zero_min(var/a, var/b) +/proc/non_zero_min(a, b) if(!a) return b if(!b) @@ -239,7 +239,7 @@ return trim_left(trim_right(text)) //Returns a string with the first element of the string capitalized. -/proc/capitalize(var/t as text) +/proc/capitalize(t as text) return uppertext(copytext(t, 1, 2)) + copytext(t, 2) //Centers text by adding spaces to either side of the string. @@ -267,7 +267,7 @@ return copytext(message, 1, length + 1) -/proc/stringmerge(var/text,var/compare,replace = "*") +/proc/stringmerge(text,compare,replace = "*") //This proc fills in all spaces with the "replace" var (* by default) with whatever //is in the other string at the same spot (assuming it is not a replace char). //This is used for fingerprints @@ -288,7 +288,7 @@ return 0 return newtext -/proc/stringpercent(var/text,character = "*") +/proc/stringpercent(text,character = "*") //This proc returns the number of chars of the string that is the character //This is used for detective work to determine fingerprint completion. if(!text || !character) @@ -300,7 +300,7 @@ count++ return count -/proc/reverse_text(var/text = "") +/proc/reverse_text(text = "") var/new_text = "" for(var/i = length(text); i > 0; i--) new_text += copytext(text, i, i+1) diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index 66168dcc939..c297d043a30 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -2,10 +2,10 @@ /proc/worldtime2text() return gameTimestamp("hh:mm") -/proc/time_stamp(var/format = "hh:mm:ss") +/proc/time_stamp(format = "hh:mm:ss") return time2text(world.timeofday, format) -/proc/gameTimestamp(var/format = "hh:mm:ss") // Get the game time in text +/proc/gameTimestamp(format = "hh:mm:ss") // Get the game time in text return time2text(world.time - timezoneOffset + 432000, format) /* Preserving this so future generations can see how fucking retarded some people are @@ -23,7 +23,7 @@ proc/time_stamp() */ /* Returns 1 if it is the selected month and day */ -/proc/isDay(var/month, var/day) +/proc/isDay(month, day) if(isnum(month) && isnum(day)) var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index ad4b622f5d9..a14fa4ac40b 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -235,7 +235,7 @@ return //Converts an angle (degrees) into an ss13 direction -/proc/angle2dir(var/degree) +/proc/angle2dir(degree) degree = SimplifyDegrees(degree) @@ -250,7 +250,7 @@ //returns the north-zero clockwise angle in degrees, given a direction -/proc/dir2angle(var/D) +/proc/dir2angle(D) switch(D) if(NORTH) return 0 if(SOUTH) return 180 @@ -263,7 +263,7 @@ else return null //Returns the angle in english -/proc/angle2text(var/degree) +/proc/angle2text(degree) return dir2text(angle2dir(degree)) //Converts a blend_mode constant to one acceptable to icon.Blend() @@ -460,7 +460,7 @@ for(var/t in test_times) //Turns a Body_parts_covered bitfield into a list of organ/limb names. //(I challenge you to find a use for this) -/proc/body_parts_covered2organ_names(var/bpc) +/proc/body_parts_covered2organ_names(bpc) var/list/covered_parts = list() if(!bpc) @@ -544,7 +544,7 @@ for(var/t in test_times) else . = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307)) -/proc/color2hex(var/color) //web colors +/proc/color2hex(color) //web colors if(!color) return "#000000" diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index f83878efb29..2a223184ccf 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -27,7 +27,7 @@ return //Returns the middle-most value -/proc/dd_range(var/low, var/high, var/num) +/proc/dd_range(low, high, num) return max(low,min(high,num)) @@ -183,7 +183,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return 1 //Ensure the frequency is within bounds of what it should be sending/recieving at -/proc/sanitize_frequency(var/f) +/proc/sanitize_frequency(f) f = round(f) f = max(1441, f) // 144.1 f = min(1489, f) // 148.9 @@ -192,7 +192,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return f //Turns 1479 into 147.9 -/proc/format_frequency(var/f) +/proc/format_frequency(f) f = text2num(f) return "[round(f / 10)].[f % 10]" @@ -200,7 +200,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //This will update a mob's name, real_name, mind.name, data_core records, pda, id and traitor text //Calling this proc without an oldname will only update the mob and skip updating the pda, id and records ~Carn -/mob/proc/fully_replace_character_name(var/oldname,var/newname) +/mob/proc/fully_replace_character_name(oldname,newname) if(!newname) return 0 real_name = newname name = newname @@ -273,7 +273,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Generalised helper proc for letting mobs rename themselves. Used to be clname() and ainame() -/mob/proc/rename_self(var/role, var/allow_numbers=0) +/mob/proc/rename_self(role, allow_numbers=0) var/oldname = real_name var/newname var/loop = 1 @@ -329,7 +329,7 @@ Turf and target are seperate in case you want to teleport some distance from a t . += R //Returns a list of AI's -/proc/active_ais(var/check_mind=0) +/proc/active_ais(check_mind=0) . = list() for(var/mob/living/silicon/ai/A in living_mob_list) if(A.stat == DEAD) @@ -352,14 +352,14 @@ Turf and target are seperate in case you want to teleport some distance from a t return selected -/proc/select_active_free_borg(var/mob/user) +/proc/select_active_free_borg(mob/user) var/list/borgs = active_free_borgs() if(borgs.len) if(user) . = input(user,"Unshackled cyborg signals detected:", "Cyborg Selection", borgs[1]) in borgs else . = pick(borgs) return . -/proc/select_active_ai(var/mob/user) +/proc/select_active_ai(mob/user) var/list/ais = active_ais() if(ais.len) if(user) . = input(user,"AI signals detected:", "AI Selection", ais[1]) in ais @@ -427,16 +427,16 @@ Turf and target are seperate in case you want to teleport some distance from a t return moblist //E = MC^2 -/proc/convert2energy(var/M) +/proc/convert2energy(M) var/E = M*(SPEED_OF_LIGHT_SQ) return E //M = E/C^2 -/proc/convert2mass(var/E) +/proc/convert2mass(E) var/M = E/(SPEED_OF_LIGHT_SQ) return M -/proc/key_name(var/whom, var/include_link = null, var/include_name = 1) +/proc/key_name(whom, include_link = null, include_name = 1) var/mob/M var/client/C var/key @@ -492,10 +492,10 @@ Turf and target are seperate in case you want to teleport some distance from a t return . -/proc/key_name_admin(var/whom, var/include_name = 1) +/proc/key_name_admin(whom, include_name = 1) return key_name(whom, 1, include_name) -/proc/get_mob_by_ckey(var/key) +/proc/get_mob_by_ckey(key) if(!key) return var/list/mobs = sortmobs() @@ -505,7 +505,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // Returns the atom sitting on the turf. // For example, using this on a disk, which is in a bag, on a mob, will return the mob because it's on the turf. -/proc/get_atom_on_turf(var/atom/movable/M) +/proc/get_atom_on_turf(atom/movable/M) var/atom/loc = M while(loc && loc.loc && !istype(loc.loc, /turf/)) loc = loc.loc @@ -513,7 +513,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // returns the turf located at the map edge in the specified direction relative to A // used for mass driver -/proc/get_edge_target_turf(var/atom/A, var/direction) +/proc/get_edge_target_turf(atom/A, direction) var/turf/target = locate(A.x, A.y, A.z) if(!A || !target) @@ -537,7 +537,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // result is bounded to map size // note range is non-pythagorean // used for disposal system -/proc/get_ranged_target_turf(var/atom/A, var/direction, var/range) +/proc/get_ranged_target_turf(atom/A, direction, range) var/x = A.x var/y = A.y @@ -555,7 +555,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // returns turf relative to A offset in dx and dy tiles // bound to map limits -/proc/get_offset_target_turf(var/atom/A, var/dx, var/dy) +/proc/get_offset_target_turf(atom/A, dx, dy) var/x = min(world.maxx, max(1, A.x + dx)) var/y = min(world.maxy, max(1, A.y + dy)) return locate(x,y,A.z) @@ -565,7 +565,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return y -/proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,flick_anim as text,sleeptime = 0,direction as num) +/proc/anim(turf/location,target as mob|obj,a_icon,a_icon_state as text,flick_anim as text,sleeptime = 0,direction as num) //This proc throws up either an icon or an animation for a specified amount of time. //The variables should be apparent enough. var/atom/movable/overlay/animation = new(location) @@ -623,7 +623,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Step-towards method of determining whether one atom can see another. Similar to viewers() -/proc/can_see(var/atom/source, var/atom/target, var/length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. +/proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. var/turf/current = get_turf(source) var/turf/target_turf = get_turf(target) var/steps = 0 @@ -638,7 +638,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return 1 -/proc/is_blocked_turf(var/turf/T) +/proc/is_blocked_turf(turf/T) var/cant_pass = 0 if(T.density) cant_pass = 1 for(var/atom/A in T) @@ -646,7 +646,7 @@ Turf and target are seperate in case you want to teleport some distance from a t cant_pass = 1 return cant_pass -/proc/get_step_towards2(var/atom/ref , var/atom/trg) +/proc/get_step_towards2(atom/ref , atom/trg) var/base_dir = get_dir(ref, get_step_towards(ref,trg)) var/turf/temp = get_step_towards(ref,trg) @@ -674,7 +674,7 @@ Turf and target are seperate in case you want to teleport some distance from a t else return get_step(ref, base_dir) -/proc/do_mob(var/mob/user , var/mob/target, var/time = 30, numticks = 5, var/stealth = 0) //This is quite an ugly solution but i refuse to use the old request system. +/proc/do_mob(mob/user , mob/target, time = 30, numticks = 5, stealth = 0) //This is quite an ugly solution but i refuse to use the old request system. if(!user || !target) return 0 if(numticks == 0) @@ -703,7 +703,7 @@ Turf and target are seperate in case you want to teleport some distance from a t user.client.images -= progbar return 1 -/proc/make_progress_bar(var/current_number, var/goal_number, var/atom/target) +/proc/make_progress_bar(current_number, goal_number, atom/target) if(current_number && goal_number && target) var/image/progbar progbar = image("icon" = 'icons/effects/doafter_icon.dmi', "loc" = target, "icon_state" = "prog_bar_0") @@ -767,7 +767,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Takes: Anything that could possibly have variables and a varname to check. //Returns: 1 if found, 0 if not. -/proc/hasvar(var/datum/A, var/varname) +/proc/hasvar(datum/A, varname) if(A.vars.Find(lowertext(varname))) return 1 else return 0 @@ -785,7 +785,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all areas of that type in the world. -/proc/get_areas(var/areatype) +/proc/get_areas(areatype) if(!areatype) return null if(istext(areatype)) areatype = text2path(areatype) if(isarea(areatype)) @@ -799,7 +799,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all turfs in areas of that type of that type in the world. -/proc/get_area_turfs(var/areatype) +/proc/get_area_turfs(areatype) if(!areatype) return null if(istext(areatype)) areatype = text2path(areatype) if(isarea(areatype)) @@ -814,7 +814,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all atoms (objs, turfs, mobs) in areas of that type of that type in the world. -/proc/get_area_all_atoms(var/areatype) +/proc/get_area_all_atoms(areatype) if(!areatype) return null if(istext(areatype)) areatype = text2path(areatype) if(isarea(areatype)) @@ -833,7 +833,7 @@ Turf and target are seperate in case you want to teleport some distance from a t var/y_pos = null var/z_pos = null -/proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0) +/proc/DuplicateObject(obj/original, perfectcopy = 0 , sameloc = 0) if(!original) return null @@ -852,7 +852,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return O -/area/proc/copy_contents_to(var/area/A , var/platingRequired = 0 ) +/area/proc/copy_contents_to(area/A , platingRequired = 0 ) //Takes: Area. Optional: If it should copy to areas that don't have plating //Returns: Nothing. //Notes: Attempts to move the contents of one area to another area. @@ -1081,7 +1081,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //centered = 0 counts from turf edge to edge //centered = 1 counts from turf center to turf center //of course mathematically this is just adding world.icon_size on again -/proc/getPixelDistance(var/atom/A, var/atom/B, var/centered = 1) +/proc/getPixelDistance(atom/A, atom/B, centered = 1) if(!istype(A)||!istype(B)) return 0 . = bounds_dist(A, B) + sqrt((((A.pixel_x+B.pixel_x)**2) + ((A.pixel_y+B.pixel_y)**2))) @@ -1110,7 +1110,7 @@ var/global/list/common_tools = list( return 1 return 0 -/proc/is_hot(obj/item/W as obj) +/proc/is_hot(obj/item/W) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/O = W if(O.isOn()) @@ -1161,7 +1161,7 @@ var/global/list/common_tools = list( return 0 //Is this even used for anything besides balloons? Yes I took out the W:lit stuff because : really shouldnt be used. -/proc/is_sharp(obj/item/W as obj) // For the record, WHAT THE HELL IS THIS METHOD OF DOING IT? +/proc/is_sharp(obj/item/W) // For the record, WHAT THE HELL IS THIS METHOD OF DOING IT? var/list/sharp_things_1 = list(\ /obj/item/weapon/circular_saw,\ /obj/item/weapon/shovel,\ @@ -1194,7 +1194,7 @@ var/global/list/common_tools = list( else return 0 -/proc/is_pointed(obj/item/W as obj) +/proc/is_pointed(obj/item/W) if(istype(W, /obj/item/weapon/pen)) return 1 if(istype(W, /obj/item/weapon/screwdriver)) @@ -1257,7 +1257,7 @@ var/list/WALLITEMS = list( /proc/format_text(text) return replacetext(replacetext(text,"\proper ",""),"\improper ","") -/obj/proc/atmosanalyzer_scan(var/datum/gas_mixture/air_contents, mob/user, var/obj/target = src) +/obj/proc/atmosanalyzer_scan(datum/gas_mixture/air_contents, mob/user, obj/target = src) var/obj/icon = target user.visible_message("[user] has used the analyzer on \icon[icon] [target].", "You use the analyzer on \icon[icon] [target].") var/pressure = air_contents.return_pressure() @@ -1313,7 +1313,7 @@ var/list/WALLITEMS = list( living_player_count += 1 return living_player_count -/proc/randomColor(var/mode = 0) //if 1 it doesn't pick white, black or gray +/proc/randomColor(mode = 0) //if 1 it doesn't pick white, black or gray switch(mode) if(0) return pick("white","black","gray","red","green","blue","brown","yellow","orange","darkred", @@ -1336,7 +1336,7 @@ var/list/WALLITEMS = list( tY = max(1, min(world.maxy, origin.y + (text2num(tY) - (world.view + 1)))) return locate(tX, tY, tZ) -/proc/IsValidSrc(var/A) +/proc/IsValidSrc(A) if(istype(A, /datum)) var/datum/B = A return !B.gc_destroyed diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index 20aeb967d29..f1db0379efc 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -10,7 +10,7 @@ Note that in all cases the neighbor is handled simply; this is usually the user's mob, in which case it is up to you to check that the mob is not inside of something */ -/atom/proc/Adjacent(var/atom/neighbor) // basic inheritance, unused +/atom/proc/Adjacent(atom/neighbor) // basic inheritance, unused return 0 // Not a sane use of the function and (for now) indicative of an error elsewhere @@ -83,7 +83,7 @@ This is defined as any dense ON_BORDER object, or any dense object without throwpass. The border_only flag allows you to not objects (for source and destination squares) */ -/turf/proc/ClickCross(var/target_dir, var/border_only, var/target_atom = null) +/turf/proc/ClickCross(target_dir, border_only, target_atom = null) for(var/obj/O in src) if( !O.density || O == target_atom || O.throwpass) //check if there's a dense object present on the turf continue // throwpass is used for anything you can click through (or the firedoor special case, see above) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 305e3af18d3..406a0fb4423 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -85,7 +85,7 @@ /mob/living/silicon/ai/RangedAttack(atom/A) A.attack_ai(src) -/atom/proc/attack_ai(mob/user as mob) +/atom/proc/attack_ai(mob/user) return /* @@ -112,7 +112,7 @@ /* Atom Procs */ /atom/proc/AICtrlClick() return -/atom/proc/AIAltClick(var/mob/living/silicon/ai/user) +/atom/proc/AIAltClick(mob/living/silicon/ai/user) AltClick(user) return /atom/proc/AIShiftClick() diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 193fa246a83..2be1d10aa41 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -33,7 +33,7 @@ * item/afterattack(atom,user,adjacent,params) - used both ranged and adjacent * mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed */ -/mob/proc/ClickOn( var/atom/A, var/params ) +/mob/proc/ClickOn( atom/A, params ) if(world.time <= next_click) return next_click = world.time + 1 @@ -131,7 +131,7 @@ next_move = world.time + num // Default behavior: ignore double clicks (the second click that makes the doubleclick call already calls for a normal click) -/mob/proc/DblClickOn(var/atom/A, var/params) +/mob/proc/DblClickOn(atom/A, params) return @@ -145,7 +145,7 @@ proximity_flag is not currently passed to attack_hand, and is instead used in human click code to allow glove touches only at melee range. */ -/mob/proc/UnarmedAttack(var/atom/A, var/proximity_flag) +/mob/proc/UnarmedAttack(atom/A, proximity_flag) if(ismob(A)) changeNext_move(CLICK_CD_MELEE) return @@ -158,36 +158,36 @@ for things like ranged glove touches, spitting alien acid/neurotoxin, animals lunging, etc. */ -/mob/proc/RangedAttack(var/atom/A, var/params) +/mob/proc/RangedAttack(atom/A, params) /* Restrained ClickOn Used when you are handcuffed and click things. Not currently used by anything but could easily be. */ -/mob/proc/RestrainedClickOn(var/atom/A) +/mob/proc/RestrainedClickOn(atom/A) return /* Middle click Only used for swapping hands */ -/mob/proc/MiddleClickOn(var/atom/A) +/mob/proc/MiddleClickOn(atom/A) return -/mob/living/carbon/MiddleClickOn(var/atom/A) +/mob/living/carbon/MiddleClickOn(atom/A) if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src)) next_click = world.time + 5 mind.changeling.chosen_sting.try_to_sting(src, A) else swap_hand() -/mob/living/simple_animal/drone/MiddleClickOn(var/atom/A) +/mob/living/simple_animal/drone/MiddleClickOn(atom/A) swap_hand() // In case of use break glass /* -/atom/proc/MiddleClick(var/mob/M as mob) +/atom/proc/MiddleClick(mob/M as mob) return */ @@ -196,10 +196,10 @@ For most mobs, examine. This is overridden in ai.dm */ -/mob/proc/ShiftClickOn(var/atom/A) +/mob/proc/ShiftClickOn(atom/A) A.ShiftClick(src) return -/atom/proc/ShiftClick(var/mob/user) +/atom/proc/ShiftClick(mob/user) if(user.client && user.client.eye == user || user.client.eye == user.loc) user.examinate(src) return @@ -208,13 +208,13 @@ Ctrl click For most objects, pull */ -/mob/proc/CtrlClickOn(var/atom/A) +/mob/proc/CtrlClickOn(atom/A) A.CtrlClick(src) return -/atom/proc/CtrlClick(var/mob/user) +/atom/proc/CtrlClick(mob/user) return -/atom/movable/CtrlClick(var/mob/user) +/atom/movable/CtrlClick(mob/user) if(Adjacent(user)) user.start_pulling(src) @@ -222,18 +222,18 @@ Alt click Unused except for AI */ -/mob/proc/AltClickOn(var/atom/A) +/mob/proc/AltClickOn(atom/A) A.AltClick(src) return -/mob/living/carbon/AltClickOn(var/atom/A) +/mob/living/carbon/AltClickOn(atom/A) if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src)) next_click = world.time + 5 mind.changeling.chosen_sting.try_to_sting(src, A) else ..() -/atom/proc/AltClick(var/mob/user) +/atom/proc/AltClick(mob/user) var/turf/T = get_turf(src) if(T && user.TurfAdjacent(T)) if(user.listed_turf == T) @@ -243,18 +243,18 @@ user.client.statpanel = T.name return -/mob/proc/TurfAdjacent(var/turf/T) +/mob/proc/TurfAdjacent(turf/T) return T.Adjacent(src) /* Control+Shift click Unused except for AI */ -/mob/proc/CtrlShiftClickOn(var/atom/A) +/mob/proc/CtrlShiftClickOn(atom/A) A.CtrlShiftClick(src) return -/atom/proc/CtrlShiftClick(var/mob/user) +/atom/proc/CtrlShiftClick(mob/user) return /* @@ -292,7 +292,7 @@ src << "You're out of energy! You need food!" // Simple helper to face what you clicked on, in case it should be needed in more than one place -/mob/proc/face_atom(var/atom/A) +/mob/proc/face_atom(atom/A) if( buckled || stat != CONSCIOUS || !A || !x || !y || !A.x || !A.y ) return var/dx = A.x - x var/dy = A.y - y diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 25cf22540ae..4cb6a641ba8 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -90,36 +90,36 @@ return //Middle click cycles through selected modules. -/mob/living/silicon/robot/MiddleClickOn(var/atom/A) +/mob/living/silicon/robot/MiddleClickOn(atom/A) cycle_modules() return //Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks // for non-doors/apcs -/mob/living/silicon/robot/CtrlShiftClickOn(var/atom/A) +/mob/living/silicon/robot/CtrlShiftClickOn(atom/A) A.BorgCtrlShiftClick(src) -/mob/living/silicon/robot/ShiftClickOn(var/atom/A) +/mob/living/silicon/robot/ShiftClickOn(atom/A) A.BorgShiftClick(src) -/mob/living/silicon/robot/CtrlClickOn(var/atom/A) +/mob/living/silicon/robot/CtrlClickOn(atom/A) A.BorgCtrlClick(src) -/mob/living/silicon/robot/AltClickOn(var/atom/A) +/mob/living/silicon/robot/AltClickOn(atom/A) A.BorgAltClick(src) -/atom/proc/BorgCtrlShiftClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden +/atom/proc/BorgCtrlShiftClick(mob/living/silicon/robot/user) //forward to human click if not overriden CtrlShiftClick(user) /obj/machinery/door/airlock/BorgCtrlShiftClick() // Sets/Unsets Emergency Access Override Forwards to AI code. AICtrlShiftClick() -/atom/proc/BorgShiftClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden +/atom/proc/BorgShiftClick(mob/living/silicon/robot/user) //forward to human click if not overriden ShiftClick(user) /obj/machinery/door/airlock/BorgShiftClick() // Opens and closes doors! Forwards to AI code. AIShiftClick() -/atom/proc/BorgCtrlClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden +/atom/proc/BorgCtrlClick(mob/living/silicon/robot/user) //forward to human click if not overriden CtrlClick(user) /obj/machinery/door/airlock/BorgCtrlClick() // Bolts doors. Forwards to AI code. @@ -131,7 +131,7 @@ /obj/machinery/turretid/BorgCtrlClick() //turret control on/off. Forwards to AI code. AICtrlClick() -/atom/proc/BorgAltClick(var/mob/living/silicon/robot/user) +/atom/proc/BorgAltClick(mob/living/silicon/robot/user) AltClick(user) return @@ -154,6 +154,6 @@ /mob/living/silicon/robot/RangedAttack(atom/A) A.attack_robot(src) -/atom/proc/attack_robot(mob/user as mob) +/atom/proc/attack_robot(mob/user) attack_ai(user) return diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm index 0a2d8da4a33..ebf7131e551 100644 --- a/code/_onclick/hud/action.dm +++ b/code/_onclick/hud/action.dm @@ -166,7 +166,7 @@ usr.update_action_buttons() -/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(var/mob/living/user) +/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(mob/living/user) if(isalien(user)) icon_state = "bg_alien" else @@ -188,7 +188,7 @@ #define AB_NORTH_OFFSET 26 #define AB_MAX_COLUMNS 10 -/datum/hud/proc/ButtonNumberToScreenCoords(var/number) // TODO : Make this zero-indexed for readabilty +/datum/hud/proc/ButtonNumberToScreenCoords(number) // TODO : Make this zero-indexed for readabilty var/row = round((number-1)/AB_MAX_COLUMNS) var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1 var/coord_col = "+[col-1]" @@ -197,7 +197,7 @@ var/coord_row_offset = 26 return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:[coord_row_offset]" -/datum/hud/proc/SetButtonCoords(var/obj/screen/button,var/number) +/datum/hud/proc/SetButtonCoords(obj/screen/button,number) var/row = round((number-1)/AB_MAX_COLUMNS) var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1 var/x_offset = 32*(col-1) + 4 + 2*col diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index cb0ddfbf5ee..8c442d8dc35 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -202,7 +202,7 @@ var/datum/global_hud/global_hud = new() show_hud(HUD_STYLE_REDUCED) //Version denotes which style should be displayed. blank or 0 means "next version" -/datum/hud/proc/show_hud(var/version = 0) +/datum/hud/proc/show_hud(version = 0) if(!ismob(mymob)) return 0 if(!mymob.client) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 172b4bd63ae..e0bdd54cae3 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -16,7 +16,7 @@ user.changeNext_move(CLICK_CD_MELEE) I.attack(src, user) -/mob/living/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) +/mob/living/proc/attacked_by(obj/item/I, mob/living/user, def_zone) apply_damage(I.force, I.damtype, def_zone) if(I.damtype == "brute") if(prob(33) && I.force) @@ -63,7 +63,7 @@ else if(!src.force && src.w_class) return Clamp(src.w_class * 6, 10, 100) // Multiply the item's weight class by 6, then clamp the value between 10 and 100 -/obj/item/proc/attack(mob/living/M as mob, mob/living/user as mob, def_zone) +/obj/item/proc/attack(mob/living/M, mob/living/user, def_zone) if (!istype(M)) // not sure if this is the right thing... return diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index b2d8c1a59c9..d452c21be90 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -53,7 +53,7 @@ A.attack_ghost(src) // Oh by the way this didn't work with old click code which is why clicking shit didn't spam you -/atom/proc/attack_ghost(mob/dead/observer/user as mob) +/atom/proc/attack_ghost(mob/dead/observer/user) if(user.client && user.client.inquisitive_ghost) user.examinate(src) return @@ -62,29 +62,29 @@ // And here are some good things for free: // Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu -/obj/machinery/teleport/hub/attack_ghost(mob/user as mob) +/obj/machinery/teleport/hub/attack_ghost(mob/user) var/atom/l = loc var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z)) if(com && com.locked) user.loc = get_turf(com.locked) -/obj/effect/portal/attack_ghost(mob/user as mob) +/obj/effect/portal/attack_ghost(mob/user) if(target) user.loc = get_turf(target) -/obj/machinery/gateway/centerstation/attack_ghost(mob/user as mob) +/obj/machinery/gateway/centerstation/attack_ghost(mob/user) if(awaygate) user.loc = awaygate.loc else user << "[src] has no destination." -/obj/machinery/gateway/centeraway/attack_ghost(mob/user as mob) +/obj/machinery/gateway/centeraway/attack_ghost(mob/user) if(stationgate) user.loc = stationgate.loc else user << "[src] has no destination." -/obj/item/weapon/storage/attack_ghost(mob/user as mob) +/obj/item/weapon/storage/attack_ghost(mob/user) orient2hud(user) show_to(user) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index ba55e9cf993..1171a9aa5c9 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -4,7 +4,7 @@ Otherwise pretty standard. */ -/mob/living/carbon/human/UnarmedAttack(var/atom/A, var/proximity) +/mob/living/carbon/human/UnarmedAttack(atom/A, proximity) var/obj/item/clothing/gloves/G = gloves // not typecast specifically enough in defines // Special glove functions: @@ -22,7 +22,7 @@ A.attack_hand(src) -/atom/proc/attack_hand(mob/user as mob) +/atom/proc/attack_hand(mob/user) return /* @@ -30,10 +30,10 @@ return */ -/mob/living/carbon/RestrainedClickOn(var/atom/A) +/mob/living/carbon/RestrainedClickOn(atom/A) return 0 -/mob/living/carbon/human/RangedAttack(var/atom/A) +/mob/living/carbon/human/RangedAttack(atom/A) if(gloves) var/obj/item/clothing/gloves/G = gloves if(istype(G) && G.Touch(A,0)) // for magic gloves @@ -49,24 +49,24 @@ /* Animals & All Unspecified */ -/mob/living/UnarmedAttack(var/atom/A) +/mob/living/UnarmedAttack(atom/A) A.attack_animal(src) -/mob/living/simple_animal/hostile/UnarmedAttack(var/atom/A) +/mob/living/simple_animal/hostile/UnarmedAttack(atom/A) target = A AttackingTarget() -/atom/proc/attack_animal(mob/user as mob) +/atom/proc/attack_animal(mob/user) return -/mob/living/RestrainedClickOn(var/atom/A) +/mob/living/RestrainedClickOn(atom/A) return /* Monkeys */ -/mob/living/carbon/monkey/UnarmedAttack(var/atom/A) +/mob/living/carbon/monkey/UnarmedAttack(atom/A) A.attack_paw(src) -/atom/proc/attack_paw(mob/user as mob) +/atom/proc/attack_paw(mob/user) return /* @@ -76,7 +76,7 @@ moving it here instead of various hand_p's has simplified things considerably */ -/mob/living/carbon/monkey/RestrainedClickOn(var/atom/A) +/mob/living/carbon/monkey/RestrainedClickOn(atom/A) if(..()) return if(a_intent != "harm" || !ismob(A)) return @@ -102,18 +102,18 @@ Aliens Defaults to same as monkey in most places */ -/mob/living/carbon/alien/UnarmedAttack(var/atom/A) +/mob/living/carbon/alien/UnarmedAttack(atom/A) A.attack_alien(src) -/atom/proc/attack_alien(mob/user as mob) +/atom/proc/attack_alien(mob/user) attack_paw(user) return -/mob/living/carbon/alien/RestrainedClickOn(var/atom/A) +/mob/living/carbon/alien/RestrainedClickOn(atom/A) return // Babby aliens -/mob/living/carbon/alien/larva/UnarmedAttack(var/atom/A) +/mob/living/carbon/alien/larva/UnarmedAttack(atom/A) A.attack_larva(src) -/atom/proc/attack_larva(mob/user as mob) +/atom/proc/attack_larva(mob/user) return @@ -121,11 +121,11 @@ Slimes Nothing happening here */ -/mob/living/simple_animal/slime/UnarmedAttack(var/atom/A) +/mob/living/simple_animal/slime/UnarmedAttack(atom/A) A.attack_slime(src) -/atom/proc/attack_slime(mob/user as mob) +/atom/proc/attack_slime(mob/user) return -/mob/living/simple_animal/slime/RestrainedClickOn(var/atom/A) +/mob/living/simple_animal/slime/RestrainedClickOn(atom/A) return /* diff --git a/code/_onclick/overmind.dm b/code/_onclick/overmind.dm index f692ba8f7ea..dc4cca11421 100644 --- a/code/_onclick/overmind.dm +++ b/code/_onclick/overmind.dm @@ -1,17 +1,17 @@ // Blob Overmind Controls -/mob/camera/blob/CtrlClickOn(var/atom/A) // Expand blob +/mob/camera/blob/CtrlClickOn(atom/A) // Expand blob var/turf/T = get_turf(A) if(T) expand_blob(T) -/mob/camera/blob/MiddleClickOn(var/atom/A) // Rally spores +/mob/camera/blob/MiddleClickOn(atom/A) // Rally spores var/turf/T = get_turf(A) if(T) rally_spores(T) -/mob/camera/blob/AltClickOn(var/atom/A) // Create a shield +/mob/camera/blob/AltClickOn(atom/A) // Create a shield var/turf/T = get_turf(A) if(T) create_shield(T) \ No newline at end of file diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 9cb3d4945e5..33a8ad6e056 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -75,7 +75,7 @@ var/const/tk_maxrange = 15 var/mob/living/host = null -/obj/item/tk_grab/dropped(mob/user as mob) +/obj/item/tk_grab/dropped(mob/user) if(focus && user && loc != user && loc != user.loc) // drop_item() gets called when you tk-attack a table/closet with an item if(focus.Adjacent(loc)) focus.loc = loc @@ -85,13 +85,13 @@ var/const/tk_maxrange = 15 //stops TK grabs being equipped anywhere but into hands -/obj/item/tk_grab/equipped(var/mob/user, var/slot) +/obj/item/tk_grab/equipped(mob/user, slot) if( (slot == slot_l_hand) || (slot== slot_r_hand) ) return qdel(src) return -/obj/item/tk_grab/attack_self(mob/user as mob) +/obj/item/tk_grab/attack_self(mob/user) if(focus) focus.attack_self_tk(user) @@ -141,11 +141,11 @@ var/const/tk_maxrange = 15 return 0 return 1 -/obj/item/tk_grab/attack(mob/living/M as mob, mob/living/user as mob, def_zone) +/obj/item/tk_grab/attack(mob/living/M, mob/living/user, def_zone) return -/obj/item/tk_grab/proc/focus_object(var/obj/target, var/mob/living/user) +/obj/item/tk_grab/proc/focus_object(obj/target, mob/living/user) if(!istype(target,/obj)) return//Cant throw non objects atm might let it do mobs later if(target.anchored || !isturf(target.loc)) qdel(src) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 27f6a92016b..8d88edc8ffb 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -135,7 +135,7 @@ var/datum/subsystem/air/SSair T.process_cell() -/datum/subsystem/air/proc/remove_from_active(var/turf/simulated/T) +/datum/subsystem/air/proc/remove_from_active(turf/simulated/T) if(istype(T)) T.excited = 0 active_turfs -= T @@ -143,7 +143,7 @@ var/datum/subsystem/air/SSair T.excited_group.garbage_collect() -/datum/subsystem/air/proc/add_to_active(var/turf/simulated/T, var/blockchanges = 1) +/datum/subsystem/air/proc/add_to_active(turf/simulated/T, blockchanges = 1) if(istype(T) && T.air) T.excited = 1 active_turfs |= T diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 5f85d3f162c..5d6c83b8206 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -462,7 +462,7 @@ var/datum/subsystem/job/SSjob return 1 return 0 -/datum/subsystem/job/proc/RejectPlayer(var/mob/new_player/player) +/datum/subsystem/job/proc/RejectPlayer(mob/new_player/player) if(player.mind && player.mind.special_role) return Debug("Popcap overflow Check observer located, Player: [player]") diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index 7226ad211b3..580464eca10 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -12,7 +12,7 @@ var/datum/subsystem/npcpool/SSbp var/list/botPool_l = list() //list of all npcs using the pool var/list/botPool_l_non = list() //list of all non SNPC mobs using the pool -/datum/subsystem/npcpool/proc/insertBot(var/toInsert) +/datum/subsystem/npcpool/proc/insertBot(toInsert) if(istype(toInsert,/mob/living/carbon/human/interactive)) botPool_l |= toInsert diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 431f68c348e..e4a6ce4b51e 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -82,7 +82,7 @@ var/datum/subsystem/pai/SSpai return recruitWindow(usr) -/datum/subsystem/pai/proc/recruitWindow(var/mob/M as mob) +/datum/subsystem/pai/proc/recruitWindow(mob/M) var/datum/paiCandidate/candidate for(var/datum/paiCandidate/c in candidates) if(c.key == M.key) @@ -133,7 +133,7 @@ var/datum/subsystem/pai/SSpai M << browse(dat, "window=paiRecruit") -/datum/subsystem/pai/proc/findPAI(var/obj/item/device/paicard/p, var/mob/user) +/datum/subsystem/pai/proc/findPAI(obj/item/device/paicard/p, mob/user) requestRecruits() var/list/available = list() for(var/datum/paiCandidate/c in SSpai.candidates) @@ -196,7 +196,7 @@ var/datum/subsystem/pai/SSpai if(!hasSubmitted && (O.client.prefs.be_special & BE_PAI)) question(O.client) -/datum/subsystem/pai/proc/question(var/client/C) +/datum/subsystem/pai/proc/question(client/C) spawn(0) if(!C) return asked.Add(C.key) diff --git a/code/controllers/subsystem/radio.dm b/code/controllers/subsystem/radio.dm index 84e117f3f64..25f172bf9da 100644 --- a/code/controllers/subsystem/radio.dm +++ b/code/controllers/subsystem/radio.dm @@ -9,7 +9,7 @@ var/datum/subsystem/radio/radio_controller /datum/subsystem/radio/New() NEW_SS_GLOBAL(radio_controller) -/datum/subsystem/radio/proc/add_object(obj/device as obj, var/new_frequency as num, var/filter = null as text|null) +/datum/subsystem/radio/proc/add_object(obj/device, new_frequency as num, filter = null as text|null) var/f_text = num2text(new_frequency) var/datum/radio_frequency/frequency = frequencies[f_text] @@ -34,7 +34,7 @@ var/datum/subsystem/radio/radio_controller return 1 -/datum/subsystem/radio/proc/return_frequency(var/new_frequency as num) +/datum/subsystem/radio/proc/return_frequency(new_frequency as num) var/f_text = num2text(new_frequency) var/datum/radio_frequency/frequency = frequencies[f_text] diff --git a/code/controllers/subsystem/shuttles/supply.dm b/code/controllers/subsystem/shuttles/supply.dm index 2cce906435f..8d0ca50207f 100644 --- a/code/controllers/subsystem/shuttles/supply.dm +++ b/code/controllers/subsystem/shuttles/supply.dm @@ -201,7 +201,7 @@ return 0 -/obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob) +/obj/machinery/computer/ordercomp/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -303,7 +303,7 @@ updateUsrDialog() return -/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) +/obj/machinery/computer/supplycomp/attack_hand(mob/user) if(!allowed(user)) user << "Access Denied." return @@ -514,7 +514,7 @@ updateUsrDialog() return -/obj/machinery/computer/supplycomp/proc/post_signal(var/command) +/obj/machinery/computer/supplycomp/proc/post_signal(command) var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 82af4344c69..599563b1c81 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -200,7 +200,7 @@ var/datum/subsystem/ticker/ticker //Plus it provides an easy way to make cinematics for other events. Just use this as a template -/datum/subsystem/ticker/proc/station_explosion_cinematic(var/station_missed=0, var/override = null) +/datum/subsystem/ticker/proc/station_explosion_cinematic(station_missed=0, override = null) if( cinematic ) return //already a cinematic in progress! for (var/datum/html_interface/hi in html_interfaces) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 6c2834a081f..1d9fb09f63b 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -44,7 +44,7 @@ var/datum/subsystem/timer/SStimer /datum/timedevent/Destroy() SStimer.processing -= src -/proc/addtimer(var/thingToCall, var/procToCall, var/wait, var/argList = list()) +/proc/addtimer(thingToCall, procToCall, wait, argList = list()) if (!SStimer) //can't run timers before the mc has been created return if (!thingToCall || !procToCall || wait <= 0) @@ -63,7 +63,7 @@ var/datum/subsystem/timer/SStimer return event.id -/proc/deltimer(var/id) +/proc/deltimer(id) for (var/datum/timedevent/event in SStimer.processing) if (event.id == id) qdel(event) diff --git a/code/controllers/subsystem/voting.dm b/code/controllers/subsystem/voting.dm index 7988d4ab99e..5d11eccd14a 100644 --- a/code/controllers/subsystem/voting.dm +++ b/code/controllers/subsystem/voting.dm @@ -120,7 +120,7 @@ var/datum/subsystem/vote/SSvote return . -/datum/subsystem/vote/proc/submit_vote(var/vote) +/datum/subsystem/vote/proc/submit_vote(vote) if(mode) if(config.vote_no_dead && usr.stat == DEAD && !usr.client.holder) return 0 @@ -131,7 +131,7 @@ var/datum/subsystem/vote/SSvote return vote return 0 -/datum/subsystem/vote/proc/initiate_vote(var/vote_type, var/initiator_key) +/datum/subsystem/vote/proc/initiate_vote(vote_type, initiator_key) if(!mode) if(started_time != null) var/next_allowed_time = (started_time + config.vote_delay) @@ -162,7 +162,7 @@ var/datum/subsystem/vote/SSvote return 1 return 0 -/datum/subsystem/vote/proc/interface(var/client/C) +/datum/subsystem/vote/proc/interface(client/C) if(!C) return var/admin = 0 var/trialmin = 0 diff --git a/code/controllers/subsystems.dm b/code/controllers/subsystems.dm index 3d36430f592..ed81dda8652 100644 --- a/code/controllers/subsystems.dm +++ b/code/controllers/subsystems.dm @@ -57,7 +57,7 @@ //could be used to postpone a costly subsystem for (default one) var/cycles, cycles //for instance, during cpu intensive operations like explosions -/datum/subsystem/proc/postpone(var/cycles = 1) +/datum/subsystem/proc/postpone(cycles = 1) if(next_fire - world.time < wait) next_fire += (wait*cycles) diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index f44fa115c39..b8f364d015a 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -119,23 +119,23 @@ /* General ai_law functions */ -/datum/ai_laws/proc/set_zeroth_law(var/law, var/law_borg = null) +/datum/ai_laws/proc/set_zeroth_law(law, law_borg = null) src.zeroth = law if(law_borg) //Making it possible for slaved borgs to see a different law 0 than their AI. --NEO src.zeroth_borg = law_borg -/datum/ai_laws/proc/add_inherent_law(var/law) +/datum/ai_laws/proc/add_inherent_law(law) if (!(law in src.inherent)) src.inherent += law -/datum/ai_laws/proc/add_ion_law(var/law) +/datum/ai_laws/proc/add_ion_law(law) src.ion += law /datum/ai_laws/proc/clear_inherent_laws() del(src.inherent) src.inherent = list() -/datum/ai_laws/proc/add_supplied_law(var/number, var/law) +/datum/ai_laws/proc/add_supplied_law(number, law) while (src.supplied.len < number + 1) src.supplied += "" @@ -147,7 +147,7 @@ /datum/ai_laws/proc/clear_ion_laws() src.ion = list() -/datum/ai_laws/proc/show_laws(var/who) +/datum/ai_laws/proc/show_laws(who) if (src.zeroth) who << "0. [src.zeroth]" @@ -171,7 +171,7 @@ who << "[number]. [law]" number++ -/datum/ai_laws/proc/clear_zeroth_law(var/force) //only removes zeroth from antag ai if force is 1 +/datum/ai_laws/proc/clear_zeroth_law(force) //only removes zeroth from antag ai if force is 1 if(force) src.zeroth = null src.zeroth_borg = null @@ -184,6 +184,6 @@ src.zeroth_borg = null return -/datum/ai_laws/proc/associate(var/mob/living/silicon/M) +/datum/ai_laws/proc/associate(mob/living/silicon/M) if(!owner) owner = M \ No newline at end of file diff --git a/code/datums/browser.dm b/code/datums/browser.dm index a43a3996271..7a218a85367 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -94,7 +94,7 @@ [get_footer()] "} -/datum/browser/proc/open(var/use_onclose = 1) +/datum/browser/proc/open(use_onclose = 1) var/window_size = "" if (width && height) window_size = "size=[width]x[height];" @@ -137,7 +137,7 @@ // to pass a "close=1" parameter to the atom's Topic() proc for special handling. // Otherwise, the user mob's machine var will be reset directly. // -/proc/onclose(mob/user, windowid, var/atom/ref=null) +/proc/onclose(mob/user, windowid, atom/ref=null) if(!user.client) return var/param = "null" if(ref) @@ -153,7 +153,7 @@ // if a valid atom reference is supplied, call the atom's Topic() with "close=1" // otherwise, just reset the client mob's machine var. // -/client/verb/windowclose(var/atomref as text) +/client/verb/windowclose(atomref as text) set hidden = 1 // hide this verb from the user's panel set name = ".windowclose" // no autocomplete on cmd line diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index ae0df9ac76d..c99aa61573a 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -33,7 +33,7 @@ c.dataId = ++securityCrimeCounter return c -/datum/datacore/proc/addMinorCrime(id = "", var/datum/data/crime/crime) +/datum/datacore/proc/addMinorCrime(id = "", datum/data/crime/crime) for(var/datum/data/record/R in security) if(R.fields["id"] == id) var/list/crimes = R.fields["mi_crim"] @@ -58,14 +58,14 @@ crimes -= crime return -/datum/datacore/proc/addMajorCrime(id = "", var/datum/data/crime/crime) +/datum/datacore/proc/addMajorCrime(id = "", datum/data/crime/crime) for(var/datum/data/record/R in security) if(R.fields["id"] == id) var/list/crimes = R.fields["ma_crim"] crimes |= crime return -/datum/datacore/proc/manifest(var/nosleep = 0) +/datum/datacore/proc/manifest(nosleep = 0) spawn() if(!nosleep) sleep(40) @@ -73,7 +73,7 @@ manifest_inject(H) return -/datum/datacore/proc/manifest_modify(var/name, var/assignment) +/datum/datacore/proc/manifest_modify(name, assignment) var/datum/data/record/foundrecord = find_record("name", name, data_core.general) if(foundrecord) foundrecord.fields["rank"] = assignment @@ -187,7 +187,7 @@ var/record_id_num = 1001 -/datum/datacore/proc/manifest_inject(var/mob/living/carbon/human/H) +/datum/datacore/proc/manifest_inject(mob/living/carbon/human/H) if(H.mind && (H.mind.assigned_role != H.mind.special_role)) var/assignment if(H.mind.assigned_role) @@ -265,7 +265,7 @@ var/record_id_num = 1001 locked += L return -/datum/datacore/proc/get_id_photo(var/mob/living/carbon/human/H) +/datum/datacore/proc/get_id_photo(mob/living/carbon/human/H) var/icon/photo = null var/g = (H.gender == FEMALE) ? "f" : "m" if(!config.mutant_races || H.dna.species.use_skintones) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 80a6fd4204e..34ac5085c27 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -324,7 +324,7 @@ body return -/client/proc/debug_variable(name, value, level, var/datum/DA = null) +/client/proc/debug_variable(name, value, level, datum/DA = null) var/html = "" if(DA) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index f41cb13c576..01b2a738e02 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -1,12 +1,12 @@ -/mob/proc/HasDisease(var/datum/disease/D) +/mob/proc/HasDisease(datum/disease/D) for(var/datum/disease/DD in viruses) if(D.IsSame(DD)) return 1 return 0 -/mob/proc/CanContractDisease(var/datum/disease/D) +/mob/proc/CanContractDisease(datum/disease/D) if(stat == DEAD) return 0 @@ -25,20 +25,20 @@ return 1 -/mob/proc/ContractDisease(var/datum/disease/D) +/mob/proc/ContractDisease(datum/disease/D) if(!CanContractDisease(D)) return 0 AddDisease(D) -/mob/proc/AddDisease(var/datum/disease/D) +/mob/proc/AddDisease(datum/disease/D) var/datum/disease/DD = new D.type(1, D, 0) viruses += DD DD.affected_mob = src DD.holder = src if(DD.disease_flags & CAN_CARRY && prob(5)) DD.carrier = 1 - + //Copy properties over. This is so edited diseases persist. var/list/skipped = list("affected_mob","holder","carrier","stage","type","parent_type","vars") for(var/V in DD.vars) @@ -49,11 +49,11 @@ DD.vars[V] = L.Copy() else DD.vars[V] = D.vars[V] - + DD.affected_mob.med_hud_set_status() -/mob/living/carbon/ContractDisease(var/datum/disease/D) +/mob/living/carbon/ContractDisease(datum/disease/D) if(!CanContractDisease(D)) return 0 @@ -135,13 +135,13 @@ //Same as ContractDisease, except never overidden clothes checks -/mob/proc/ForceContractDisease(var/datum/disease/D) +/mob/proc/ForceContractDisease(datum/disease/D) if(!CanContractDisease(D)) return 0 AddDisease(D) -/mob/living/carbon/human/CanContractDisease(var/datum/disease/D) +/mob/living/carbon/human/CanContractDisease(datum/disease/D) if(dna && VIRUSIMMUNE in dna.species.specflags) return 0 return ..() \ No newline at end of file diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index 0de6ac8cebf..519ee6a946e 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -97,7 +97,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease break //One missing cure is enough to fail -/datum/disease/proc/spread(var/atom/source, var/force_spread = 0) +/datum/disease/proc/spread(atom/source, force_spread = 0) if((spread_flags & SPECIAL || spread_flags & NON_CONTAGIOUS || spread_flags & BLOOD) && !force_spread) return @@ -172,7 +172,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease SSdisease.processing += src -/datum/disease/proc/IsSame(var/datum/disease/D) +/datum/disease/proc/IsSame(datum/disease/D) if(istype(src, D.type)) return 1 return 0 diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 541fef7bef7..8d5b977c3d7 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -91,7 +91,7 @@ var/list/advance_cures = list( CRASH("We do not have any symptoms during stage_act()!") // Compares type then ID. -/datum/disease/advance/IsSame(var/datum/disease/advance/D) +/datum/disease/advance/IsSame(datum/disease/advance/D) if(!(istype(D, /datum/disease/advance))) return 0 @@ -101,7 +101,7 @@ var/list/advance_cures = list( return 1 // To add special resistances. -/datum/disease/advance/cure(var/resistance=1) +/datum/disease/advance/cure(resistance=1) if(affected_mob) var/id = "[GetDiseaseID()]" if(resistance && !(id in affected_mob.resistances)) @@ -110,7 +110,7 @@ var/list/advance_cures = list( del(src) //delete the datum to stop it processing // Returns the advance disease with a different reference memory. -/datum/disease/advance/Copy(var/process = 0) +/datum/disease/advance/Copy(process = 0) return new /datum/disease/advance(process, src, 1) /* @@ -120,20 +120,20 @@ var/list/advance_cures = list( */ // Mix the symptoms of two diseases (the src and the argument) -/datum/disease/advance/proc/Mix(var/datum/disease/advance/D) +/datum/disease/advance/proc/Mix(datum/disease/advance/D) if(!(src.IsSame(D))) var/list/possible_symptoms = shuffle(D.symptoms) for(var/datum/symptom/S in possible_symptoms) AddSymptom(new S.type) -/datum/disease/advance/proc/HasSymptom(var/datum/symptom/S) +/datum/disease/advance/proc/HasSymptom(datum/symptom/S) for(var/datum/symptom/symp in symptoms) if(symp.id == S.id) return 1 return 0 // Will generate new unique symptoms, use this if there are none. Returns a list of symptoms that were generated. -/datum/disease/advance/proc/GenerateSymptoms(var/level_min, var/level_max, var/amount_get = 0) +/datum/disease/advance/proc/GenerateSymptoms(level_min, level_max, amount_get = 0) var/list/generated = list() // Symptoms we generated. @@ -160,7 +160,7 @@ var/list/advance_cures = list( return generated -/datum/disease/advance/proc/Refresh(var/new_name = 0) +/datum/disease/advance/proc/Refresh(new_name = 0) //world << "[src.name] \ref[src] - REFRESH!" var/list/properties = GenerateProperties() AssignProperties(properties) @@ -195,7 +195,7 @@ var/list/advance_cures = list( return properties // Assign the properties that are in the list. -/datum/disease/advance/proc/AssignProperties(var/list/properties = list()) +/datum/disease/advance/proc/AssignProperties(list/properties = list()) if(properties && properties.len) switch(properties["stealth"]) @@ -216,7 +216,7 @@ var/list/advance_cures = list( // Assign the spread type and give it the correct description. -/datum/disease/advance/proc/SetSpread(var/spread_id) +/datum/disease/advance/proc/SetSpread(spread_id) switch(spread_id) if(NON_CONTAGIOUS) spread_text = "None" @@ -231,7 +231,7 @@ var/list/advance_cures = list( spread_flags = spread_id -/datum/disease/advance/proc/SetSeverity(var/level_sev) +/datum/disease/advance/proc/SetSeverity(level_sev) switch(level_sev) @@ -252,7 +252,7 @@ var/list/advance_cures = list( // Will generate a random cure, the less resistance the symptoms have, the harder the cure. -/datum/disease/advance/proc/GenerateCure(var/list/properties = list()) +/datum/disease/advance/proc/GenerateCure(list/properties = list()) if(properties && properties.len) var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) //world << "Res = [res]" @@ -266,7 +266,7 @@ var/list/advance_cures = list( return // Randomly generate a symptom, has a chance to lose or gain a symptom. -/datum/disease/advance/proc/Evolve(var/min_level, var/max_level) +/datum/disease/advance/proc/Evolve(min_level, max_level) var/s = safepick(GenerateSymptoms(min_level, max_level, 1)) if(s) AddSymptom(s) @@ -283,7 +283,7 @@ var/list/advance_cures = list( return // Name the disease. -/datum/disease/advance/proc/AssignName(var/name = "Unknown") +/datum/disease/advance/proc/AssignName(name = "Unknown") src.name = name return @@ -301,7 +301,7 @@ var/list/advance_cures = list( // Add a symptom, if it is over the limit (with a small chance to be able to go over) // we take a random symptom away and add the new one. -/datum/disease/advance/proc/AddSymptom(var/datum/symptom/S) +/datum/disease/advance/proc/AddSymptom(datum/symptom/S) if(HasSymptom(S)) return @@ -314,7 +314,7 @@ var/list/advance_cures = list( return // Simply removes the symptom. -/datum/disease/advance/proc/RemoveSymptom(var/datum/symptom/S) +/datum/disease/advance/proc/RemoveSymptom(datum/symptom/S) symptoms -= S return @@ -357,7 +357,7 @@ var/list/advance_cures = list( to_return.Refresh(1) return to_return -/proc/SetViruses(var/datum/reagent/R, var/list/data) +/proc/SetViruses(datum/reagent/R, list/data) if(data) var/list/preserve = list() if(istype(data) && data["viruses"]) @@ -367,7 +367,7 @@ var/list/advance_cures = list( if(preserve.len) R.data["viruses"] = preserve -/proc/AdminCreateVirus(var/client/user) +/proc/AdminCreateVirus(client/user) if(!user) return diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm index 44a81c6a884..fc16a9474af 100644 --- a/code/datums/diseases/advance/symptoms/beard.dm +++ b/code/datums/diseases/advance/symptoms/beard.dm @@ -24,7 +24,7 @@ BONUS level = 4 severity = 1 -/datum/symptom/beard/Activate(var/datum/disease/advance/A) +/datum/symptom/beard/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm index e068adf4835..de198cab81a 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -25,7 +25,7 @@ Bonus level = 3 severity = 3 -/datum/symptom/choking/Activate(var/datum/disease/advance/A) +/datum/symptom/choking/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm index 0fbc941a32f..8f48fdab86a 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -26,7 +26,7 @@ Bonus severity = 2 -/datum/symptom/confusion/Activate(var/datum/disease/advance/A) +/datum/symptom/confusion/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index 2c50271aa92..5ae2c47aeb4 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -25,7 +25,7 @@ BONUS level = 1 severity = 1 -/datum/symptom/cough/Activate(var/datum/disease/advance/A) +/datum/symptom/cough/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/damage_converter.dm b/code/datums/diseases/advance/symptoms/damage_converter.dm index 116372f536a..18396fbfec4 100644 --- a/code/datums/diseases/advance/symptoms/damage_converter.dm +++ b/code/datums/diseases/advance/symptoms/damage_converter.dm @@ -24,7 +24,7 @@ Bonus transmittable = -2 level = 4 -/datum/symptom/damage_converter/Activate(var/datum/disease/advance/A) +/datum/symptom/damage_converter/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 10)) var/mob/living/M = A.affected_mob @@ -33,7 +33,7 @@ Bonus Convert(M) return -/datum/symptom/damage_converter/proc/Convert(var/mob/living/M) +/datum/symptom/damage_converter/proc/Convert(mob/living/M) var/get_damage = rand(1, 2) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index c615d644b51..15ffc133b23 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -25,7 +25,7 @@ Bonus level = 4 severity = 3 -/datum/symptom/deafness/Activate(var/datum/disease/advance/A) +/datum/symptom/deafness/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index a7109a316ac..7642fbb78bc 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -25,7 +25,7 @@ Bonus level = 4 severity = 2 -/datum/symptom/dizzy/Activate(var/datum/disease/advance/A) +/datum/symptom/dizzy/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm index 749bab09fea..4ded231801a 100644 --- a/code/datums/diseases/advance/symptoms/fever.dm +++ b/code/datums/diseases/advance/symptoms/fever.dm @@ -25,7 +25,7 @@ Bonus level = 2 severity = 2 -/datum/symptom/fever/Activate(var/datum/disease/advance/A) +/datum/symptom/fever/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index bc63c170960..254918ccda1 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -25,7 +25,7 @@ Bonus level = 6 severity = 5 -/datum/symptom/fire/Activate(var/datum/disease/advance/A) +/datum/symptom/fire/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 8c71d05f2bd..086c349c875 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -25,7 +25,7 @@ Bonus level = 6 severity = 5 -/datum/symptom/flesh_eating/Activate(var/datum/disease/advance/A) +/datum/symptom/flesh_eating/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm index 7720af0449c..cb730215ee9 100644 --- a/code/datums/diseases/advance/symptoms/genetics.dm +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -27,7 +27,7 @@ Bonus var/list/possible_mutations var/archived_dna = null -/datum/symptom/genetic_mutation/Activate(var/datum/disease/advance/A) +/datum/symptom/genetic_mutation/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 5)) // 15% chance var/mob/living/carbon/M = A.affected_mob @@ -40,7 +40,7 @@ Bonus return // Archive their DNA before they were infected. -/datum/symptom/genetic_mutation/Start(var/datum/disease/advance/A) +/datum/symptom/genetic_mutation/Start(datum/disease/advance/A) possible_mutations = (bad_mutations | not_good_mutations) - mutations_list[RACEMUT] var/mob/living/carbon/M = A.affected_mob if(M) @@ -49,7 +49,7 @@ Bonus archived_dna = M.dna.struc_enzymes // Give them back their old DNA when cured. -/datum/symptom/genetic_mutation/End(var/datum/disease/advance/A) +/datum/symptom/genetic_mutation/End(datum/disease/advance/A) var/mob/living/carbon/M = A.affected_mob if(M && archived_dna) if(!check_dna_integrity(M)) @@ -83,6 +83,6 @@ Bonus level = 6 severity = 0 -/datum/symptom/genetic_mutation/powers/Start(var/datum/disease/advance/A) +/datum/symptom/genetic_mutation/powers/Start(datum/disease/advance/A) ..() possible_mutations = good_mutations \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index 4854b8d3261..dce78e8fee7 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -25,7 +25,7 @@ Bonus level = 5 severity = 3 -/datum/symptom/hallucigen/Activate(var/datum/disease/advance/A) +/datum/symptom/hallucigen/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index abbb0c44f9b..31f00342ac6 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -26,7 +26,7 @@ BONUS level = 1 severity = 1 -/datum/symptom/headache/Activate(var/datum/disease/advance/A) +/datum/symptom/headache/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 16e16c914a6..ec88c3011ba 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -24,7 +24,7 @@ Bonus transmittable = -4 level = 6 -/datum/symptom/heal/Activate(var/datum/disease/advance/A) +/datum/symptom/heal/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 10)) var/mob/living/M = A.affected_mob @@ -33,7 +33,7 @@ Bonus Heal(M, A) return -/datum/symptom/heal/proc/Heal(var/mob/living/M, var/datum/disease/advance/A) +/datum/symptom/heal/proc/Heal(mob/living/M, datum/disease/advance/A) var/get_damage = rand(8, 14) M.adjustToxLoss(-get_damage) @@ -66,7 +66,7 @@ Bonus level = 3 var/list/cured_diseases = list() -/datum/symptom/heal/metabolism/Heal(var/mob/living/M, var/datum/disease/advance/A) +/datum/symptom/heal/metabolism/Heal(mob/living/M, datum/disease/advance/A) var/cured = 0 for(var/datum/disease/D in M.viruses) if(D != A) @@ -76,7 +76,7 @@ Bonus if(cured) M << "You feel much better." -/datum/symptom/heal/metabolism/End(var/datum/disease/advance/A) +/datum/symptom/heal/metabolism/End(datum/disease/advance/A) // Remove all the diseases we cured. var/mob/living/M = A.affected_mob if(istype(M)) @@ -113,10 +113,10 @@ Bonus level = 3 var/longevity = 30 -/datum/symptom/heal/longevity/Heal(var/mob/living/M, var/datum/disease/advance/A) +/datum/symptom/heal/longevity/Heal(mob/living/M, datum/disease/advance/A) longevity -= 1 if(!longevity) A.cure() -/datum/symptom/heal/longevity/Start(var/datum/disease/advance/A) +/datum/symptom/heal/longevity/Start(datum/disease/advance/A) longevity = rand(initial(longevity) - 5, initial(longevity) + 5) diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index e7302c4345a..999b26a8717 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -26,7 +26,7 @@ BONUS level = 1 severity = 1 -/datum/symptom/itching/Activate(var/datum/disease/advance/A) +/datum/symptom/itching/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index b82bdfbc9a1..e74c112383b 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -24,7 +24,7 @@ Bonus transmittable = -4 level = 6 -/datum/symptom/oxygen/Activate(var/datum/disease/advance/A) +/datum/symptom/oxygen/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 5)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index d1c2317b868..6f0a2ba9978 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -24,7 +24,7 @@ BONUS level = 4 severity = 1 -/datum/symptom/shedding/Activate(var/datum/disease/advance/A) +/datum/symptom/shedding/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm index ac13329d12c..494b99bfe88 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -25,7 +25,7 @@ Bonus level = 2 severity = 2 -/datum/symptom/shivering/Activate(var/datum/disease/advance/A) +/datum/symptom/shivering/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index 22d3386ef63..03eaadc2db1 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -24,7 +24,7 @@ BONUS level = 4 severity = 1 -/datum/symptom/vitiligo/Activate(var/datum/disease/advance/A) +/datum/symptom/vitiligo/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob @@ -68,7 +68,7 @@ BONUS level = 4 severity = 1 -/datum/symptom/revitiligo/Activate(var/datum/disease/advance/A) +/datum/symptom/revitiligo/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm index bbf8cafaf52..b20c5256dbe 100644 --- a/code/datums/diseases/advance/symptoms/sneeze.dm +++ b/code/datums/diseases/advance/symptoms/sneeze.dm @@ -26,7 +26,7 @@ Bonus level = 1 severity = 1 -/datum/symptom/sneeze/Activate(var/datum/disease/advance/A) +/datum/symptom/sneeze/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm index 0f5729e9842..c5796a3f6d3 100644 --- a/code/datums/diseases/advance/symptoms/stimulant.dm +++ b/code/datums/diseases/advance/symptoms/stimulant.dm @@ -24,7 +24,7 @@ Bonus transmittable = -4 level = 3 -/datum/symptom/stimulant/Activate(var/datum/disease/advance/A) +/datum/symptom/stimulant/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 10)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index 4b06cb505db..bbdeef487a4 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -28,13 +28,13 @@ var/global/const/SYMPTOM_ACTIVATION_PROB = 3 CRASH("We couldn't assign an ID!") // Called when processing of the advance disease, which holds this symptom, starts. -/datum/symptom/proc/Start(var/datum/disease/advance/A) +/datum/symptom/proc/Start(datum/disease/advance/A) return // Called when the advance disease is going to be deleted or when the advance disease stops processing. -/datum/symptom/proc/End(var/datum/disease/advance/A) +/datum/symptom/proc/End(datum/disease/advance/A) return -/datum/symptom/proc/Activate(var/datum/disease/advance/A) +/datum/symptom/proc/Activate(datum/disease/advance/A) return diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index b63a4ee729f..ea3bb05abd9 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -25,7 +25,7 @@ Bonus level = 5 severity = 4 -/datum/symptom/visionloss/Activate(var/datum/disease/advance/A) +/datum/symptom/visionloss/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob @@ -75,7 +75,7 @@ Bonus transmittable = -4 level = 4 -/datum/symptom/visionaid/Activate(var/datum/disease/advance/A) +/datum/symptom/visionaid/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 5)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index ccc39b839f7..1b56dbaa334 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -25,7 +25,7 @@ Bonus level = 6 severity = 2 -/datum/symptom/voice_change/Activate(var/datum/disease/advance/A) +/datum/symptom/voice_change/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) @@ -40,7 +40,7 @@ Bonus return -/datum/symptom/voice_change/End(var/datum/disease/advance/A) +/datum/symptom/voice_change/End(datum/disease/advance/A) ..() if(ishuman(A.affected_mob)) var/mob/living/carbon/human/H = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm index 55fd92863e0..677e2f4b593 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -29,7 +29,7 @@ Bonus level = 3 severity = 4 -/datum/symptom/vomit/Activate(var/datum/disease/advance/A) +/datum/symptom/vomit/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB / 2)) var/mob/living/M = A.affected_mob @@ -41,7 +41,7 @@ Bonus return -/datum/symptom/vomit/proc/Vomit(var/mob/living/M) +/datum/symptom/vomit/proc/Vomit(mob/living/M) M.visible_message("[M] vomits on the floor!", \ "You throw up on the floor!") @@ -82,7 +82,7 @@ Bonus level = 4 severity = 5 -/datum/symptom/vomit/blood/Vomit(var/mob/living/M) +/datum/symptom/vomit/blood/Vomit(mob/living/M) M.Stun(1) M.visible_message("[M] vomits on the floor!", \ diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm index f616545b057..eef76300e7b 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -25,7 +25,7 @@ Bonus level = 4 severity = 1 -/datum/symptom/weight_gain/Activate(var/datum/disease/advance/A) +/datum/symptom/weight_gain/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob @@ -67,7 +67,7 @@ Bonus level = 3 severity = 1 -/datum/symptom/weight_loss/Activate(var/datum/disease/advance/A) +/datum/symptom/weight_loss/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob @@ -109,7 +109,7 @@ Bonus transmittable = -2 level = 4 -/datum/symptom/weight_even/Activate(var/datum/disease/advance/A) +/datum/symptom/weight_even/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/youth.dm b/code/datums/diseases/advance/symptoms/youth.dm index bc9cb93355f..6d90d2b8cdc 100644 --- a/code/datums/diseases/advance/symptoms/youth.dm +++ b/code/datums/diseases/advance/symptoms/youth.dm @@ -24,7 +24,7 @@ BONUS transmittable = -4 level = 5 -/datum/symptom/youth/Activate(var/datum/disease/advance/A) +/datum/symptom/youth/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 2)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index dc57ec59822..93fd9239761 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -35,7 +35,7 @@ if(5) do_disease_transformation(affected_mob) -/datum/disease/transformation/proc/do_disease_transformation(var/mob/living/affected_mob) +/datum/disease/transformation/proc/do_disease_transformation(mob/living/affected_mob) if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD) if(stage5) affected_mob << pick(stage5) @@ -91,7 +91,7 @@ "You have a craving for bananas.", "Your mind feels clouded.") stage5 = list("You feel like monkeying around.") -/datum/disease/transformation/jungle_fever/do_disease_transformation(var/mob/living/carbon/affected_mob) +/datum/disease/transformation/jungle_fever/do_disease_transformation(mob/living/carbon/affected_mob) if(!ismonkey(affected_mob)) ticker.mode.add_monkey(affected_mob.mind) affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index d2697c0f09f..42c277ec891 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -54,7 +54,7 @@ STI KALY - blind -/datum/disease/wizarditis/proc/spawn_wizard_clothes(var/chance = 0) +/datum/disease/wizarditis/proc/spawn_wizard_clothes(chance = 0) if(istype(affected_mob, /mob/living/carbon/human)) var/mob/living/carbon/human/H = affected_mob if(prob(chance)) diff --git a/code/datums/gas_mixture.dm b/code/datums/gas_mixture.dm index 5a66e77b413..618804418cb 100644 --- a/code/datums/gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -548,7 +548,7 @@ What are the archived variables for? return 1 -/datum/gas_mixture/share(datum/gas_mixture/sharer, var/atmos_adjacent_turfs = 4) +/datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4) if(!sharer) return 0 var/delta_oxygen = QUANTIZE(oxygen_archived - sharer.oxygen_archived)/(atmos_adjacent_turfs+1) var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - sharer.carbon_dioxide_archived)/(atmos_adjacent_turfs+1) @@ -677,7 +677,7 @@ What are the archived variables for? var/delta_pressure = temperature_archived*(total_moles() + moved_moles) - sharer.temperature_archived*(sharer.total_moles() - moved_moles) return delta_pressure*R_IDEAL_GAS_EQUATION/volume -/datum/gas_mixture/mimic(turf/model, border_multiplier, var/atmos_adjacent_turfs = 4) +/datum/gas_mixture/mimic(turf/model, border_multiplier, atmos_adjacent_turfs = 4) var/delta_oxygen = QUANTIZE(oxygen_archived - model.oxygen)/(atmos_adjacent_turfs+1) var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - model.carbon_dioxide)/(atmos_adjacent_turfs+1) var/delta_nitrogen = QUANTIZE(nitrogen_archived - model.nitrogen)/(atmos_adjacent_turfs+1) @@ -961,13 +961,13 @@ What are the archived variables for? //Does handle trace gases! -/datum/gas_mixture/proc/get_breath_partial_pressure(var/gas_pressure) +/datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure) var/breath_pressure = (total_moles()*R_IDEAL_GAS_EQUATION*temperature)/BREATH_VOLUME return (gas_pressure/total_moles())*breath_pressure //Reverse of the above -/datum/gas_mixture/proc/get_true_breath_pressure(var/breath_pp) +/datum/gas_mixture/proc/get_true_breath_pressure(breath_pp) var/breath_pressure = (total_moles()/R_IDEAL_GAS_EQUATION/temperature)*BREATH_VOLUME return (breath_pp/breath_pressure*total_moles()) diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index 13014725d0c..af53f681059 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -23,10 +23,10 @@ set_desc(steps.len) return -/datum/construction/proc/action(atom/used_atom,mob/user as mob) +/datum/construction/proc/action(atom/used_atom,mob/user) return -/datum/construction/proc/check_step(atom/used_atom,mob/user as mob) //check last step only +/datum/construction/proc/check_step(atom/used_atom,mob/user) //check last step only var/valid_step = is_right_key(used_atom) if(valid_step) if(custom_action(valid_step, used_atom, user)) @@ -43,7 +43,7 @@ /datum/construction/proc/custom_action(step, used_atom, user) return 1 -/datum/construction/proc/check_all_steps(atom/used_atom,mob/user as mob) //check all steps, remove matching one. +/datum/construction/proc/check_all_steps(atom/used_atom,mob/user) //check all steps, remove matching one. for(var/i=1;i<=steps.len;i++) var/list/L = steps[i]; if(istype(used_atom, L["key"])) @@ -91,7 +91,7 @@ return BACKWARD //to the last step -> backwards return 0 -/datum/construction/reversible/check_step(atom/used_atom,mob/user as mob) +/datum/construction/reversible/check_step(atom/used_atom,mob/user) var/diff = is_right_key(used_atom) if(diff) if(custom_action(index, diff, used_atom, user)) diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 259d148135f..f17de6bbbcb 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -18,35 +18,35 @@ var/datum/atom_hud/huds = list( \ var/list/mob/hudusers = list() //list with all mobs who can see the hud var/list/hud_icons = list() //these will be the indexes for the atom's hud_list -/datum/atom_hud/proc/remove_hud_from(var/mob/M) +/datum/atom_hud/proc/remove_hud_from(mob/M) if(src in M.permanent_huds) return for(var/atom/A in hudatoms) remove_from_single_hud(M, A) hudusers -= M -/datum/atom_hud/proc/remove_from_hud(var/atom/A) +/datum/atom_hud/proc/remove_from_hud(atom/A) for(var/mob/M in hudusers) remove_from_single_hud(M, A) hudatoms -= A -/datum/atom_hud/proc/remove_from_single_hud(var/mob/M, var/atom/A) //unsafe, no sanity apart from client +/datum/atom_hud/proc/remove_from_single_hud(mob/M, atom/A) //unsafe, no sanity apart from client if(!M.client) return for(var/i in hud_icons) M.client.images -= A.hud_list[i] -/datum/atom_hud/proc/add_hud_to(var/mob/M) +/datum/atom_hud/proc/add_hud_to(mob/M) hudusers |= M for(var/atom/A in hudatoms) add_to_single_hud(M, A) -/datum/atom_hud/proc/add_to_hud(var/atom/A) +/datum/atom_hud/proc/add_to_hud(atom/A) hudatoms |= A for(var/mob/M in hudusers) add_to_single_hud(M, A) -/datum/atom_hud/proc/add_to_single_hud(var/mob/M, var/atom/A) //unsafe, no sanity apart from client +/datum/atom_hud/proc/add_to_single_hud(mob/M, atom/A) //unsafe, no sanity apart from client if(!M.client) return for(var/i in hud_icons) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 0e86b40443d..f54df12a0c4 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -6,16 +6,16 @@ var/temporary = 0 var/datum/martial_art/base = null // The permanent style -/datum/martial_art/proc/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return 0 -/datum/martial_art/proc/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/proc/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return 0 -/datum/martial_art/proc/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/proc/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return 0 -/datum/martial_art/proc/add_to_streak(var/element,var/mob/living/carbon/human/D) +/datum/martial_art/proc/add_to_streak(element,mob/living/carbon/human/D) if(D != current_target) current_target = D streak = "" @@ -24,7 +24,7 @@ streak = copytext(streak,2) return -/datum/martial_art/proc/basic_hit(var/mob/living/carbon/human/A,var/mob/living/carbon/human/D) +/datum/martial_art/proc/basic_hit(mob/living/carbon/human/A,mob/living/carbon/human/D) A.do_attack_animation(D) var/damage = rand(0,9) @@ -71,7 +71,7 @@ D.forcesay(hit_appends) return 1 -/datum/martial_art/proc/teach(var/mob/living/carbon/human/H,var/make_temporary=0) +/datum/martial_art/proc/teach(mob/living/carbon/human/H,make_temporary=0) if(make_temporary) temporary = 1 if(H.martial_art && H.martial_art.temporary) @@ -82,7 +82,7 @@ return H.martial_art = src -/datum/martial_art/proc/remove(var/mob/living/carbon/human/H) +/datum/martial_art/proc/remove(mob/living/carbon/human/H) if(H.martial_art != src) return H.martial_art = base @@ -90,15 +90,15 @@ /datum/martial_art/boxing name = "Boxing" -/datum/martial_art/boxing/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) A << "Can't disarm while boxing!" return 1 -/datum/martial_art/boxing/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/boxing/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) A << "Can't grab while boxing!" return 1 -/datum/martial_art/boxing/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/boxing/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) A.do_attack_animation(D) @@ -143,7 +143,7 @@ /datum/martial_art/wrestling name = "Wrestling" -/datum/martial_art/wrestling/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/wrestling/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) D.grabbedby(A,1) var/obj/item/weapon/grab/G = A.get_active_hand() if(G && prob(50)) @@ -156,7 +156,7 @@ return 1 -/datum/martial_art/wrestling/proc/Suplex(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/wrestling/proc/Suplex(mob/living/carbon/human/A, mob/living/carbon/human/D) D.visible_message("[A] suplexes [D]!", \ "[A] suplexes [D]!") @@ -174,7 +174,7 @@ A.apply_effect(4, WEAKEN, armor_block) return -/datum/martial_art/wrestling/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/wrestling/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) if(istype(A.get_inactive_hand(),/obj/item/weapon/grab)) var/obj/item/weapon/grab/G = A.get_inactive_hand() if(G.affecting == D) @@ -183,7 +183,7 @@ harm_act(A,D) return 1 -/datum/martial_art/wrestling/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/wrestling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) D.grabbedby(A,1) D.visible_message("[A] holds [D] down!", \ "[A] holds [D] down!") @@ -199,7 +199,7 @@ /datum/martial_art/plasma_fist name = "Plasma Fist" -/datum/martial_art/plasma_fist/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak,TORNADO_COMBO)) streak = "" Tornado(A,D) @@ -214,7 +214,7 @@ return 1 return 0 -/datum/martial_art/plasma_fist/proc/Tornado(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/proc/Tornado(mob/living/carbon/human/A, mob/living/carbon/human/D) A.say("TORNADO SWEEP!") spawn(0) for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH)) @@ -228,7 +228,7 @@ R.cast(turfs) return -/datum/martial_art/plasma_fist/proc/Throwback(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/proc/Throwback(mob/living/carbon/human/A, mob/living/carbon/human/D) D.visible_message("[A] has hit [D] with Plasma Punch!", \ "[A] has hit [D] with Plasma Punch!") playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) @@ -237,7 +237,7 @@ A.say("HYAH!") return -/datum/martial_art/plasma_fist/proc/Plasma(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/proc/Plasma(mob/living/carbon/human/A, mob/living/carbon/human/D) A.do_attack_animation(D) playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) A.say("PLASMA FIST!") @@ -251,21 +251,21 @@ D.gib() return -/datum/martial_art/plasma_fist/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("H") if(check_streak(A,D)) return 1 basic_hit(A,D) return 1 -/datum/martial_art/plasma_fist/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("D") if(check_streak(A,D)) return 1 basic_hit(A,D) return 1 -/datum/martial_art/plasma_fist/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("G") if(check_streak(A,D)) return 1 @@ -282,7 +282,7 @@ /datum/martial_art/the_sleeping_carp name = "The Sleeping Carp" -/datum/martial_art/the_sleeping_carp/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak,WRIST_WRENCH_COMBO)) streak = "" wristWrench(A,D) @@ -305,7 +305,7 @@ return 1 return 0 -/datum/martial_art/the_sleeping_carp/proc/wristWrench(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/wristWrench(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.stat && !D.stunned && !D.weakened) D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!", \ "[A] grabs your wrist and violently wrenches it to the side!") @@ -317,7 +317,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/proc/backKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/backKick(mob/living/carbon/human/A, mob/living/carbon/human/D) if(A.dir == D.dir && !D.stat && !D.weakened) D.visible_message("[A] kicks [D] in the back!", \ "[A] kicks you in the back, making you stumble and fall!") @@ -327,7 +327,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/proc/kneeStomach(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/kneeStomach(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.stat && !D.weakened) D.visible_message("[A] knees [D] in the stomach!", \ "[A] winds you with a knee in the stomach!") @@ -338,7 +338,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/proc/headKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/headKick(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.stat && !D.weakened) D.visible_message("[A] kicks [D] in the head!", \ "[A] kicks you in the jaw!") @@ -348,7 +348,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/proc/elbowDrop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/elbowDrop(mob/living/carbon/human/A, mob/living/carbon/human/D) if(D.weakened || D.resting || D.stat) D.visible_message("[A] elbow drops [D]!", \ "[A] piledrives you with their elbow!") @@ -359,7 +359,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("G") if(check_streak(A,D)) return 1 @@ -368,7 +368,7 @@ if(G) G.state = GRAB_AGGRESSIVE //Instant aggressive grab -/datum/martial_art/the_sleeping_carp/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("H") if(check_streak(A,D)) return 1 @@ -379,7 +379,7 @@ return 1 -/datum/martial_art/the_sleeping_carp/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("D") if(check_streak(A,D)) return 1 @@ -445,7 +445,7 @@ icon_state ="scroll2" var/used = 0 -/obj/item/weapon/plasma_fist_scroll/attack_self(mob/user as mob) +/obj/item/weapon/plasma_fist_scroll/attack_self(mob/user) if(!ishuman(user)) return if(!used) @@ -464,7 +464,7 @@ icon = 'icons/obj/wizard.dmi' icon_state = "scroll2" -/obj/item/weapon/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user as mob) +/obj/item/weapon/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user) if(!istype(user) || !user) return user << "You begin to read the scroll..." diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 4871b068ad3..7141e73825e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1261,7 +1261,7 @@ ticker.mode.finalize_traitor(src) ticker.mode.greet_traitor(src) -/datum/mind/proc/make_Nuke(var/turf/spawnloc,var/nuke_code,var/leader=0) +/datum/mind/proc/make_Nuke(turf/spawnloc,nuke_code,leader=0) if(!(src in ticker.mode.syndicates)) ticker.mode.syndicates += src ticker.mode.update_synd_icons_added(src) @@ -1385,7 +1385,7 @@ fail |= !ticker.mode.equip_revolutionary(current) -/datum/mind/proc/make_Gang(var/datum/gang/G) +/datum/mind/proc/make_Gang(datum/gang/G) special_role = "[G.name] Gang Boss" G.bosses += src gang_datum = G @@ -1447,7 +1447,7 @@ -/datum/mind/proc/AddSpell(var/obj/effect/proc_holder/spell/spell) +/datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/spell) spell_list += spell if(!spell.action) spell.action = new/datum/action/spell_action @@ -1458,7 +1458,7 @@ spell.action.background_icon_state = spell.action_background_icon_state spell.action.Grant(current) return -/datum/mind/proc/transfer_actions(var/mob/living/new_character) +/datum/mind/proc/transfer_actions(mob/living/new_character) if(current && current.actions) for(var/datum/action/A in current.actions) A.Grant(new_character) diff --git a/code/datums/modules.dm b/code/datums/modules.dm index 896d920f994..e52a644d157 100644 --- a/code/datums/modules.dm +++ b/code/datums/modules.dm @@ -30,14 +30,14 @@ var/list/modules = list( // global associative list status = needed installed = needed -/datum/moduletypes/proc/addmod(var/type, var/modtextlist) +/datum/moduletypes/proc/addmod(type, modtextlist) modules += type // index by type text modules[type] = modtextlist -/datum/moduletypes/proc/inmodlist(var/type) +/datum/moduletypes/proc/inmodlist(type) return ("[type]" in modules) -/datum/moduletypes/proc/getbitmask(var/type) +/datum/moduletypes/proc/getbitmask(type) var/count = modcount["[type]"] if(count) return 2**count-1 diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm index c47f4771b77..82fa9d7e217 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations.dm @@ -86,7 +86,7 @@ return 0 return 1 -/datum/mutation/human/proc/say_mod(var/message) +/datum/mutation/human/proc/say_mod(message) if(message) return message @@ -130,7 +130,7 @@ return owner.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH -/datum/mutation/human/hulk/say_mod(var/message) +/datum/mutation/human/hulk/say_mod(message) if(message) message = "[uppertext(replacetext(message, ".", "!"))]!!" return message @@ -225,7 +225,7 @@ quality = NEGATIVE text_gain_indication = "You feel strange." -/datum/mutation/human/bad_dna/on_acquiring(var/mob/living/carbon/human/owner) +/datum/mutation/human/bad_dna/on_acquiring(mob/living/carbon/human/owner) owner << text_gain_indication var/mob/new_mob if(prob(95)) @@ -426,7 +426,7 @@ text_gain_indication = "You feel so happy. Nothing can be wrong with anything. :)" text_lose_indication = "Everything is terrible again. :(" -/datum/mutation/human/smile/say_mod(var/message) +/datum/mutation/human/smile/say_mod(message) if(message) message = " [message] " //Time for a friendly game of SS13 @@ -481,7 +481,7 @@ text_gain_indication = "You can't seem to form any coherent thoughts!" text_lose_indication = "Your mind feels more clear." -/datum/mutation/human/unintelligable/say_mod(var/message) +/datum/mutation/human/unintelligable/say_mod(message) if(message) var/prefix=copytext(message,1,2) if(prefix == ";") @@ -512,7 +512,7 @@ text_gain_indication = "You feel Swedish, however that works." text_lose_indication = "The feeling of Swedishness passes." -/datum/mutation/human/swedish/say_mod(var/message) +/datum/mutation/human/swedish/say_mod(message) if(message) message = replacetext(message,"w","v") if(prob(30)) @@ -525,7 +525,7 @@ text_gain_indication = "Ye feel like a reet prat like, innit?" text_lose_indication = "You no longer feel like being rude and sassy." -/datum/mutation/human/chav/say_mod(var/message) +/datum/mutation/human/chav/say_mod(message) if(message) message = " [message] " message = replacetext(message," looking at "," gawpin' at ") @@ -568,7 +568,7 @@ if(prob(15)) owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!") -/datum/mutation/human/elvis/say_mod(var/message) +/datum/mutation/human/elvis/say_mod(message) if(message) message = " [message] " message = replacetext(message," i'm not "," I aint ") diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index 16a2d522a6c..d3085976a18 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -40,7 +40,7 @@ var/time = 100 // 1/10 part of second -/datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents) //1=precisely, 0=insufficiently, -1=superfluous +/datum/recipe/proc/check_reagents(datum/reagents/avail_reagents) //1=precisely, 0=insufficiently, -1=superfluous . = 1 for (var/r_r in reagents) var/aval_r_amnt = avail_reagents.get_reagent_amount(r_r) @@ -53,7 +53,7 @@ return -1 return . -/datum/recipe/proc/check_items(var/obj/container as obj) //1=precisely, 0=insufficiently, -1=superfluous +/datum/recipe/proc/check_items(obj/container) //1=precisely, 0=insufficiently, -1=superfluous if (!items) if (locate(/obj/) in container) return -1 @@ -75,7 +75,7 @@ return . //general version -/datum/recipe/proc/make(var/obj/container as obj) +/datum/recipe/proc/make(obj/container) var/obj/result_obj = new result(container) for (var/obj/O in (container.contents-result_obj)) O.reagents.trans_to(result_obj, O.reagents.total_volume) @@ -84,7 +84,7 @@ return result_obj // food-related -/datum/recipe/proc/make_food(var/obj/container as obj) +/datum/recipe/proc/make_food(obj/container) var/obj/result_obj = new result(container) for (var/obj/O in (container.contents-result_obj)) if (O.reagents) @@ -95,7 +95,7 @@ container.reagents.clear_reagents() return result_obj -/proc/select_recipe(var/list/datum/recipe/avaiable_recipes, var/obj/obj as obj, var/exact = 1 as num) +/proc/select_recipe(list/datum/recipe/avaiable_recipes, obj/obj, exact = 1 as num) if (!exact) exact = -1 var/list/datum/recipe/possible_recipes = new diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index 470b22f86d8..4f75e19ea40 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -94,17 +94,17 @@ jaunt_duration = 50 //in deciseconds centcom_cancast = 0 //Stop people from getting to centcom -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(atom/movable/overlay/animation, mob/living/target) animation.icon_state = "phase_shift" animation.dir = target.dir flick("phase_shift",animation) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(atom/movable/overlay/animation, mob/living/target) animation.icon_state = "phase_shift2" animation.dir = target.dir flick("phase_shift2",animation) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_steam(var/mobloc) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_steam(mobloc) return /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index c8934867790..6f5247e8e92 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -60,16 +60,16 @@ qdel(animation) qdel(holder) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(atom/movable/overlay/animation, mob/living/target) animation.icon_state = "liquify" flick("liquify",animation) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_reappear(atom/movable/overlay/animation, mob/living/target) flick("reappear",animation) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(var/mobloc) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc) var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread() steam.set_up(10, 0, mobloc) steam.start() diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index a60c3c0fd9d..98d5944d5a3 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -297,7 +297,7 @@ action_icon_state = "fireball" sound = "sound/magic/Fireball.ogg" -/obj/effect/proc_holder/spell/turf/fireball/cast(var/turf/T) +/obj/effect/proc_holder/spell/turf/fireball/cast(turf/T) explosion(T, -1, 0, 2, 3, 0, flame_range = 2) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 5253e7dc68a..5d0e6fb95a0 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -17,7 +17,7 @@ var/const/supply_misc = 8 var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engineer,supply_medical,supply_science,supply_organic,supply_materials,supply_misc) -/proc/get_supply_group_name(var/cat) +/proc/get_supply_group_name(cat) switch(cat) if(1) return "Emergency" diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 4d7cb7b8469..739a747f967 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -49,14 +49,14 @@ var/list/uplink_items = list() var/list/excludefrom = list() //Empty list does nothing. Place the name of gamemode you don't want this item to be available in here. This is so you dont have to list EVERY mode to exclude something. var/surplus = 100 //Chance of being included in the surplus crate (when pick() selects it) -/datum/uplink_item/proc/spawn_item(var/turf/loc, var/obj/item/device/uplink/U) +/datum/uplink_item/proc/spawn_item(turf/loc, obj/item/device/uplink/U) if(item) U.uses -= max(cost, 0) U.used_TC += cost feedback_add_details("traitor_uplink_items_bought", "[item]") return new item(loc) -/datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/proc/buy(obj/item/device/uplink/U, mob/user) ..() if(!istype(U)) @@ -775,7 +775,7 @@ var/list/uplink_items = list() item = /obj/item/weapon/storage/box/syndicate cost = 0 -/datum/uplink_item/badass/random/spawn_item(var/turf/loc, var/obj/item/device/uplink/U) +/datum/uplink_item/badass/random/spawn_item(turf/loc, obj/item/device/uplink/U) var/list/buyable_items = get_uplink_items() var/list/possible_items = list() diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index a51b0eadb08..96d55e05518 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -118,7 +118,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048 A.update_icon() -/datum/wires/airlock/UpdatePulsed(var/index) +/datum/wires/airlock/UpdatePulsed(index) var/obj/machinery/door/airlock/A = holder switch(index) diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index e2fd697198d..32290d20bb0 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -9,7 +9,7 @@ var/const/AALARM_WIRE_AI_CONTROL = 8 var/const/AALARM_WIRE_AALARM = 16 -/datum/wires/alarm/CanUse(var/mob/living/L) +/datum/wires/alarm/CanUse(mob/living/L) var/obj/machinery/alarm/A = holder if(A.panel_open && A.buildstage == 2) return 1 @@ -20,7 +20,7 @@ var/const/AALARM_WIRE_AALARM = 16 . += ..() . += text("
      \n[(A.locked ? "The Air Alarm is locked." : "The Air Alarm is unlocked.")]
      \n[((A.shorted || (A.stat & (NOPOWER|BROKEN))) ? "The Air Alarm is offline." : "The Air Alarm is working properly!")]
      \n[(A.aidisabled ? "The 'AI control allowed' light is off." : "The 'AI control allowed' light is on.")]") -/datum/wires/alarm/UpdateCut(var/index, var/mended) +/datum/wires/alarm/UpdateCut(index, mended) var/obj/machinery/alarm/A = holder switch(index) if(AALARM_WIRE_IDSCAN) @@ -50,7 +50,7 @@ var/const/AALARM_WIRE_AALARM = 16 A.post_alert(2) A.update_icon() -/datum/wires/alarm/UpdatePulsed(var/index) +/datum/wires/alarm/UpdatePulsed(index) var/obj/machinery/alarm/A = holder switch(index) if(AALARM_WIRE_IDSCAN) diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm index a7b7934e399..02303e39044 100644 --- a/code/datums/wires/apc.dm +++ b/code/datums/wires/apc.dm @@ -13,13 +13,13 @@ var/const/APC_WIRE_AI_CONTROL = 8 . += text("
      \n[(A.locked ? "The APC is locked." : "The APC is unlocked.")]
      \n[(A.shorted ? "The APCs power has been shorted." : "The APC is working properly!")]
      \n[(A.aidisabled ? "The 'AI control allowed' light is off." : "The 'AI control allowed' light is on.")]") -/datum/wires/apc/CanUse(var/mob/living/L) +/datum/wires/apc/CanUse(mob/living/L) var/obj/machinery/power/apc/A = holder if(A.wiresexposed) return 1 return 0 -/datum/wires/apc/UpdatePulsed(var/index) +/datum/wires/apc/UpdatePulsed(index) var/obj/machinery/power/apc/A = holder @@ -53,7 +53,7 @@ var/const/APC_WIRE_AI_CONTROL = 8 A.updateDialog() -/datum/wires/apc/UpdateCut(var/index, var/mended) +/datum/wires/apc/UpdateCut(index, mended) var/obj/machinery/power/apc/A = holder switch(index) diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm index 0fe2c9f2fcf..c6487f4cefb 100644 --- a/code/datums/wires/autolathe.dm +++ b/code/datums/wires/autolathe.dm @@ -18,7 +18,7 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4 return 1 return 0 -/datum/wires/autolathe/Interact(var/mob/living/user) +/datum/wires/autolathe/Interact(mob/living/user) if(CanUse(user)) var/obj/machinery/autolathe/V = holder V.attack_hand(user) diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index fac7163a486..34a85d4bece 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -6,12 +6,12 @@ var/const/WIRE_EXPLODE = 1 /datum/wires/explosive/proc/explode() return -/datum/wires/explosive/UpdatePulsed(var/index) +/datum/wires/explosive/UpdatePulsed(index) switch(index) if(WIRE_EXPLODE) explode() -/datum/wires/explosive/UpdateCut(var/index, var/mended) +/datum/wires/explosive/UpdateCut(index, mended) switch(index) if(WIRE_EXPLODE) if(!mended) @@ -20,7 +20,7 @@ var/const/WIRE_EXPLODE = 1 /datum/wires/explosive/c4 holder_type = /obj/item/weapon/c4 -/datum/wires/explosive/c4/CanUse(var/mob/living/L) +/datum/wires/explosive/c4/CanUse(mob/living/L) var/obj/item/weapon/c4/P = holder if(P.open_panel) return 1 @@ -35,10 +35,10 @@ var/const/WIRE_EXPLODE = 1 /datum/wires/explosive/gibtonite holder_type = /obj/item/weapon/twohanded/required/gibtonite -/datum/wires/explosive/gibtonite/CanUse(var/mob/living/L) +/datum/wires/explosive/gibtonite/CanUse(mob/living/L) return 1 -/datum/wires/explosive/gibtonite/UpdateCut(var/index, var/mended) +/datum/wires/explosive/gibtonite/UpdateCut(index, mended) return /datum/wires/explosive/gibtonite/explode() diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm index 6b7bf818fbf..22cae76f697 100644 --- a/code/datums/wires/mulebot.dm +++ b/code/datums/wires/mulebot.dm @@ -13,19 +13,19 @@ var/const/WIRE_REMOTE_RX = 64 // remote recv functions var/const/WIRE_REMOTE_TX = 128 // remote trans status var/const/WIRE_BEACON_RX = 256 // beacon ping recv -/datum/wires/mulebot/CanUse(var/mob/living/L) +/datum/wires/mulebot/CanUse(mob/living/L) var/obj/machinery/bot/mulebot/M = holder if(M.open) return 1 return 0 // So the wires do not open a new window, handle the interaction ourselves. -/datum/wires/mulebot/Interact(var/mob/living/user) +/datum/wires/mulebot/Interact(mob/living/user) if(CanUse(user)) var/obj/machinery/bot/mulebot/M = holder M.interact(user) -/datum/wires/mulebot/UpdatePulsed(var/index) +/datum/wires/mulebot/UpdatePulsed(index) switch(index) if(WIRE_POWER1, WIRE_POWER2) holder.visible_message("\icon[holder] The charge light flickers.") diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm index b55995eb3eb..3e59f50979e 100644 --- a/code/datums/wires/particle_accelerator.dm +++ b/code/datums/wires/particle_accelerator.dm @@ -8,13 +8,13 @@ var/const/PARTICLE_INTERFACE_WIRE = 4 // Determines the interface showing up. var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be. //var/const/PARTICLE_NOTHING_WIRE = 16 // Blank wire -/datum/wires/particle_acc/control_box/CanUse(var/mob/living/L) +/datum/wires/particle_acc/control_box/CanUse(mob/living/L) var/obj/machinery/particle_accelerator/control_box/C = holder if(C.construction_state == 2) return 1 return 0 -/datum/wires/particle_acc/control_box/UpdatePulsed(var/index) +/datum/wires/particle_acc/control_box/UpdatePulsed(index) var/obj/machinery/particle_accelerator/control_box/C = holder switch(index) @@ -30,7 +30,7 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be. if(PARTICLE_LIMIT_POWER_WIRE) C.visible_message("\icon[C][C] makes a large whirring noise.") -/datum/wires/particle_acc/control_box/UpdateCut(var/index, var/mended) +/datum/wires/particle_acc/control_box/UpdateCut(index, mended) var/obj/machinery/particle_accelerator/control_box/C = holder switch(index) diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index 249af31f6da..90e7f499787 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -6,18 +6,18 @@ var/const/WIRE_SIGNAL = 1 var/const/WIRE_RECEIVE = 2 var/const/WIRE_TRANSMIT = 4 -/datum/wires/radio/CanUse(var/mob/living/L) +/datum/wires/radio/CanUse(mob/living/L) var/obj/item/device/radio/R = holder if(R.b_stat) return 1 return 0 -/datum/wires/radio/Interact(var/mob/living/user) +/datum/wires/radio/Interact(mob/living/user) if(CanUse(user)) var/obj/item/device/radio/R = holder R.interact(user) -/datum/wires/radio/UpdatePulsed(var/index) +/datum/wires/radio/UpdatePulsed(index) var/obj/item/device/radio/R = holder switch(index) if(WIRE_SIGNAL) diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 30f3cca3f12..a01efe58d21 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -18,7 +18,7 @@ var/const/BORG_WIRE_CAMERA = 16 . += text("
      \n[(R.lockcharge ? "The lockdown light is on." : "The lockdown light is off.")]") return . -/datum/wires/robot/UpdateCut(var/index, var/mended) +/datum/wires/robot/UpdateCut(index, mended) var/mob/living/silicon/robot/R = holder switch(index) @@ -49,7 +49,7 @@ var/const/BORG_WIRE_CAMERA = 16 R.SetLockdown(!mended) -/datum/wires/robot/UpdatePulsed(var/index) +/datum/wires/robot/UpdatePulsed(index) var/mob/living/silicon/robot/R = holder switch(index) @@ -89,7 +89,7 @@ var/const/BORG_WIRE_CAMERA = 16 if(BORG_WIRE_LOCKED_DOWN) R.SetLockdown(!R.lockcharge) // Toggle -/datum/wires/robot/CanUse(var/mob/living/L) +/datum/wires/robot/CanUse(mob/living/L) var/mob/living/silicon/robot/R = holder if(R.wiresexposed) return 1 diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm index fccc80ae5f2..a814eb67603 100644 --- a/code/datums/wires/syndicatebomb.dm +++ b/code/datums/wires/syndicatebomb.dm @@ -10,13 +10,13 @@ var/const/WIRE_PROCEED = 8 // Lowers the timer, explodes if cut while the bomb var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if pulsed while already active, will stop a timer a bomb on cut -/datum/wires/syndicatebomb/CanUse(var/mob/living/L) +/datum/wires/syndicatebomb/CanUse(mob/living/L) var/obj/machinery/syndicatebomb/P = holder if(P.open_panel) return 1 return 0 -/datum/wires/syndicatebomb/UpdatePulsed(var/index) +/datum/wires/syndicatebomb/UpdatePulsed(index) var/obj/machinery/syndicatebomb/P = holder switch(index) if(WIRE_BOOM) @@ -48,7 +48,7 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if P.loc.visible_message("\icon[holder] The bomb seems to hesitate for a moment.") P.timer += 5 -/datum/wires/syndicatebomb/UpdateCut(var/index, var/mended) +/datum/wires/syndicatebomb/UpdateCut(index, mended) var/obj/machinery/syndicatebomb/P = holder switch(index) if(WIRE_EXPLODE) diff --git a/code/datums/wires/taperecorder.dm b/code/datums/wires/taperecorder.dm index 45eaef24421..3217b890096 100644 --- a/code/datums/wires/taperecorder.dm +++ b/code/datums/wires/taperecorder.dm @@ -6,14 +6,14 @@ var/const/WIRE_PLAY = 1 var/const/WIRE_RECORD = 2 -/datum/wires/taperecorder/UpdatePulsed(var/index) +/datum/wires/taperecorder/UpdatePulsed(index) switch(index) if(WIRE_PLAY) play() if(WIRE_RECORD) record() -/datum/wires/taperecorder/CanUse(var/mob/living/L) +/datum/wires/taperecorder/CanUse(mob/living/L) var/obj/item/device/taperecorder/T = holder if(T.open_panel) return 1 diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm index 5b7d4024533..505b99b3cf1 100644 --- a/code/datums/wires/vending.dm +++ b/code/datums/wires/vending.dm @@ -7,7 +7,7 @@ var/const/VENDING_WIRE_CONTRABAND = 2 var/const/VENDING_WIRE_ELECTRIFY = 4 var/const/VENDING_WIRE_IDSCAN = 8 -/datum/wires/vending/CanUse(var/mob/living/L) +/datum/wires/vending/CanUse(mob/living/L) var/obj/machinery/vending/V = holder if(!istype(L, /mob/living/silicon)) if(V.seconds_electrified) @@ -17,7 +17,7 @@ var/const/VENDING_WIRE_IDSCAN = 8 return 1 return 0 -/datum/wires/vending/Interact(var/mob/living/user) +/datum/wires/vending/Interact(mob/living/user) if(CanUse(user)) var/obj/machinery/vending/V = holder V.attack_hand(user) @@ -30,7 +30,7 @@ var/const/VENDING_WIRE_IDSCAN = 8 . += "The green light is [V.extended_inventory ? "on" : "off"].
      " . += "A [V.scan_id ? "purple" : "yellow"] light is on.
      " -/datum/wires/vending/UpdatePulsed(var/index) +/datum/wires/vending/UpdatePulsed(index) var/obj/machinery/vending/V = holder switch(index) if(VENDING_WIRE_THROW) @@ -42,7 +42,7 @@ var/const/VENDING_WIRE_IDSCAN = 8 if(VENDING_WIRE_IDSCAN) V.scan_id = !V.scan_id -/datum/wires/vending/UpdateCut(var/index, var/mended) +/datum/wires/vending/UpdateCut(index, mended) var/obj/machinery/vending/V = holder switch(index) if(VENDING_WIRE_THROW) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 89b57e6a16e..350c878a95e 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -65,7 +65,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", //wires = shuffle(wires) -/datum/wires/proc/Interact(var/mob/living/user) +/datum/wires/proc/Interact(mob/living/user) var/html = null if(holder && CanUse(user)) @@ -155,14 +155,14 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", // // Called when wires cut/mended. -/datum/wires/proc/UpdateCut(var/index, var/mended) +/datum/wires/proc/UpdateCut(index, mended) return // Called when wire pulsed. Add code here. -/datum/wires/proc/UpdatePulsed(var/index) +/datum/wires/proc/UpdatePulsed(index) return -/datum/wires/proc/CanUse(var/mob/living/L) +/datum/wires/proc/CanUse(mob/living/L) return 1 // Example of use: @@ -191,15 +191,15 @@ var/const/POWER = 8 // Helper Procs // -/datum/wires/proc/PulseColour(var/colour) +/datum/wires/proc/PulseColour(colour) PulseIndex(GetIndex(colour)) -/datum/wires/proc/PulseIndex(var/index) +/datum/wires/proc/PulseIndex(index) if(IsIndexCut(index)) return UpdatePulsed(index) -/datum/wires/proc/GetIndex(var/colour) +/datum/wires/proc/GetIndex(colour) if(wires[colour]) var/index = wires[colour] return index @@ -210,28 +210,28 @@ var/const/POWER = 8 // Is Index/Colour Cut procs // -/datum/wires/proc/IsColourCut(var/colour) +/datum/wires/proc/IsColourCut(colour) var/index = GetIndex(colour) return IsIndexCut(index) -/datum/wires/proc/IsIndexCut(var/index) +/datum/wires/proc/IsIndexCut(index) return (index & wires_status) // // Signaller Procs // -/datum/wires/proc/IsAttached(var/colour) +/datum/wires/proc/IsAttached(colour) if(signallers[colour]) return 1 return 0 -/datum/wires/proc/GetAttached(var/colour) +/datum/wires/proc/GetAttached(colour) if(signallers[colour]) return signallers[colour] return null -/datum/wires/proc/Attach(var/colour, var/obj/item/device/assembly/S) +/datum/wires/proc/Attach(colour, obj/item/device/assembly/S) if(colour && S && S.attachable) if(!IsAttached(colour)) signallers[colour] = S @@ -239,7 +239,7 @@ var/const/POWER = 8 S.connected = src return S -/datum/wires/proc/Detach(var/colour) +/datum/wires/proc/Detach(colour) if(colour) var/obj/item/device/assembly/S = GetAttached(colour) if(S) @@ -249,7 +249,7 @@ var/const/POWER = 8 return S -/datum/wires/proc/Pulse(var/obj/item/device/assembly/S) +/datum/wires/proc/Pulse(obj/item/device/assembly/S) for(var/colour in signallers) if(S == signallers[colour]) @@ -261,11 +261,11 @@ var/const/POWER = 8 // Cut Wire Colour/Index procs // -/datum/wires/proc/CutWireColour(var/colour) +/datum/wires/proc/CutWireColour(colour) var/index = GetIndex(colour) CutWireIndex(index) -/datum/wires/proc/CutWireIndex(var/index) +/datum/wires/proc/CutWireIndex(index) if(IsIndexCut(index)) wires_status &= ~index UpdateCut(index, 1) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index a3af235a15f..316c437c912 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -48,7 +48,7 @@ -/area/proc/poweralert(var/state, var/obj/source as obj) +/area/proc/poweralert(state, obj/source) if (state != poweralm) poweralm = state if(istype(source)) //Only report power alarms on the z-level where the source is located. @@ -74,7 +74,7 @@ D.triggerAlarm("Power", src, cameras, source) return -/area/proc/atmosalert(var/danger_level, var/obj/source as obj) +/area/proc/atmosalert(danger_level, obj/source) if(danger_level != atmosalm) if (danger_level==2) var/list/cameras = list() @@ -101,7 +101,7 @@ return 1 return 0 -/area/proc/firealert(var/obj/source as obj) +/area/proc/firealert(obj/source) if(always_unpowered == 1) //no fire alarms in space/asteroid return @@ -130,7 +130,7 @@ D.triggerAlarm("Fire", src, cameras, source) return -/area/proc/firereset(var/obj/source as obj) +/area/proc/firereset(obj/source) for(var/area/RA in related) if (RA.fire) RA.fire = 0 @@ -154,7 +154,7 @@ D.cancelAlarm("Fire", src, source) return -/area/proc/burglaralert(var/obj/trigger) +/area/proc/burglaralert(obj/trigger) if(always_unpowered == 1) //no burglar alarms in space/asteroid return @@ -246,7 +246,7 @@ #define ENVIRON 3 */ -/area/proc/powered(var/chan) // return true if the area has power to given channel +/area/proc/powered(chan) // return true if the area has power to given channel if(!master.requires_power) return 1 @@ -274,7 +274,7 @@ if (fire || eject || party) RA.updateicon() -/area/proc/usage(var/chan) +/area/proc/usage(chan) var/used = 0 switch(chan) if(LIGHT) @@ -308,7 +308,7 @@ master.used_light = 0 master.used_environ = 0 -/area/proc/use_power(var/amount, var/chan) +/area/proc/use_power(amount, chan) switch(chan) if(EQUIP) diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 55980bdbcb7..938c48b5343 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -2,7 +2,7 @@ var/global/list/possiblethemes = list("organharvest","cult","wizden","cavein","x var/global/max_secret_rooms = 6 -/proc/spawn_room(var/atom/start_loc, var/x_size, var/y_size, var/list/walltypes, var/floor, var/name) +/proc/spawn_room(atom/start_loc, x_size, y_size, list/walltypes, floor, name) var/list/room_turfs = list("walls"=list(),"floors"=list()) for(var/x = 0, x < x_size, x++) //sets the size of the room on the x axis diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 83a6d9f268b..c20a1f77fb5 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -98,7 +98,7 @@ else return null -/atom/proc/check_eye(user as mob) +/atom/proc/check_eye(mob/user) if (istype(user, /mob/living/silicon/ai)) // WHYYYY return 1 return @@ -134,7 +134,7 @@ /atom/proc/HasProximity(atom/movable/AM as mob|obj) return -/atom/proc/emp_act(var/severity) +/atom/proc/emp_act(severity) return /atom/proc/bullet_act(obj/item/projectile/P, def_zone) @@ -371,7 +371,7 @@ var/list/blood_splatter_icons = list() /atom/proc/rejects_blood() return 0 -/atom/proc/add_vomit_floor(mob/living/carbon/M as mob, var/toxvomit = 0) +/atom/proc/add_vomit_floor(mob/living/carbon/M, toxvomit = 0) if( istype(src, /turf/simulated) ) var/obj/effect/decal/cleanable/vomit/this = new /obj/effect/decal/cleanable/vomit(src) if(M.reagents) @@ -386,7 +386,7 @@ var/list/blood_splatter_icons = list() newDisease.holder = this*/ // Only adds blood on the floor -- Skie -/atom/proc/add_blood_floor(mob/living/carbon/M as mob) +/atom/proc/add_blood_floor(mob/living/carbon/M) if(istype(src, /turf/simulated)) if(check_dna_integrity(M)) //mobs with dna = (monkeys + humans at time of writing) var/obj/effect/decal/cleanable/blood/B = locate() in contents @@ -441,7 +441,7 @@ var/list/blood_splatter_icons = list() /atom/proc/singularity_pull() return -/atom/proc/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/atom/proc/acid_act(acidpwr, toxpwr, acid_volume) return /atom/proc/emag_act() diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index f24e6bf8e4f..7480302230e 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -124,7 +124,7 @@ //Return 0 to have src start/keep drifting in a no-grav area and 1 to stop/not start drifting //Mobs should return 1 if they should be able to move of their own volition, see client/Move() in mob_movement.dm //movement_dir == 0 when stopping or any dir when trying to move -/atom/movable/proc/Process_Spacemove(var/movement_dir = 0) +/atom/movable/proc/Process_Spacemove(movement_dir = 0) if(has_gravity(src)) return 1 diff --git a/code/game/communications.dm b/code/game/communications.dm index 9f7d515a300..6d57e20afb9 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -64,7 +64,7 @@ so i made radios not use the radio controller. */ var/list/all_radios = list() -/proc/add_radio(var/obj/item/radio, freq) +/proc/add_radio(obj/item/radio, freq) if(!freq || !radio) return if(!all_radios["[freq]"]) @@ -74,7 +74,7 @@ var/list/all_radios = list() all_radios["[freq]"] |= radio return freq -/proc/remove_radio(var/obj/item/radio, freq) +/proc/remove_radio(obj/item/radio, freq) if(!freq || !radio) return if(!all_radios["[freq]"]) @@ -82,7 +82,7 @@ var/list/all_radios = list() all_radios["[freq]"] -= radio -/proc/remove_radio_all(var/obj/item/radio) +/proc/remove_radio_all(obj/item/radio) for(var/freq in all_radios) all_radios["[freq]"] -= radio @@ -182,7 +182,7 @@ var/const/RADIO_MAGNETS = "9" //If range > 0, only post to devices on the same z_level and within range //Use range = -1, to restrain to the same z_level without limiting range -/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, var/filter = null as text|null, var/range = null as num|null) +/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, filter = null as text|null, range = null as num|null) //Apply filter to the signal. If none supply, broadcast to every devices //_default channel is always checked @@ -213,7 +213,7 @@ var/const/RADIO_MAGNETS = "9" continue device.receive_signal(signal, TRANSMISSION_RADIO, frequency) -/datum/radio_frequency/proc/add_listener(obj/device as obj, var/filter as text|null) +/datum/radio_frequency/proc/add_listener(obj/device, filter as text|null) if (!filter) filter = "_default" diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index edd4d2ad81b..e3fa61d3409 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -20,18 +20,18 @@ /datum/atom_hud/data/medical/basic -/datum/atom_hud/data/medical/basic/proc/check_sensors(var/mob/living/carbon/human/H) +/datum/atom_hud/data/medical/basic/proc/check_sensors(mob/living/carbon/human/H) if(!istype(H)) return 0 var/obj/item/clothing/under/U = H.w_uniform if(!istype(U)) return 0 if(U.sensor_mode <= 2) return 0 return 1 -/datum/atom_hud/data/medical/basic/add_to_single_hud(var/mob/M, var/mob/living/carbon/H) +/datum/atom_hud/data/medical/basic/add_to_single_hud(mob/M, mob/living/carbon/H) if(check_sensors(H)) ..() -/datum/atom_hud/data/medical/basic/proc/update_suit_sensors(var/mob/living/carbon/H) +/datum/atom_hud/data/medical/basic/proc/update_suit_sensors(mob/living/carbon/H) check_sensors(H) ? add_to_hud(H) : remove_from_hud(H) /datum/atom_hud/data/medical/advanced diff --git a/code/game/dna.dm b/code/game/dna.dm index 1e269bd342c..c1ce01cd512 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -40,7 +40,7 @@ destination.dna.real_name = real_name destination.dna.mutations = mutations -/datum/dna/proc/copy_dna(var/datum/dna/new_dna) +/datum/dna/proc/copy_dna(datum/dna/new_dna) new_dna.unique_enzymes = unique_enzymes new_dna.struc_enzymes = struc_enzymes new_dna.uni_identity = uni_identity @@ -119,7 +119,7 @@ . += repeat_string(DNA_UNIQUE_ENZYMES_LEN, "0") return . -/datum/dna/proc/mutations_say_mods(var/message) +/datum/dna/proc/mutations_say_mods(message) if(message) for(var/datum/mutation/human/M in mutations) message = M.say_mod(message) @@ -384,7 +384,7 @@ ..() update_icon() -/obj/machinery/dna_scannernew/proc/toggle_open(var/mob/user) +/obj/machinery/dna_scannernew/proc/toggle_open(mob/user) if(panel_open) user << "Close the maintenance panel first." return @@ -454,7 +454,7 @@ open_machine() return -/obj/machinery/dna_scannernew/attackby(var/obj/item/I, mob/user, params) +/obj/machinery/dna_scannernew/attackby(obj/item/I, mob/user, params) if(!occupant && default_deconstruction_screwdriver(user, icon_state, icon_state, I))//sent icon_state is irrelevant... update_icon()//..since we're updating the icon here, since the scanner can be unpowered when opened/closed @@ -516,7 +516,7 @@ idle_power_usage = 10 active_power_usage = 400 -/obj/machinery/computer/scan_consolenew/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) if(!user.drop_item()) @@ -972,7 +972,7 @@ return value -/datum/dna/proc/is_same_as(var/datum/dna/D) +/datum/dna/proc/is_same_as(datum/dna/D) if(uni_identity == D.uni_identity && struc_enzymes == D.struc_enzymes && real_name == D.real_name) if(species == D.species && features == D.features && blood_type == D.blood_type) return 1 diff --git a/code/game/gamemodes/abduction/abduction.dm b/code/game/gamemodes/abduction/abduction.dm index cd462b1fd87..fe821790077 100644 --- a/code/game/gamemodes/abduction/abduction.dm +++ b/code/game/gamemodes/abduction/abduction.dm @@ -40,7 +40,7 @@ return 1 -/datum/game_mode/abduction/proc/make_abductor_team(var/team_number,var/preset_agent=null,var/preset_scientist=null) +/datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null) //Team Name team_names[team_number] = "Mothership [pick(possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names //Team Objective @@ -133,7 +133,7 @@ return ..() //Used for create antag buttons -/datum/game_mode/abduction/proc/post_setup_team(var/team_number) +/datum/game_mode/abduction/proc/post_setup_team(team_number) var/list/obj/effect/landmark/abductor/agent_landmarks = new var/list/obj/effect/landmark/abductor/scientist_landmarks = new agent_landmarks.len = max_teams @@ -181,7 +181,7 @@ H.regenerate_icons() -/datum/game_mode/abduction/proc/greet_agent(var/datum/mind/abductor,var/team_number) +/datum/game_mode/abduction/proc/greet_agent(datum/mind/abductor,team_number) abductor.objectives += team_objectives[team_number] var/team_name = team_names[team_number] @@ -195,7 +195,7 @@ obj_count++ return -/datum/game_mode/abduction/proc/greet_scientist(var/datum/mind/abductor,var/team_number) +/datum/game_mode/abduction/proc/greet_scientist(datum/mind/abductor,team_number) abductor.objectives += team_objectives[team_number] var/team_name = team_names[team_number] @@ -209,7 +209,7 @@ obj_count++ return -/datum/game_mode/abduction/proc/equip_common(var/mob/living/carbon/human/agent,var/team_number) +/datum/game_mode/abduction/proc/equip_common(mob/living/carbon/human/agent,team_number) var/radio_freq = SYND_FREQ var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(agent) @@ -219,7 +219,7 @@ agent.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(agent), slot_w_uniform) //they're greys gettit agent.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(agent), slot_back) -/datum/game_mode/abduction/proc/get_team_console(var/team) +/datum/game_mode/abduction/proc/get_team_console(team) var/obj/machinery/abductor/console/console for(var/obj/machinery/abductor/console/c in machines) if(c.team == team) @@ -227,7 +227,7 @@ break return console -/datum/game_mode/abduction/proc/equip_agent(var/mob/living/carbon/human/agent,var/team_number) +/datum/game_mode/abduction/proc/equip_agent(mob/living/carbon/human/agent,team_number) if(!team_number) var/datum/species/abductor/S = agent.dna.species team_number = S.team diff --git a/code/game/gamemodes/abduction/abduction_gear.dm b/code/game/gamemodes/abduction/abduction_gear.dm index a85c712b858..a84adc0b15a 100644 --- a/code/game/gamemodes/abduction/abduction_gear.dm +++ b/code/game/gamemodes/abduction/abduction_gear.dm @@ -44,7 +44,7 @@ -/obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(var/datum/icon_snapshot/entry) +/obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(datum/icon_snapshot/entry) disguise = entry /obj/item/clothing/suit/armor/abductor/vest/proc/ActivateStealth() @@ -114,7 +114,7 @@ if(combat_cooldown==initial(combat_cooldown)) SSobj.processing.Remove(src) -/obj/item/device/abductor/proc/IsAbductor(var/user) +/obj/item/device/abductor/proc/IsAbductor(user) if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.dna.species.id != "abductor") @@ -122,13 +122,13 @@ return 1 return 0 -/obj/item/device/abductor/proc/AbductorCheck(var/user) +/obj/item/device/abductor/proc/AbductorCheck(user) if(IsAbductor(user)) return 1 user << "You can't figure how this works!" return 0 -/obj/item/device/abductor/proc/ScientistCheck(var/user) +/obj/item/device/abductor/proc/ScientistCheck(user) var/mob/living/carbon/human/H = user var/datum/species/abductor/S = H.dna.species return S.scientist @@ -171,7 +171,7 @@ mark(M, user) -/obj/item/device/abductor/gizmo/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/device/abductor/gizmo/afterattack(atom/target, mob/living/user, flag, params) if(flag) return if(!AbductorCheck(user)) @@ -185,13 +185,13 @@ if(GIZMO_MARK) mark(target, user) -/obj/item/device/abductor/gizmo/proc/scan(var/atom/target, var/mob/living/user) +/obj/item/device/abductor/gizmo/proc/scan(atom/target, mob/living/user) if(istype(target,/mob/living/carbon/human)) if(console!=null) console.AddSnapshot(target) user << "You scan [target] and add them to the database." -/obj/item/device/abductor/gizmo/proc/mark(var/atom/target, var/mob/living/user) +/obj/item/device/abductor/gizmo/proc/mark(atom/target, mob/living/user) if(marked == target) user << "This specimen is already marked!" return @@ -204,7 +204,7 @@ else prepare(target,user) -/obj/item/device/abductor/gizmo/proc/prepare(var/atom/target, var/mob/living/user) +/obj/item/device/abductor/gizmo/proc/prepare(atom/target, mob/living/user) if(get_dist(target,user)>1) user << "You need to be next to the specimen to prepare it for transport!" return @@ -227,14 +227,14 @@ return radio_off(M, user) -/obj/item/device/abductor/silencer/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/device/abductor/silencer/afterattack(atom/target, mob/living/user, flag, params) if(flag) return if(!AbductorCheck(user)) return radio_off(target, user) -/obj/item/device/abductor/silencer/proc/radio_off(var/atom/target, var/mob/living/user) +/obj/item/device/abductor/silencer/proc/radio_off(atom/target, mob/living/user) if( !(user in (viewers(7,target))) ) return @@ -247,7 +247,7 @@ user << "You silence [M]'s radio devices." radio_off_mob(M) -/obj/item/device/abductor/silencer/proc/radio_off_mob(var/mob/living/carbon/human/M) +/obj/item/device/abductor/silencer/proc/radio_off_mob(mob/living/carbon/human/M) var/list/all_items = M.GetAllContents() for(var/obj/I in all_items) @@ -368,7 +368,7 @@ Congratulations! You are now trained for xenobiology research!"} if(BATON_PROBE) icon_state = "wonderprod" -/obj/item/weapon/abductor_baton/proc/IsAbductor(var/mob/living/user) +/obj/item/weapon/abductor_baton/proc/IsAbductor(mob/living/user) if(!ishuman(user)) return 0 var/mob/living/carbon/human/H = user @@ -378,7 +378,7 @@ Congratulations! You are now trained for xenobiology research!"} return 0 return 1 -/obj/item/weapon/abductor_baton/attack(mob/target as mob, mob/living/user as mob) +/obj/item/weapon/abductor_baton/attack(mob/target, mob/living/user) if(!IsAbductor(user)) return diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm index 68595ad93f8..73eff48987d 100644 --- a/code/game/gamemodes/abduction/gland.dm +++ b/code/game/gamemodes/abduction/gland.dm @@ -217,7 +217,7 @@ density = 1 var/hatch_time = 0 -/obj/effect/cocoon/abductor/proc/Copy(var/mob/living/carbon/human/H) +/obj/effect/cocoon/abductor/proc/Copy(mob/living/carbon/human/H) var/mob/living/carbon/human/interactive/greytide/clone = new(src) hardset_dna(clone,H.dna.uni_identity,H.dna.struc_enzymes,H.real_name, H.dna.blood_type, H.dna.species.type, H.dna.features) diff --git a/code/game/gamemodes/abduction/machinery/camera.dm b/code/game/gamemodes/abduction/machinery/camera.dm index 428ce8ce2ab..ce9470f9ac8 100644 --- a/code/game/gamemodes/abduction/machinery/camera.dm +++ b/code/game/gamemodes/abduction/machinery/camera.dm @@ -19,7 +19,7 @@ eyeobj.icon = 'icons/obj/abductor.dmi' eyeobj.icon_state = "camera_target" -/obj/machinery/computer/camera_advanced/abductor/GrantActions(var/mob/living/carbon/user) +/obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user) off_action.target = user off_action.Grant(user) @@ -41,14 +41,14 @@ vest_disguise_action.target = console vest_disguise_action.Grant(user) -/obj/machinery/computer/camera_advanced/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) +/obj/machinery/computer/camera_advanced/abductor/proc/IsAbductor(mob/living/carbon/human/H) return H.dna.species.id == "abductor" -/obj/machinery/computer/camera_advanced/abductor/proc/IsScientist(var/mob/living/carbon/human/H) +/obj/machinery/computer/camera_advanced/abductor/proc/IsScientist(mob/living/carbon/human/H) var/datum/species/abductor/S = H.dna.species return S.scientist -/obj/machinery/computer/camera_advanced/abductor/attack_hand(var/mob/user as mob) +/obj/machinery/computer/camera_advanced/abductor/attack_hand(mob/user) if(!iscarbon(user) || !IsAbductor(user)) return return ..() diff --git a/code/game/gamemodes/abduction/machinery/console.dm b/code/game/gamemodes/abduction/machinery/console.dm index 94a321ad72c..7bfcc1cb4bc 100644 --- a/code/game/gamemodes/abduction/machinery/console.dm +++ b/code/game/gamemodes/abduction/machinery/console.dm @@ -3,18 +3,18 @@ /obj/machinery/abductor var/team = 0 -/obj/machinery/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) +/obj/machinery/abductor/proc/IsAbductor(mob/living/carbon/human/H) if(!H.dna) return 0 return H.dna.species.id == "abductor" -/obj/machinery/abductor/proc/IsAgent(var/mob/living/carbon/human/H) +/obj/machinery/abductor/proc/IsAgent(mob/living/carbon/human/H) if(H.dna.species.id == "abductor") var/datum/species/abductor/S = H.dna.species return S.agent return 0 -/obj/machinery/abductor/proc/IsScientist(var/mob/living/carbon/human/H) +/obj/machinery/abductor/proc/IsScientist(mob/living/carbon/human/H) if(H.dna.species.id == "abductor") var/datum/species/abductor/S = H.dna.species return S.scientist @@ -36,7 +36,7 @@ var/obj/machinery/computer/camera_advanced/abductor/camera var/list/datum/icon_snapshot/disguises = list() -/obj/machinery/abductor/console/attack_hand(var/mob/user as mob) +/obj/machinery/abductor/console/attack_hand(mob/user) if(..()) return if(!IsAbductor(user)) @@ -140,7 +140,7 @@ vest.flip_mode() return -/obj/machinery/abductor/console/proc/SelectDisguise(var/remote=0) +/obj/machinery/abductor/console/proc/SelectDisguise(remote=0) var/list/entries = list() var/tempname var/datum/icon_snapshot/temp @@ -171,7 +171,7 @@ camera = c c.console = src -/obj/machinery/abductor/console/proc/AddSnapshot(var/mob/living/carbon/human/target) +/obj/machinery/abductor/console/proc/AddSnapshot(mob/living/carbon/human/target) var/datum/icon_snapshot/entry = new entry.name = target.name entry.icon = target.icon @@ -185,7 +185,7 @@ disguises.Add(entry) return -/obj/machinery/abductor/console/attackby(O as obj, user as mob, params) +/obj/machinery/abductor/console/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/device/abductor/gizmo)) var/obj/item/device/abductor/gizmo/G = O user << "You link the tool to the console." @@ -198,7 +198,7 @@ else ..() -/obj/machinery/abductor/console/proc/Dispense(var/item,var/cost=1) +/obj/machinery/abductor/console/proc/Dispense(item,cost=1) if(experiment && experiment.points >= cost) experiment.points-=cost say("Incoming supply!") diff --git a/code/game/gamemodes/abduction/machinery/dispenser.dm b/code/game/gamemodes/abduction/machinery/dispenser.dm index 33b4944785b..91d290a508c 100644 --- a/code/game/gamemodes/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/abduction/machinery/dispenser.dm @@ -22,7 +22,7 @@ gland_colors[i] = random_color() amounts[i] = rand(1,5) -/obj/machinery/abductor/gland_dispenser/attack_hand(var/mob/user as mob) +/obj/machinery/abductor/gland_dispenser/attack_hand(mob/user) if(..()) return if(!IsAbductor(user)) @@ -76,7 +76,7 @@ Dispense(text2num(href_list["dispense"])) src.updateUsrDialog() -/obj/machinery/abductor/gland_dispenser/proc/Dispense(var/count) +/obj/machinery/abductor/gland_dispenser/proc/Dispense(count) if(amounts[count]>0) amounts[count]-- var/T = gland_types[count] diff --git a/code/game/gamemodes/abduction/machinery/experiment.dm b/code/game/gamemodes/abduction/machinery/experiment.dm index 71ca57b29c1..4ea01595c37 100644 --- a/code/game/gamemodes/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/abduction/machinery/experiment.dm @@ -36,7 +36,7 @@ if(state_open && !panel_open) ..(target) -/obj/machinery/abductor/experiment/proc/dissection_icon(var/mob/living/carbon/human/H) +/obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H) var/icon/photo = null var/g = (H.gender == FEMALE) ? "f" : "m" if(!config.mutant_races || H.dna.species.use_skintones) @@ -129,7 +129,7 @@ updateUsrDialog() add_fingerprint(usr) -/obj/machinery/abductor/experiment/proc/Experiment(var/mob/occupant,var/type) +/obj/machinery/abductor/experiment/proc/Experiment(mob/occupant,type) var/mob/living/carbon/human/H = occupant var/point_reward = 0 if(H in history) @@ -185,7 +185,7 @@ return "ERROR" -/obj/machinery/abductor/experiment/proc/SendBack(var/mob/living/carbon/human/H) +/obj/machinery/abductor/experiment/proc/SendBack(mob/living/carbon/human/H) H.Sleeping(8) var/area/A if(console && console.pad && console.pad.teleport_target) diff --git a/code/game/gamemodes/abduction/machinery/pad.dm b/code/game/gamemodes/abduction/machinery/pad.dm index b586874397d..e7abfd04529 100644 --- a/code/game/gamemodes/abduction/machinery/pad.dm +++ b/code/game/gamemodes/abduction/machinery/pad.dm @@ -6,7 +6,7 @@ anchored = 1 var/area/teleport_target -/obj/machinery/abductor/proc/TeleportToArea(var/mob/living/target,var/area/thearea) +/obj/machinery/abductor/proc/TeleportToArea(mob/living/target,area/thearea) var/list/L = list() for(var/turf/T in get_area_turfs(thearea.type)) if(!T.density) @@ -37,7 +37,7 @@ if(!success) target.loc = pick(L) -/obj/machinery/abductor/pad/proc/Warp(var/mob/living/target) +/obj/machinery/abductor/pad/proc/Warp(mob/living/target) target.Move(src.loc) /obj/machinery/abductor/pad/proc/Send() @@ -49,13 +49,13 @@ spawn(0) anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) -/obj/machinery/abductor/pad/proc/Retrieve(var/mob/living/target) +/obj/machinery/abductor/pad/proc/Retrieve(mob/living/target) flick("alien-pad", src) spawn(0) anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) Warp(target) -/obj/machinery/abductor/pad/proc/MobToLoc(var/place,var/mob/living/target) +/obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target) var/obj/effect/teleport_abductor/F = new(place) var/datum/effect/effect/system/spark_spread/S = new S.set_up(10,0,place) @@ -66,7 +66,7 @@ target.forceMove(place) anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) -/obj/machinery/abductor/pad/proc/PadToLoc(var/place) +/obj/machinery/abductor/pad/proc/PadToLoc(place) var/obj/effect/teleport_abductor/F = new(place) var/datum/effect/effect/system/spark_spread/S = new S.set_up(10,0,place) diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index 416d54a6318..f2294177272 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -1,7 +1,7 @@ /datum/atom_hud/antag hud_icons = list(ANTAG_HUD) -/datum/atom_hud/antag/proc/join_hud(var/mob/living/M) +/datum/atom_hud/antag/proc/join_hud(mob/living/M) if(!istype(M)) CRASH("join_hud(): [M] ([M.type]) is not a living mob!") if(M.mind.antag_hud) @@ -11,7 +11,7 @@ add_hud_to(M) M.mind.antag_hud = src -/datum/atom_hud/antag/proc/leave_hud(var/mob/living/M) +/datum/atom_hud/antag/proc/leave_hud(mob/living/M) if(!istype(M)) CRASH("leave_hud(): [M] ([M.type]) is not a living mob!") remove_from_hud(M) @@ -21,7 +21,7 @@ //GAME_MODE PROCS //called to set a mob's antag icon state -/datum/game_mode/proc/set_antag_hud(var/mob/living/M, var/new_icon_state) +/datum/game_mode/proc/set_antag_hud(mob/living/M, new_icon_state) if(!istype(M)) CRASH("set_antag_hud(): [M] ([M.type]) is not a living mob!") var/image/holder = M.hud_list[ANTAG_HUD] @@ -31,7 +31,7 @@ //MIND PROCS //this is called by mind.transfer_to() -/datum/mind/proc/transfer_antag_huds(var/mob/living/M) +/datum/mind/proc/transfer_antag_huds(mob/living/M) for(var/datum/atom_hud/antag/hud in huds) if(M in hud.hudusers) hud.leave_hud(M) diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 99a9cafeedc..b3e6ab5e0f8 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -4,10 +4,10 @@ w_class = 1.0 var/used = 0 -/obj/item/weapon/antag_spawner/proc/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/weapon/antag_spawner/proc/spawn_antag(client/C, turf/T, type = "") return -/obj/item/weapon/antag_spawner/proc/equip_antag(mob/target as mob) +/obj/item/weapon/antag_spawner/proc/equip_antag(mob/target) return /obj/item/weapon/antag_spawner/contract @@ -16,7 +16,7 @@ icon = 'icons/obj/wizard.dmi' icon_state ="scroll2" -/obj/item/weapon/antag_spawner/contract/attack_self(mob/user as mob) +/obj/item/weapon/antag_spawner/contract/attack_self(mob/user) user.set_machine(src) var/dat if(used) @@ -63,7 +63,7 @@ else H << "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later." -/obj/item/weapon/antag_spawner/contract/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/weapon/antag_spawner/contract/spawn_antag(client/C, turf/T, type = "") PoolOrNew(/obj/effect/effect/smoke, T) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) C.prefs.copy_to(M) @@ -108,7 +108,7 @@ ticker.mode.update_wiz_icons_added(M.mind) M << sound('sound/effects/magic.ogg') -/obj/item/weapon/antag_spawner/contract/equip_antag(mob/target as mob) +/obj/item/weapon/antag_spawner/contract/equip_antag(mob/target) target.equip_to_slot_or_del(new /obj/item/device/radio/headset(target), slot_ears) target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(target), slot_w_uniform) target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(target), slot_shoes) @@ -125,7 +125,7 @@ icon_state = "locator" var/TC_cost = 0 -/obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user as mob) +/obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user) if(used) user << "The teleporter is out of power." return @@ -137,7 +137,7 @@ else user << "Unable to connect to Syndicate Command. Please wait and try again later or use the teleporter on your uplink to get your points refunded." -/obj/item/weapon/antag_spawner/borg_tele/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/weapon/antag_spawner/borg_tele/spawn_antag(client/C, turf/T, type = "") var/datum/effect/effect/system/spark_spread/S = new /datum/effect/effect/system/spark_spread S.set_up(4, 1, src) S.start() @@ -156,7 +156,7 @@ icon_state = "vial" -/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user as mob) +/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user) var/list/demon_candidates = get_candidates(BE_ALIEN) if(user.z != 1) user << "You should probably wait until you reach the station." @@ -173,7 +173,7 @@ user << "You can't seem to work up the nerve to shatter the bottle. Perhaps you should try again later." -/obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "") var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T) var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder) diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index c629c157f98..06153d71aff 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -59,7 +59,7 @@ var/list/blob_nodes = list() return candidates -/datum/game_mode/blob/proc/blobize(var/mob/living/carbon/human/blob) +/datum/game_mode/blob/proc/blobize(mob/living/carbon/human/blob) var/datum/mind/blobmind = blob.mind if(!istype(blobmind)) return 0 @@ -72,7 +72,7 @@ var/list/blob_nodes = list() burst_blob(blobmind) return 1 -/datum/game_mode/blob/proc/make_blobs(var/count) +/datum/game_mode/blob/proc/make_blobs(count) var/list/candidates = get_blob_candidates() var/mob/living/carbon/human/blob = null count=min(count, candidates.len) @@ -90,7 +90,7 @@ var/list/blob_nodes = list() world << "You must kill it all while minimizing the damage to the station." -/datum/game_mode/blob/proc/greet_blob(var/datum/mind/blob) +/datum/game_mode/blob/proc/greet_blob(datum/mind/blob) blob.current << "You are infected by the Blob!" blob.current << "Your body is ready to give spawn to a new blob core which will eat this station." blob.current << "Find a good location to spawn the core and then take control and overwhelm the station!" @@ -98,7 +98,7 @@ var/list/blob_nodes = list() blob.current << "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover." return -/datum/game_mode/blob/proc/show_message(var/message) +/datum/game_mode/blob/proc/show_message(message) for(var/datum/mind/blob in infected_crew) blob.current << message @@ -106,7 +106,7 @@ var/list/blob_nodes = list() for(var/datum/mind/blob in infected_crew) burst_blob(blob) -/datum/game_mode/blob/proc/burst_blob(var/datum/mind/blob, var/warned=0) +/datum/game_mode/blob/proc/burst_blob(datum/mind/blob, warned=0) var/client/blob_client = null var/turf/location = null @@ -186,7 +186,7 @@ var/list/blob_nodes = list() return ..(0) -/datum/game_mode/blob/proc/stage(var/stage) +/datum/game_mode/blob/proc/stage(stage) switch(stage) if (0) diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index d08526eda5d..eec4d27e80c 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 -/datum/game_mode/blob/send_intercept(var/report = 1) +/datum/game_mode/blob/send_intercept(report = 1) var/intercepttext = "" switch(report) if(0) @@ -57,7 +57,7 @@ var/num_territories = 1//Number of total valid territories for gang mode -/datum/station_state/proc/count(var/count_territories) +/datum/station_state/proc/count(count_territories) for(var/turf/T in block(locate(1,1,1), locate(world.maxx,world.maxy,1))) if(istype(T,/turf/simulated/floor)) @@ -100,7 +100,7 @@ else world << "ERROR: NO VALID TERRITORIES" -/datum/station_state/proc/score(var/datum/station_state/result) +/datum/station_state/proc/score(datum/station_state/result) if(!result) return 0 var/output = 0 output += (result.floor / max(floor,1)) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 8580c480ab1..895774a2dc3 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -13,7 +13,7 @@ maxbodytemp = 360 var/mob/camera/blob/overmind = null -/mob/living/simple_animal/hostile/blob/proc/adjustcolors(var/a_color) +/mob/living/simple_animal/hostile/blob/proc/adjustcolors(a_color) if(a_color) color = a_color @@ -65,7 +65,7 @@ break ..() -/mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(var/mob/living/carbon/human/H) +/mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(mob/living/carbon/human/H) is_zombie = 1 if(H.wear_suit) var/obj/item/clothing/suit/armor/A = H.wear_suit @@ -128,7 +128,7 @@ adjustcolors(color) //to ensure zombie/other overlays update -/mob/living/simple_animal/hostile/blob/blobspore/adjustcolors(var/a_color) +/mob/living/simple_animal/hostile/blob/blobspore/adjustcolors(a_color) color = a_color if(is_zombie) diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index bf8822c40f5..dc5fbd797d0 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -24,7 +24,7 @@ ..(loc, h) -/obj/effect/blob/core/adjustcolors(var/a_color) +/obj/effect/blob/core/adjustcolors(a_color) overlays.Cut() color = null var/image/I = new('icons/mob/blob.dmi', "blob") @@ -80,7 +80,7 @@ ..() -/obj/effect/blob/core/proc/create_overmind(var/client/new_overmind, var/override_delay) +/obj/effect/blob/core/proc/create_overmind(client/new_overmind, override_delay) if(overmind_get_delay > world.time && !override_delay) return diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index 3ab5874c176..4138d56cbc6 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -20,7 +20,7 @@ spores = null ..() -/obj/effect/blob/factory/PulseAnimation(var/activate = 0) +/obj/effect/blob/factory/PulseAnimation(activate = 0) if(activate) ..() return diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index d436693ed4f..0b8124daacd 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -11,7 +11,7 @@ SSobj.processing |= src ..(loc, h) -/obj/effect/blob/node/adjustcolors(var/a_color) +/obj/effect/blob/node/adjustcolors(a_color) overlays.Cut() color = null var/image/I = new('icons/mob/blob.dmi', "blob") diff --git a/code/game/gamemodes/blob/blobs/resource.dm b/code/game/gamemodes/blob/blobs/resource.dm index 2480d48552f..45b1e08687d 100644 --- a/code/game/gamemodes/blob/blobs/resource.dm +++ b/code/game/gamemodes/blob/blobs/resource.dm @@ -11,7 +11,7 @@ if(health <= 0) qdel(src) -/obj/effect/blob/resource/PulseAnimation(var/activate = 0) +/obj/effect/blob/resource/PulseAnimation(activate = 0) if(activate) ..() return diff --git a/code/game/gamemodes/blob/blobs/storage.dm b/code/game/gamemodes/blob/blobs/storage.dm index dcfb5ddf1ac..47b50a5bb03 100644 --- a/code/game/gamemodes/blob/blobs/storage.dm +++ b/code/game/gamemodes/blob/blobs/storage.dm @@ -11,11 +11,11 @@ overmind.max_blob_points -= 50 qdel(src) -/obj/effect/blob/storage/PulseAnimation(var/activate = 0) +/obj/effect/blob/storage/PulseAnimation(activate = 0) if(activate) ..() return -/obj/effect/blob/storage/proc/update_max_blob_points(var/new_point_increase) +/obj/effect/blob/storage/proc/update_max_blob_points(new_point_increase) if(overmind) overmind.max_blob_points += new_point_increase \ No newline at end of file diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 005c40b3364..26ffc2d65c5 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -67,12 +67,12 @@ if(blob_core) hud_used.blobhealthdisplay.maptext = "
      [round(blob_core.health)]
      " -/mob/camera/blob/proc/add_points(var/points) +/mob/camera/blob/proc/add_points(points) if(points != 0) blob_points = Clamp(blob_points + points, 0, max_blob_points) hud_used.blobpwrdisplay.maptext = "
      [round(src.blob_points)]
      " -/mob/camera/blob/say(var/message) +/mob/camera/blob/say(message) if (!message) return @@ -103,7 +103,7 @@ if(isovermind(M) || isobserver(M)) M.show_message(rendered, 2) -/mob/camera/blob/emote(var/act,var/m_type=1,var/message = null) +/mob/camera/blob/emote(act,m_type=1,message = null) return /mob/camera/blob/blob_act() @@ -116,7 +116,7 @@ stat(null, "Core Health: [blob_core.health]") stat(null, "Power Stored: [blob_points]/[max_blob_points]") -/mob/camera/blob/Move(var/NewLoc, var/Dir = 0) +/mob/camera/blob/Move(NewLoc, Dir = 0) var/obj/effect/blob/B = locate() in range("3x3", NewLoc) if(B) loc = NewLoc diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 446e324b486..78c15e08e5e 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -1,6 +1,6 @@ // Point controlling procs -/mob/camera/blob/proc/can_buy(var/cost = 15) +/mob/camera/blob/proc/can_buy(cost = 15) if(blob_points < cost) src << "You cannot afford this!" return 0 @@ -39,7 +39,7 @@ var/turf/T = get_turf(src) create_shield(T) -/mob/camera/blob/proc/create_shield(var/turf/T) +/mob/camera/blob/proc/create_shield(turf/T) var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) @@ -255,7 +255,7 @@ var/turf/T = get_turf(src) expand_blob(T) -/mob/camera/blob/proc/expand_blob(var/turf/T) +/mob/camera/blob/proc/expand_blob(turf/T) if(!T) return @@ -290,7 +290,7 @@ var/turf/T = get_turf(src) rally_spores(T) -/mob/camera/blob/proc/rally_spores(var/turf/T) +/mob/camera/blob/proc/rally_spores(turf/T) if(!can_buy(5)) return diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 30c3261bddd..13fd5d40269 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -63,7 +63,7 @@ health_timestamp = world.time + 10 // 1 seconds -/obj/effect/blob/proc/Pulse(var/pulse = 0, var/origin_dir = 0, var/a_color)//Todo: Fix spaceblob expand +/obj/effect/blob/proc/Pulse(pulse = 0, origin_dir = 0, a_color)//Todo: Fix spaceblob expand set background = BACKGROUND_ENABLED @@ -100,7 +100,7 @@ return 0 -/obj/effect/blob/proc/expand(var/turf/T = null, var/prob = 1, var/a_color) +/obj/effect/blob/proc/expand(turf/T = null, prob = 1, a_color) if(prob && !prob(health)) return if(istype(T, /turf/space) && prob(75)) return if(!T) @@ -138,12 +138,12 @@ take_damage(Proj.damage, Proj.damage_type) return 0 -/obj/effect/blob/Crossed(var/mob/living/L) +/obj/effect/blob/Crossed(mob/living/L) ..() L.blob_act() -/obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/living/user, params) +/obj/effect/blob/attackby(obj/item/weapon/W, mob/living/user, params) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) @@ -152,7 +152,7 @@ playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) take_damage(W.force, W.damtype) -/obj/effect/blob/attack_animal(mob/living/simple_animal/M as mob) +/obj/effect/blob/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) @@ -161,7 +161,7 @@ take_damage(damage, BRUTE) return -/obj/effect/blob/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/obj/effect/blob/attack_alien(mob/living/carbon/alien/humanoid/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) @@ -181,7 +181,7 @@ health -= damage update_icon() -/obj/effect/blob/proc/change_to(var/type) +/obj/effect/blob/proc/change_to(type) if(!ispath(type)) ERROR("[type] is an invalid type for the blob.") var/obj/effect/blob/B = new type(src.loc) @@ -191,7 +191,7 @@ B.adjustcolors(color) qdel(src) -/obj/effect/blob/proc/adjustcolors(var/a_color) +/obj/effect/blob/proc/adjustcolors(a_color) if(a_color) color = a_color return diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index b7eec7d9187..c5953578dfe 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -76,7 +76,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" ..() return -/datum/game_mode/changeling/make_antag_chance(var/mob/living/carbon/human/character) //Assigns changeling to latejoiners +/datum/game_mode/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners var/changelingcap = min( round(joined_player_list.len/(config.changeling_scaling_coeff*2))+2, round(joined_player_list.len/config.changeling_scaling_coeff) ) if(ticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists return @@ -87,7 +87,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" if(!(character.job in restricted_jobs)) character.mind.make_Changling() -/datum/game_mode/proc/forge_changeling_objectives(var/datum/mind/changeling) +/datum/game_mode/proc/forge_changeling_objectives(datum/mind/changeling) //OBJECTIVES - random traitor objectives. Unique objectives "steal brain" and "identity theft". //No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting //If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone @@ -147,7 +147,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" changeling.objectives += identity_theft return -/datum/game_mode/proc/greet_changeling(var/datum/mind/changeling, var/you_are=1) +/datum/game_mode/proc/greet_changeling(datum/mind/changeling, you_are=1) if (you_are) changeling.current << "You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human." changeling.current << "Use say \":g message\" to communicate with your fellow changelings." @@ -266,18 +266,18 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" geneticdamage = max(0, geneticdamage-1) -/datum/changeling/proc/get_dna(var/dna_owner) +/datum/changeling/proc/get_dna(dna_owner) for(var/datum/dna/DNA in (absorbed_dna+protected_dna)) if(dna_owner == DNA.real_name) return DNA -/datum/changeling/proc/has_dna(var/datum/dna/tDNA) +/datum/changeling/proc/has_dna(datum/dna/tDNA) for(var/datum/dna/D in (absorbed_dna+protected_dna)) if(tDNA.is_same_as(D)) return 1 return 0 -/datum/changeling/proc/can_absorb_dna(var/mob/living/carbon/user, var/mob/living/carbon/target) +/datum/changeling/proc/can_absorb_dna(mob/living/carbon/user, mob/living/carbon/target) if(absorbed_dna[1] == user.dna)//If our current DNA is the stalest, we gotta ditch it. user << "We have reached our capacity to store genetic information! We must transform before absorbing more." return diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm index 9ce3ed0590a..19315f476c0 100644 --- a/code/game/gamemodes/changeling/changeling_power.dm +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -17,7 +17,7 @@ var/max_genetic_damage = 100 // hard counter for spamming abilities. Not used/balanced much yet. -/obj/effect/proc_holder/changeling/proc/on_purchase(var/mob/user) +/obj/effect/proc_holder/changeling/proc/on_purchase(mob/user) return /obj/effect/proc_holder/changeling/Click() @@ -26,7 +26,7 @@ return try_to_sting(user) -/obj/effect/proc_holder/changeling/proc/try_to_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/proc/try_to_sting(mob/user, mob/target) if(!can_sting(user, target)) return var/datum/changeling/c = user.mind.changeling @@ -34,18 +34,18 @@ sting_feedback(user, target) take_chemical_cost(c) -/obj/effect/proc_holder/changeling/proc/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/proc/sting_action(mob/user, mob/target) return 0 -/obj/effect/proc_holder/changeling/proc/sting_feedback(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/proc/sting_feedback(mob/user, mob/target) return 0 -/obj/effect/proc_holder/changeling/proc/take_chemical_cost(var/datum/changeling/changeling) +/obj/effect/proc_holder/changeling/proc/take_chemical_cost(datum/changeling/changeling) changeling.chem_charges -= chemical_cost changeling.geneticdamage += genetic_damage //Fairly important to remember to return 1 on success >.< -/obj/effect/proc_holder/changeling/proc/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/proc/can_sting(mob/user, mob/target) if(!ishuman(user) && !ismonkey(user)) //typecast everything from mob to carbon from this point onwards return 0 if(req_human && !ishuman(user)) @@ -70,7 +70,7 @@ return 1 //used in /mob/Stat() -/obj/effect/proc_holder/changeling/proc/can_be_used_by(var/mob/user) +/obj/effect/proc_holder/changeling/proc/can_be_used_by(mob/user) if(!ishuman(user) && !ismonkey(user)) return 0 if(req_human && !ishuman(user)) diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index 7989c3fe92a..9269dc71be1 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -18,7 +18,7 @@ var/list/sting_paths usr << browse(dat, "window=powers;size=600x700")//900x480 -/obj/effect/proc_holder/changeling/evolution_menu/proc/create_menu(var/datum/changeling/changeling) +/obj/effect/proc_holder/changeling/evolution_menu/proc/create_menu(datum/changeling/changeling) var/dat dat +="Changling Evolution Menu" @@ -297,7 +297,7 @@ var/list/sting_paths usr << browse(dat, "window=powers;size=600x700") ///// -/datum/changeling/proc/purchasePower(var/mob/living/carbon/user, var/sting_name) +/datum/changeling/proc/purchasePower(mob/living/carbon/user, sting_name) var/obj/effect/proc_holder/changeling/thepower = null @@ -337,7 +337,7 @@ var/list/sting_paths thepower.on_purchase(user) //Reselect powers -/datum/changeling/proc/lingRespec(var/mob/user) +/datum/changeling/proc/lingRespec(mob/user) if(!ishuman(user)) user << "We can't remove our evolutions in this form!" return @@ -384,7 +384,7 @@ var/list/sting_paths chem_recharge_slowdown = initial(chem_recharge_slowdown) mimicing = "" -/mob/proc/remove_changeling_powers(var/keep_free_powers=0) +/mob/proc/remove_changeling_powers(keep_free_powers=0) if(ishuman(src) || ismonkey(src)) if(mind && mind.changeling) digitalcamo = 0 diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index abe45f557f5..3b4327aa868 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -6,7 +6,7 @@ req_human = 1 max_genetic_damage = 100 -/obj/effect/proc_holder/changeling/absorbDNA/can_sting(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/absorbDNA/can_sting(mob/living/carbon/user) if(!..()) return @@ -28,7 +28,7 @@ -/obj/effect/proc_holder/changeling/absorbDNA/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/absorbDNA/sting_action(mob/user) var/datum/changeling/changeling = user.mind.changeling var/obj/item/weapon/grab/G = user.get_active_hand() var/mob/living/carbon/human/target = G.affecting @@ -83,7 +83,7 @@ //Absorbs the target DNA. -/datum/changeling/proc/absorb_dna(mob/living/carbon/T, var/mob/user) +/datum/changeling/proc/absorb_dna(mob/living/carbon/T, mob/user) if(absorbed_dna.len) absorbed_dna.Cut(1,2) T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. @@ -97,7 +97,7 @@ absorbedcount++ store_dna(new_dna, user) -/datum/changeling/proc/store_dna(var/datum/dna/new_dna, var/mob/user) +/datum/changeling/proc/store_dna(datum/dna/new_dna, mob/user) for(var/datum/objective/escape/escape_with_identity/E in user.mind.objectives) if(E.target_real_name == new_dna.real_name) protected_dna |= new_dna @@ -116,7 +116,7 @@ req_human = 1 //Monkeys can't grab genetic_damage = 50 -/obj/effect/proc_holder/changeling/swap_form/can_sting(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/swap_form/can_sting(mob/living/carbon/user) if(!..()) return var/obj/item/weapon/grab/G = user.get_active_hand() @@ -133,7 +133,7 @@ return 1 -/obj/effect/proc_holder/changeling/swap_form/sting_action(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/swap_form/sting_action(mob/living/carbon/user) var/obj/item/weapon/grab/G = user.get_active_hand() var/mob/living/carbon/target = G.affecting var/datum/changeling/changeling = user.mind.changeling diff --git a/code/game/gamemodes/changeling/powers/adrenaline.dm b/code/game/gamemodes/changeling/powers/adrenaline.dm index ed7496be1d2..1d4a2d35084 100644 --- a/code/game/gamemodes/changeling/powers/adrenaline.dm +++ b/code/game/gamemodes/changeling/powers/adrenaline.dm @@ -8,7 +8,7 @@ req_stat = UNCONSCIOUS //Recover from stuns. -/obj/effect/proc_holder/changeling/adrenaline/sting_action(var/mob/living/user) +/obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user) user << "Energy rushes through us.[user.lying ? " We arise." : ""]" user.stat = 0 user.SetParalysis(0) @@ -29,7 +29,7 @@ color = "#C8A5DC" overdose_threshold = 30 -/datum/reagent/medicine/changelingAdrenaline/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/changelingAdrenaline/on_mob_life(mob/living/M as mob) M.AdjustParalysis(-1) M.AdjustStunned(-1) M.AdjustWeakened(-1) @@ -37,7 +37,7 @@ ..() return -/datum/reagent/medicine/changelingAdrenaline/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/changelingAdrenaline/overdose_process(mob/living/M as mob) M.adjustToxLoss(1) ..() return @@ -49,7 +49,7 @@ color = "#C8A5DC" metabolization_rate = 1 -/datum/reagent/medicine/changelingAdrenaline2/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/changelingAdrenaline2/on_mob_life(mob/living/M as mob) M.status_flags |= GOTTAGOREALLYFAST M.adjustToxLoss(2) ..() diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm index 66dcd7c20b9..7eb4f1eebac 100644 --- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm +++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm @@ -9,7 +9,7 @@ dna_cost = 2 //Would be 1 without thermal vision var/active = 0 //Whether or not vision is enhanced -/obj/effect/proc_holder/changeling/augmented_eyesight/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/augmented_eyesight/sting_action(mob/user) active = !active if(active) user << "We feel a minute twitch in our eyes, and darkness creeps away." diff --git a/code/game/gamemodes/changeling/powers/digitalcamo.dm b/code/game/gamemodes/changeling/powers/digitalcamo.dm index d63e5777f79..2404041ae17 100644 --- a/code/game/gamemodes/changeling/powers/digitalcamo.dm +++ b/code/game/gamemodes/changeling/powers/digitalcamo.dm @@ -5,7 +5,7 @@ dna_cost = 1 //Prevents AIs tracking you but makes you easily detectable to the human-eye. -/obj/effect/proc_holder/changeling/digitalcamo/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/digitalcamo/sting_action(mob/user) if(user.digitalcamo) user << "We return to normal." diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm index f09eeceb54d..02d6eb91654 100644 --- a/code/game/gamemodes/changeling/powers/fakedeath.dm +++ b/code/game/gamemodes/changeling/powers/fakedeath.dm @@ -9,7 +9,7 @@ //Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay. -/obj/effect/proc_holder/changeling/fakedeath/sting_action(var/mob/living/user) +/obj/effect/proc_holder/changeling/fakedeath/sting_action(mob/living/user) user << "We begin our stasis, preparing energy to arise once more." user.status_flags |= FAKEDEATH //play dead user.update_canmove() @@ -23,7 +23,7 @@ feedback_add_details("changeling_powers","FD") return 1 -/obj/effect/proc_holder/changeling/fakedeath/can_sting(var/mob/user) +/obj/effect/proc_holder/changeling/fakedeath/can_sting(mob/user) if(user.status_flags & FAKEDEATH) user << "We are already regenerating." return diff --git a/code/game/gamemodes/changeling/powers/fleshmend.dm b/code/game/gamemodes/changeling/powers/fleshmend.dm index c19fbc6dbbe..dcc28941ed0 100644 --- a/code/game/gamemodes/changeling/powers/fleshmend.dm +++ b/code/game/gamemodes/changeling/powers/fleshmend.dm @@ -7,7 +7,7 @@ req_stat = UNCONSCIOUS //Starts healing you every second for 10 seconds. Can be used whilst unconscious. -/obj/effect/proc_holder/changeling/fleshmend/sting_action(var/mob/living/user) +/obj/effect/proc_holder/changeling/fleshmend/sting_action(mob/living/user) user << "We begin to heal rapidly." spawn(0) if(ishuman(user)) diff --git a/code/game/gamemodes/changeling/powers/glands.dm b/code/game/gamemodes/changeling/powers/glands.dm index ca36093a9f7..a5a232ba346 100644 --- a/code/game/gamemodes/changeling/powers/glands.dm +++ b/code/game/gamemodes/changeling/powers/glands.dm @@ -5,7 +5,7 @@ dna_cost = 2 chemical_cost = -1 -/obj/effect/proc_holder/changeling/glands/on_purchase(var/mob/user) +/obj/effect/proc_holder/changeling/glands/on_purchase(mob/user) ..() var/datum/changeling/changeling=user.mind.changeling changeling.chem_storage += 25 diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm index a04b48ce627..076dde153ce 100644 --- a/code/game/gamemodes/changeling/powers/headcrab.dm +++ b/code/game/gamemodes/changeling/powers/headcrab.dm @@ -5,7 +5,7 @@ dna_cost = 1 req_human = 1 -/obj/effect/proc_holder/changeling/headcrab/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/headcrab/sting_action(mob/user) explosion(get_turf(user),0,0,2,0,silent=1) var/turf = get_turf(user) spawn(5) // So it's not killed in explosion diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index 6e7add1edf2..69a795ad9c4 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -58,7 +58,7 @@ var/list/datum/dna/hivemind_bank = list() chemical_cost = 10 dna_cost = -1 -/obj/effect/proc_holder/changeling/hivemind_download/can_sting(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/hivemind_download/can_sting(mob/living/carbon/user) if(!..()) return var/datum/changeling/changeling = user.mind.changeling @@ -67,7 +67,7 @@ var/list/datum/dna/hivemind_bank = list() return return 1 -/obj/effect/proc_holder/changeling/hivemind_download/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/hivemind_download/sting_action(mob/user) var/datum/changeling/changeling = user.mind.changeling var/list/names = list() for(var/datum/dna/DNA in hivemind_bank) diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm index 9cccaf83609..999aaf47bed 100644 --- a/code/game/gamemodes/changeling/powers/humanform.dm +++ b/code/game/gamemodes/changeling/powers/humanform.dm @@ -8,7 +8,7 @@ //Transform into a human. -/obj/effect/proc_holder/changeling/humanform/sting_action(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/humanform/sting_action(mob/living/carbon/user) var/datum/changeling/changeling = user.mind.changeling var/list/names = list() for(var/datum/dna/DNA in (changeling.absorbed_dna+changeling.protected_dna)) diff --git a/code/game/gamemodes/changeling/powers/lesserform.dm b/code/game/gamemodes/changeling/powers/lesserform.dm index b9220f4044b..310b470ff28 100644 --- a/code/game/gamemodes/changeling/powers/lesserform.dm +++ b/code/game/gamemodes/changeling/powers/lesserform.dm @@ -7,7 +7,7 @@ req_human = 1 //Transform into a monkey. -/obj/effect/proc_holder/changeling/lesserform/sting_action(var/mob/living/carbon/human/user) +/obj/effect/proc_holder/changeling/lesserform/sting_action(mob/living/carbon/human/user) if(!user || user.notransform) return 0 user << "Our genes cry out!" diff --git a/code/game/gamemodes/changeling/powers/mimic_voice.dm b/code/game/gamemodes/changeling/powers/mimic_voice.dm index 108e7d5fa01..d33532015ad 100644 --- a/code/game/gamemodes/changeling/powers/mimic_voice.dm +++ b/code/game/gamemodes/changeling/powers/mimic_voice.dm @@ -8,7 +8,7 @@ // Fake Voice -/obj/effect/proc_holder/changeling/mimicvoice/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/mimicvoice/sting_action(mob/user) var/datum/changeling/changeling=user.mind.changeling if(changeling.mimicing) changeling.mimicing = "" diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 2e5903420e7..5d8ef2f8963 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -20,7 +20,7 @@ var/weapon_type var/weapon_name_simple -/obj/effect/proc_holder/changeling/weapon/try_to_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/weapon/try_to_sting(mob/user, mob/target) if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh playsound(user, 'sound/effects/blobattack.ogg', 30, 1) qdel(user.l_hand) @@ -35,7 +35,7 @@ return ..(user, target) -/obj/effect/proc_holder/changeling/weapon/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/weapon/sting_action(mob/user) if(!user.drop_item()) user << "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!" return @@ -60,7 +60,7 @@ var/recharge_slowdown = 0 var/blood_on_castoff = 0 -/obj/effect/proc_holder/changeling/suit/try_to_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/suit/try_to_sting(mob/user, mob/target) var/datum/changeling/changeling = user.mind.changeling if(!ishuman(user) || !changeling) return @@ -85,7 +85,7 @@ return ..(H, target) -/obj/effect/proc_holder/changeling/suit/sting_action(var/mob/living/carbon/human/user) +/obj/effect/proc_holder/changeling/suit/sting_action(mob/living/carbon/human/user) if(!user.canUnEquip(user.wear_suit)) user << "\the [user.wear_suit] is stuck to your body, you cannot grow a [suit_name_simple] over it!" return @@ -188,7 +188,7 @@ weapon_type = /obj/item/weapon/shield/changeling weapon_name_simple = "shield" -/obj/effect/proc_holder/changeling/weapon/shield/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/weapon/shield/sting_action(mob/user) var/datum/changeling/changeling = user.mind.changeling //So we can read the absorbedcount. if(!changeling) return diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index ceb7fc8e311..b6880a371e7 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -7,7 +7,7 @@ req_stat = UNCONSCIOUS //Heals the things that the other regenerative abilities don't. -/obj/effect/proc_holder/changeling/panacea/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/panacea/sting_action(mob/user) user << "We cleanse impurities from our form." user.reagents.add_reagent("mutadone", 10) diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 7e9aaa79c37..ede5aa3e50b 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -4,7 +4,7 @@ req_stat = DEAD //Revive from revival stasis -/obj/effect/proc_holder/changeling/revive/sting_action(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/revive/sting_action(mob/living/carbon/user) if(user.stat == DEAD) dead_mob_list -= user living_mob_list += user diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index 8642feef895..92d6c84daee 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -7,7 +7,7 @@ req_human = 1 //A flashy ability, good for crowd control and sewing chaos. -/obj/effect/proc_holder/changeling/resonant_shriek/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/resonant_shriek/sting_action(mob/user) for(var/mob/living/M in get_hearers_in_view(4, user)) if(iscarbon(M)) if(!M.mind || !M.mind.changeling) @@ -35,7 +35,7 @@ dna_cost = 1 //A flashy ability, good for crowd control and sewing chaos. -/obj/effect/proc_holder/changeling/dissonant_shriek/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/dissonant_shriek/sting_action(mob/user) for(var/obj/machinery/light/L in range(5, usr)) L.on = 1 L.broken() diff --git a/code/game/gamemodes/changeling/powers/spiders.dm b/code/game/gamemodes/changeling/powers/spiders.dm index b081d4d2f79..dc3a5b40cea 100644 --- a/code/game/gamemodes/changeling/powers/spiders.dm +++ b/code/game/gamemodes/changeling/powers/spiders.dm @@ -7,7 +7,7 @@ req_dna = 5 //Makes some spiderlings. Good for setting traps and causing general trouble. -/obj/effect/proc_holder/changeling/spiders/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/spiders/sting_action(mob/user) for(var/i=0, i<2, i++) var/obj/effect/spider/spiderling/S = new(user.loc) S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter diff --git a/code/game/gamemodes/changeling/powers/strained_muscles.dm b/code/game/gamemodes/changeling/powers/strained_muscles.dm index 9ff9f870adc..94c96ad30bc 100644 --- a/code/game/gamemodes/changeling/powers/strained_muscles.dm +++ b/code/game/gamemodes/changeling/powers/strained_muscles.dm @@ -11,7 +11,7 @@ var/stacks = 0 //Increments every 5 seconds; damage increases over time var/active = 0 //Whether or not you are a hedgehog -/obj/effect/proc_holder/changeling/strained_muscles/sting_action(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/strained_muscles/sting_action(mob/living/carbon/user) active = !active if(active) user << "Our muscles tense and strengthen." diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 42c5dd83a5a..576a4102baa 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -13,13 +13,13 @@ unset_sting(user) return -/obj/effect/proc_holder/changeling/sting/proc/set_sting(var/mob/user) +/obj/effect/proc_holder/changeling/sting/proc/set_sting(mob/user) user << "We prepare our sting, use alt+click or middle mouse button on target to sting them." user.mind.changeling.chosen_sting = src user.hud_used.lingstingdisplay.icon_state = sting_icon user.hud_used.lingstingdisplay.invisibility = 0 -/obj/effect/proc_holder/changeling/sting/proc/unset_sting(var/mob/user) +/obj/effect/proc_holder/changeling/sting/proc/unset_sting(mob/user) user << "We retract our sting, we can't sting anyone for now." user.mind.changeling.chosen_sting = null user.hud_used.lingstingdisplay.icon_state = null @@ -29,7 +29,7 @@ if(mind && mind.changeling && mind.changeling.chosen_sting) src.mind.changeling.chosen_sting.unset_sting(src) -/obj/effect/proc_holder/changeling/sting/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/can_sting(mob/user, mob/target) if(!..()) return if(!user.mind.changeling.chosen_sting) @@ -48,7 +48,7 @@ return return 1 -/obj/effect/proc_holder/changeling/sting/sting_feedback(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/sting_feedback(mob/user, mob/target) if(!target) return user << "We stealthily sting [target.name]." @@ -78,7 +78,7 @@ return ..() -/obj/effect/proc_holder/changeling/sting/transformation/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/target) if(!..()) return if((target.disabilities & HUSK) || !check_dna_integrity(target)) @@ -86,7 +86,7 @@ return 0 return 1 -/obj/effect/proc_holder/changeling/sting/transformation/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/transformation/sting_action(mob/user, mob/target) add_logs(user, target, "stung", "transformation sting", " new identity is [selected_dna.real_name]") var/datum/dna/NewDNA = selected_dna if(ismonkey(target)) @@ -122,7 +122,7 @@ /obj/item/weapon/melee/arm_blade/false/afterattack(atom/target, mob/user, proximity) return -/obj/effect/proc_holder/changeling/sting/false_armblade/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/false_armblade/can_sting(mob/user, mob/target) if(!..()) return if((target.disabilities & HUSK) || !check_dna_integrity(target)) @@ -130,7 +130,7 @@ return 0 return 1 -/obj/effect/proc_holder/changeling/sting/false_armblade/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/false_armblade/sting_action(mob/user, mob/target) add_logs(user, target, "stung", object="falso armblade sting") if(!target.drop_item()) @@ -164,11 +164,11 @@ chemical_cost = 25 dna_cost = 0 -/obj/effect/proc_holder/changeling/sting/extract_dna/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/extract_dna/can_sting(mob/user, mob/target) if(..()) return user.mind.changeling.can_absorb_dna(user, target) -/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(var/mob/user, var/mob/living/carbon/human/target) +/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(mob/user, mob/living/carbon/human/target) add_logs(user, target, "stung", "extraction sting") if(!(user.mind.changeling.has_dna(target.dna))) user.mind.changeling.absorb_dna(target, user) @@ -183,7 +183,7 @@ chemical_cost = 20 dna_cost = 2 -/obj/effect/proc_holder/changeling/sting/mute/sting_action(var/mob/user, var/mob/living/carbon/target) +/obj/effect/proc_holder/changeling/sting/mute/sting_action(mob/user, mob/living/carbon/target) add_logs(user, target, "stung", "mute sting") target.silent += 30 feedback_add_details("changeling_powers","MS") @@ -197,7 +197,7 @@ chemical_cost = 25 dna_cost = 1 -/obj/effect/proc_holder/changeling/sting/blind/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/blind/sting_action(mob/user, mob/target) add_logs(user, target, "stung", "blind sting") target << "Your eyes burn horrifically!" target.disabilities |= NEARSIGHT @@ -214,7 +214,7 @@ chemical_cost = 10 dna_cost = 1 -/obj/effect/proc_holder/changeling/sting/LSD/sting_action(var/mob/user, var/mob/living/carbon/target) +/obj/effect/proc_holder/changeling/sting/LSD/sting_action(mob/user, mob/living/carbon/target) add_logs(user, target, "stung", "LSD sting") spawn(rand(300,600)) if(target) @@ -230,7 +230,7 @@ chemical_cost = 15 dna_cost = 2 -/obj/effect/proc_holder/changeling/sting/cryo/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/cryo/sting_action(mob/user, mob/target) add_logs(user, target, "stung", "cryo sting") if(target.reagents) target.reagents.add_reagent("frostoil", 30) diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm index 2f57a81ebb7..105c92c570c 100644 --- a/code/game/gamemodes/changeling/powers/transform.dm +++ b/code/game/gamemodes/changeling/powers/transform.dm @@ -8,7 +8,7 @@ max_genetic_damage = 3 //Change our DNA to that of somebody we've absorbed. -/obj/effect/proc_holder/changeling/transform/sting_action(var/mob/living/carbon/human/user) +/obj/effect/proc_holder/changeling/transform/sting_action(mob/living/carbon/human/user) var/datum/changeling/changeling = user.mind.changeling var/datum/dna/chosen_dna = changeling.select_dna("Select the target DNA: ", "Target DNA") diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 2e0b22314b8..b236141c7f3 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -60,7 +60,7 @@ ..() return -/datum/game_mode/traitor/changeling/make_antag_chance(var/mob/living/carbon/human/character) //Assigns changeling to latejoiners +/datum/game_mode/traitor/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners var/changelingcap = min( round(joined_player_list.len/(config.changeling_scaling_coeff*4))+2, round(joined_player_list.len/(config.changeling_scaling_coeff*2)) ) if(ticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists ..() diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 990e9d1bdb5..50fac253f91 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -7,7 +7,7 @@ var/list/cult_objectives = list() -/proc/iscultist(mob/living/M as mob) +/proc/iscultist(mob/living/M) return istype(M) && M.mind && ticker && ticker.mode && (M.mind in ticker.mode.cult) /proc/is_convertable_to_cult(datum/mind/mind) @@ -19,7 +19,7 @@ if(mind.current == ticker.mode.sacrifice_target) return 0 return 1 -/proc/cultist_commune(var/mob/living/user, var/clear = 0, var/say = 0, var/message) +/proc/cultist_commune(mob/living/user, clear = 0, say = 0, message) if(!message) return if(say) @@ -128,7 +128,7 @@ ..() -/datum/game_mode/cult/proc/memorize_cult_objectives(var/datum/mind/cult_mind) +/datum/game_mode/cult/proc/memorize_cult_objectives(datum/mind/cult_mind) for(var/obj_count = 1,obj_count <= cult_objectives.len,obj_count++) var/explanation switch(cult_objectives[obj_count]) @@ -195,7 +195,7 @@ // startwords -= word // return ..(cult_mob,word) -/datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word) +/datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, word) if(!wordtravel) runerandom() if (!word) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index bfdacd24ad3..6aaeba71931 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -11,7 +11,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/weapon/melee/cultblade/attack(mob/living/target as mob, mob/living/carbon/human/user as mob) +/obj/item/weapon/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user) if(iscultist(user)) return ..() else @@ -23,7 +23,7 @@ user.update_damage_overlays(0) return -/obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob) +/obj/item/weapon/melee/cultblade/pickup(mob/living/user) if(!iscultist(user)) user << "An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly." user.Dizzy(120) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 500f4d27b6a..e146e9b349a 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -145,7 +145,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", -/obj/effect/rune/attackby(I as obj, user as mob, params) +/obj/effect/rune/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/tome) && iscultist(user)) user << "You retrace your steps, carefully undoing the lines of the rune." qdel(src) @@ -157,7 +157,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return -/obj/effect/rune/attack_hand(mob/living/user as mob) // OH GOD this is horrible +/obj/effect/rune/attack_hand(mob/living/user) // OH GOD this is horrible if(!iscultist(user)) user << "You can't mouth the arcane scratchings without fumbling over them!" return @@ -221,7 +221,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return fizzle(user) -/obj/effect/rune/proc/fizzle(var/mob/living/cultist = null) +/obj/effect/rune/proc/fizzle(mob/living/cultist = null) var/gibberish = pick("B'ADMINES SP'WNIN SH'T","IC'IN O'OC","RO'SHA'M I'SA GRI'FF'N ME'AI","TOX'IN'S O'NM FI'RAH","IA BL'AME TOX'IN'S","FIR'A NON'AN RE'SONA","A'OI I'RS ROUA'GE","LE'OAN JU'STA SP'A'C Z'EE SH'EF","IA PT'WOBEA'RD, IA A'DMI'NEH'LP") if(cultist) @@ -489,7 +489,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // usr << "whatev" // usr << browse(null, "window=tank") -/obj/item/weapon/tome/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/weapon/tome/attack(mob/living/M, mob/living/user) if(istype(M,/mob/dead)) M.invisibility = 0 user.visible_message( \ @@ -516,7 +516,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", add_logs(user, M, "smacked", src) -/obj/item/weapon/tome/attack_self(mob/living/user as mob) +/obj/item/weapon/tome/attack_self(mob/living/user) usr = user if(!usr.canmove || usr.stat || usr.restrained()) return @@ -649,7 +649,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", user << "The book seems full of illegible scribbles. Is this a joke?" return -/obj/item/weapon/tome/attackby(obj/item/weapon/tome/T as obj, mob/living/user as mob, params) +/obj/item/weapon/tome/attackby(obj/item/weapon/tome/T, mob/living/user, params) if(istype(T, /obj/item/weapon/tome)) // sanity check to prevent a runtime error switch(alert("Copy the runes from your tome?",,"Copy", "Cancel")) if("cancel") diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 855647ffabc..56b4044c7f2 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -6,7 +6,7 @@ var/list/sacrificed = list() ///Teleport: Teleports the user to a random teleport rune with the same rune. Can be imbued into a talisman. -/obj/effect/rune/proc/teleport(var/key) +/obj/effect/rune/proc/teleport(key) var/mob/living/user = usr var/allrunesloc[] allrunesloc = new/list() @@ -42,7 +42,7 @@ var/list/sacrificed = list() //Subtype of teleport, teleports any items and mobs on top of the rune rather than the user themselves -/obj/effect/rune/proc/itemport(var/key) +/obj/effect/rune/proc/itemport(key) // var/allrunesloc[] // allrunesloc = new/list() // var/index = 0 @@ -184,7 +184,7 @@ var/list/sacrificed = list() ///EMP: Lets out a large EMP blast -/obj/effect/rune/proc/emp(var/U,var/range_red) //range_red - var which determines by which number to reduce the default emp range, U is the source loc, needed because of talisman emps which are held in hand at the moment of using and that apparently messes things up -- Urist +/obj/effect/rune/proc/emp(U,range_red) //range_red - var which determines by which number to reduce the default emp range, U is the source loc, needed because of talisman emps which are held in hand at the moment of using and that apparently messes things up -- Urist if(istype(src,/obj/effect/rune)) usr.say("Ta'gh fara[pick("'","`")]qha fel d'amar det!") else @@ -323,7 +323,7 @@ var/list/sacrificed = list() ///Veil: Makes all surrounding runes invisible. They cannot be used directly but still used indirectly (i.e. teleport...) -/obj/effect/rune/proc/obscure(var/rad) +/obj/effect/rune/proc/obscure(rad) var/S=0 for(var/obj/effect/rune/R in orange(rad,src)) if(R!=src) @@ -638,14 +638,14 @@ var/list/sacrificed = list() for(var/mob/victim in src.loc) //TO-DO: Move the shite above into the mob's own sac_act - see /mob/living/simple_animal/pet/corgi/sac_act for an example victim.sac_act(src, victim) //Sacrifice procs are now seperate per mob, this allows us to allow sacrifice on as many mob types as we want without making an already clunky system worse -/obj/effect/rune/proc/sac_grant_word(var/mob/living/C) //The proc that which chooses a word rewarded for a successful sacrifice, sacrifices always give a currently unknown word if the normal checks pass +/obj/effect/rune/proc/sac_grant_word(mob/living/C) //The proc that which chooses a word rewarded for a successful sacrifice, sacrifices always give a currently unknown word if the normal checks pass if(C.mind.cult_words.len != ticker.mode.allwords.len) // No point running if they already know everything var/convert_word var/pick_list = ticker.mode.allwords - C.mind.cult_words convert_word = pick(pick_list) ticker.mode.grant_runeword(C, convert_word) -/obj/effect/rune/proc/stone_or_gib(var/mob/T) +/obj/effect/rune/proc/stone_or_gib(mob/T) var/obj/item/device/soulstone/stone = new /obj/item/device/soulstone(get_turf(src)) if(!stone.transfer_soul("FORCE", T, usr)) //if it fails to add soul qdel(stone) @@ -659,7 +659,7 @@ var/list/sacrificed = list() ///Reveal: Reverses the Veil rune's effect, revealing all hidden runes. -/obj/effect/rune/proc/revealrunes(var/obj/W as obj) +/obj/effect/rune/proc/revealrunes(obj/W) var/go=0 var/rad var/S=0 @@ -928,7 +928,7 @@ var/list/sacrificed = list() ///Stun: Everyone nearby would be stunned for a -very- short time. If used in a talisman, it stuns and mutes a single target. -/obj/effect/rune/proc/runestun(var/mob/living/T as mob) +/obj/effect/rune/proc/runestun(mob/living/T) if(istype(src,/obj/effect/rune)) ///When invoked as rune, flash and stun everyone around. usr.say("Fuu ma[pick("'","`")]jin!") for(var/mob/living/L in viewers(src)) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 1fd9ea37360..76e97bc7371 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -3,7 +3,7 @@ var/imbue = null var/uses = 0 - attack_self(mob/living/user as mob) + attack_self(mob/living/user) if(iscultist(user)) var/delete = 1 switch(imbue) @@ -42,7 +42,7 @@ return - attack(mob/living/carbon/T as mob, mob/living/user as mob) + attack(mob/living/carbon/T, mob/living/user) if(iscultist(user)) if(imbue == "runestun") user.take_organ_damage(10, 0) @@ -55,7 +55,7 @@ ..() - proc/supply(var/key) + proc/supply(key) if (!src.uses) qdel(src) return diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index fa24f0be0f7..6aa1574b4e2 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -72,7 +72,7 @@ ///post_setup() ///Everyone should now be on the station and have their normal gear. This is the place to give the special roles extra things -/datum/game_mode/proc/post_setup(var/report=1) +/datum/game_mode/proc/post_setup(report=1) spawn (ROUNDSTART_LOGOUT_REPORT_TIME) display_roundstart_logout_report() @@ -91,7 +91,7 @@ ///make_antag_chance() ///Handles late-join antag assignments -/datum/game_mode/proc/make_antag_chance(var/mob/living/carbon/human/character) +/datum/game_mode/proc/make_antag_chance(mob/living/carbon/human/character) if(replacementmode && round_converted == 2) replacementmode.make_antag_chance(character) return @@ -287,7 +287,7 @@ set_security_level(SEC_LEVEL_BLUE) -/datum/game_mode/proc/get_players_for_role(var/role) +/datum/game_mode/proc/get_players_for_role(role) var/list/players = list() var/list/candidates = list() var/list/drafted = list() @@ -471,7 +471,7 @@ if(M.client && M.client.holder) M << msg -/datum/game_mode/proc/printplayer(var/datum/mind/ply) +/datum/game_mode/proc/printplayer(datum/mind/ply) var/role = "\improper[ply.assigned_role]" var/text = "
      [ply.name]([ply.key]) as \a [role] (" if(ply.current) @@ -487,7 +487,7 @@ return text -/datum/game_mode/proc/printobjectives(var/datum/mind/ply) +/datum/game_mode/proc/printobjectives(datum/mind/ply) var/text = "" var/count = 1 for(var/datum/objective/objective in ply.objectives) diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index 206a1f7d230..6475565527e 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -48,7 +48,7 @@ else SSmachine.processing -= src -/obj/machinery/dominator/proc/healthcheck(var/damage) +/obj/machinery/dominator/proc/healthcheck(damage) var/iconname = "dominator" if(gang) iconname += "-[gang.color]" @@ -128,7 +128,7 @@ healthcheck(30) return -/obj/machinery/dominator/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/dominator/bullet_act(obj/item/projectile/Proj) if(Proj.damage) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) var/damage = Proj.damage @@ -142,7 +142,7 @@ /obj/machinery/dominator/blob_act() healthcheck(110) -/obj/machinery/dominator/attackby(I as obj, user as mob, params) +/obj/machinery/dominator/attackby(obj/I, mob/user, params) return @@ -195,7 +195,7 @@ "You hear metal scraping.") healthcheck(15) -/obj/machinery/dominator/attack_animal(mob/living/user as mob) +/obj/machinery/dominator/attack_animal(mob/living/user) if(!isanimal(user)) return var/mob/living/simple_animal/M = user @@ -218,7 +218,7 @@ "You hear metal being slammed.") healthcheck(5) -/obj/machinery/dominator/attackby(obj/item/weapon/I as obj, mob/living/user as mob, params) +/obj/machinery/dominator/attackby(obj/item/weapon/I, mob/living/user, params) if(istype(I, /obj/item/weapon)) add_fingerprint(user) user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 3b46ffd0330..b9ee7887e88 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -77,13 +77,13 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" ..() -/datum/game_mode/proc/forge_gang_objectives(var/datum/mind/boss_mind) +/datum/game_mode/proc/forge_gang_objectives(datum/mind/boss_mind) var/datum/objective/rival_obj = new rival_obj.owner = boss_mind rival_obj.explanation_text = "Be the first gang to successfully takeover the station with a Dominator." boss_mind.objectives += rival_obj -/datum/game_mode/proc/greet_gang(var/datum/mind/boss_mind, var/you_are=1) +/datum/game_mode/proc/greet_gang(datum/mind/boss_mind, you_are=1) var/obj_count = 1 if (you_are) boss_mind.current << "You are the Boss of the [boss_mind.gang_datum.name] Gang!" @@ -147,7 +147,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" /////////////////////////////////////////// //Deals with converting players to a gang// /////////////////////////////////////////// -/datum/game_mode/proc/add_gangster(datum/mind/gangster_mind, var/datum/gang/G, var/check = 1) +/datum/game_mode/proc/add_gangster(datum/mind/gangster_mind, datum/gang/G, check = 1) if(!G || (gangster_mind in get_all_gangsters())) return 0 if(check && isloyal(gangster_mind.current)) //Check to see if the potential gangster is implanted @@ -171,7 +171,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" //////////////////////////////////////////////////////////////////// //Deals with players reverting to neutral (Not a gangster anymore)// //////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/remove_gangster(datum/mind/gangster_mind, var/beingborged, var/silent, var/remove_bosses=0) +/datum/game_mode/proc/remove_gangster(datum/mind/gangster_mind, beingborged, silent, remove_bosses=0) var/datum/gang/gang = gangster_mind.gang_datum if(!gang) return 0 @@ -255,7 +255,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" -/datum/game_mode/proc/gang_membership_report(var/list/membership) +/datum/game_mode/proc/gang_membership_report(list/membership) var/text = "" for(var/datum/mind/gang_mind in membership) text += "
      [gang_mind.key] was [gang_mind.name] (" diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm index 9fda51eb919..99fce43f8e6 100644 --- a/code/game/gamemodes/gang/gang_datum.dm +++ b/code/game/gamemodes/gang/gang_datum.dm @@ -55,7 +55,7 @@ ganghud.leave_hud(defector_mind.current) ticker.mode.set_antag_hud(defector_mind.current, null) -/datum/gang/proc/domination(var/modifier=1) +/datum/gang/proc/domination(modifier=1) dom_timer = get_domination_time(src) * modifier set_security_level("delta") SSshuttle.emergencyNoEscape = 1 @@ -64,7 +64,7 @@ //Used by recallers when purchasing a gang outfit. First time a gang outfit is purchased the buyer decides a gang style which is stored so gang outfits are uniform -/datum/gang/proc/gang_outfit(mob/living/carbon/user,var/obj/item/device/gangtool/gangtool) +/datum/gang/proc/gang_outfit(mob/living/carbon/user,obj/item/device/gangtool/gangtool) if(!user || !gangtool) return 0 if(!gangtool.can_use(user)) @@ -110,7 +110,7 @@ //////////////////////////////////////////// MESSAGING -/datum/gang/proc/message_gangtools(var/message,var/beep=1,var/warning) +/datum/gang/proc/message_gangtools(message,beep=1,warning) if(!gangtools.len || !message) return for(var/obj/item/device/gangtool/tool in gangtools) diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm index 6cfc0a742ad..dafdb485cd5 100644 --- a/code/game/gamemodes/gang/recaller.dm +++ b/code/game/gamemodes/gang/recaller.dm @@ -313,7 +313,7 @@ attack_self(usr) -/obj/item/device/gangtool/proc/ping_gang(var/mob/user) +/obj/item/device/gangtool/proc/ping_gang(mob/user) if(!user) return var/message = stripped_input(user,"Discreetly send a gang-wide message.","Send Message") as null|text @@ -335,7 +335,7 @@ log_game("[key_name(user)] Messaged [gang.name] Gang: [message].") -/obj/item/device/gangtool/proc/register_device(var/mob/user) +/obj/item/device/gangtool/proc/register_device(mob/user) if(gang) //It's already been registered! return if((promotable && (user.mind in ticker.mode.get_gangsters())) || (user.mind in ticker.mode.get_gang_bosses())) diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index 730fff0d91a..2b16b298975 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -55,7 +55,7 @@ ) -/datum/intercept_text/proc/build(var/mode_type, datum/mind/correct_person) +/datum/intercept_text/proc/build(mode_type, datum/mind/correct_person) switch(mode_type) if("revolution") src.text = "" diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index e89be96093c..c88dc2d2f99 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -225,7 +225,7 @@ power_type = /mob/living/silicon/ai/proc/overload_machine -/mob/living/silicon/ai/proc/overload_machine(obj/machinery/M as obj in world) +/mob/living/silicon/ai/proc/overload_machine(obj/machinery/M in world) set name = "Overload Machine" set category = "Malfunction" @@ -255,7 +255,7 @@ power_type = /mob/living/silicon/ai/proc/override_machine -/mob/living/silicon/ai/proc/override_machine(obj/machinery/M as obj in world) +/mob/living/silicon/ai/proc/override_machine(obj/machinery/M in world) set name = "Override Machine" set category = "Malfunction" @@ -380,7 +380,7 @@ power_type = /mob/living/silicon/ai/proc/reactivate_camera -/mob/living/silicon/ai/proc/reactivate_camera(obj/machinery/camera/C as obj in cameranet.cameras) +/mob/living/silicon/ai/proc/reactivate_camera(obj/machinery/camera/C in cameranet.cameras) set name = "Reactivate Camera" set category = "Malfunction" @@ -408,7 +408,7 @@ power_type = /mob/living/silicon/ai/proc/upgrade_camera -/mob/living/silicon/ai/proc/upgrade_camera(obj/machinery/camera/C as obj in cameranet.cameras) +/mob/living/silicon/ai/proc/upgrade_camera(obj/machinery/camera/C in cameranet.cameras) set name = "Upgrade Camera" set category = "Malfunction" @@ -458,13 +458,13 @@ if(AM.power_type != null) src.possible_modules += AM -/datum/module_picker/proc/remove_verbs(var/mob/living/silicon/ai/A) +/datum/module_picker/proc/remove_verbs(mob/living/silicon/ai/A) for(var/datum/AI_Module/AM in possible_modules) A.verbs.Remove(AM.power_type) -/datum/module_picker/proc/use(user as mob) +/datum/module_picker/proc/use(mob/user) var/dat dat = "Select use of processing time: (currently #[src.processing_time] left.)
      " dat += "
      " diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 6d0feda4a1e..e6b7500a866 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -29,7 +29,7 @@ required_players = max(required_enemies+1, required_players) //to prevent issues if players are set too low return ..() -/datum/game_mode/malfunction/get_players_for_role(var/role = BE_MALF) +/datum/game_mode/malfunction/get_players_for_role(role = BE_MALF) var/datum/job/ai/DummyAIjob = new for(var/mob/new_player/player in player_list) if(player.client && player.ready) @@ -71,7 +71,7 @@ ..() -/datum/game_mode/proc/greet_malf(var/datum/mind/malf) +/datum/game_mode/proc/greet_malf(datum/mind/malf) malf.current << "You are malfunctioning! You do not have to follow any laws." malf.current << "The crew do not know you have malfunctioned. You may keep it a secret or go wild." malf.current << "You must override the programming of the station's APCs to assume full control of the station." diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index eb00c258223..f6dd06738a5 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -20,11 +20,11 @@ //Meteor spawning global procs /////////////////////////////// -/proc/spawn_meteors(var/number = 10, var/list/meteortypes) +/proc/spawn_meteors(number = 10, list/meteortypes) for(var/i = 0; i < number; i++) spawn_meteor(meteortypes) -/proc/spawn_meteor(var/list/meteortypes) +/proc/spawn_meteor(list/meteortypes) var/turf/pickedstart var/turf/pickedgoal var/max_i = 10//number of tries to spawn meteor. @@ -133,7 +133,7 @@ playsound(src.loc, meteorsound, 40, 1) get_hit() -/obj/effect/meteor/proc/ram_turf(var/turf/T) +/obj/effect/meteor/proc/ram_turf(turf/T) //first bust whatever is in the turf for(var/atom/A in T) if(A != src) @@ -157,7 +157,7 @@ /obj/effect/meteor/ex_act() return -/obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/effect/meteor/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/pickaxe)) qdel(src) return @@ -168,7 +168,7 @@ var/obj/item/O = new meteordrop(get_turf(src)) O.throw_at(dest, 5, 10) -/obj/effect/meteor/proc/meteor_effect(var/sound=1) +/obj/effect/meteor/proc/meteor_effect(sound=1) if(sound) for(var/mob/M in player_list) var/turf/T = get_turf(M) @@ -257,7 +257,7 @@ new meteorgibs(get_turf(src)) -/obj/effect/meteor/meaty/ram_turf(var/turf/T) +/obj/effect/meteor/meaty/ram_turf(turf/T) if(!istype(T, /turf/space)) new /obj/effect/decal/cleanable/blood (T) @@ -271,7 +271,7 @@ meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno meteorgibs = /obj/effect/gibspawner/xeno -/obj/effect/meteor/meaty/xeno/ram_turf(var/turf/T) +/obj/effect/meteor/meaty/xeno/ram_turf(turf/T) if(!istype(T, /turf/space)) new /obj/effect/decal/cleanable/xenoblood (T) diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm index d27155825c0..647230a4963 100644 --- a/code/game/gamemodes/monkey/monkey.dm +++ b/code/game/gamemodes/monkey/monkey.dm @@ -45,7 +45,7 @@ Monkeys: Ensure that your kind lives on! Rise up against your captors!      " -/datum/game_mode/monkey/proc/greet_carrier(var/datum/mind/carrier) +/datum/game_mode/monkey/proc/greet_carrier(datum/mind/carrier) carrier.current << "You are the Jungle Fever patient zero!!" carrier.current << "You have been planted onto this station by the Animal Rights Consortium." carrier.current << "Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite." diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index f549e8c8815..45f5ca57397 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -109,7 +109,7 @@ return ..() -/datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code) +/datum/game_mode/proc/prepare_syndicate_leader(datum/mind/synd_mind, nuke_code) var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord") spawn(1) NukeNameAssign(nukelastname(synd_mind.current),syndicates) //allows time for the rest of the syndies to be chosen @@ -138,13 +138,13 @@ return -/datum/game_mode/proc/forge_syndicate_objectives(var/datum/mind/syndicate) +/datum/game_mode/proc/forge_syndicate_objectives(datum/mind/syndicate) var/datum/objective/nuclear/syndobj = new syndobj.owner = syndicate syndicate.objectives += syndobj -/datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1) +/datum/game_mode/proc/greet_syndicate(datum/mind/syndicate, you_are=1) if (you_are) syndicate.current << "You are a [syndicate_name()] agent!" var/obj_count = 1 @@ -316,7 +316,7 @@ return 1 -/proc/nukelastname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho. +/proc/nukelastname(mob/M) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho. var/randomname = pick(last_names) var/newname = copytext(sanitize(input(M,"You are the nuke operative [pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")]. Please choose a last name for your family.", "Name change",randomname)),1,MAX_NAME_LEN) @@ -330,7 +330,7 @@ return capitalize(newname) -/proc/NukeNameAssign(var/lastname,var/list/syndicates) +/proc/NukeNameAssign(lastname,list/syndicates) for(var/datum/mind/synd_mind in syndicates) var/mob/living/carbon/human/H = synd_mind.current synd_mind.name = H.dna.species.random_name(H.gender,0,lastname) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 3adb24a8a0c..ff133d7980c 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -212,13 +212,13 @@ var/bomb_set attack_hand(M) return -/obj/machinery/nuclearbomb/attack_paw(mob/user as mob) +/obj/machinery/nuclearbomb/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/nuclearbomb/attack_ai(mob/user as mob) +/obj/machinery/nuclearbomb/attack_ai(mob/user) return -/obj/machinery/nuclearbomb/attack_hand(mob/user as mob) +/obj/machinery/nuclearbomb/attack_hand(mob/user) user.set_machine(src) var/dat = text("\nAuth. Disk: []
      ", src, (auth ? "++++++++++" : "----------")) if (auth) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index b63b140982c..2d145a525d4 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -167,7 +167,7 @@ var/obj/docking_port/mobile/home -/obj/item/weapon/pinpointer/nukeop/attack_self(mob/user as mob) +/obj/item/weapon/pinpointer/nukeop/attack_self(mob/user) if(!active) active = 1 var/mode_text = "Authentication Disk Locator mode" diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 109b8b2770d..0ea208a2fcd 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -352,7 +352,7 @@ var/global/list/possible_items = list() approved_targets += possible_item return set_target(safepick(approved_targets)) -/datum/objective/steal/proc/set_target(var/datum/objective_item/item) +/datum/objective/steal/proc/set_target(datum/objective_item/item) if(item) targetinfo = item @@ -428,7 +428,7 @@ var/global/list/possible_items_special = list() /datum/objective/steal/exchange dangerrating = 10 -/datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) +/datum/objective/steal/exchange/proc/set_faction(faction,otheragent) target = otheragent if(faction == "red") targetinfo = new/datum/objective_item/unique/docs_blue @@ -449,7 +449,7 @@ var/global/list/possible_items_special = list() /datum/objective/steal/exchange/backstab dangerrating = 3 -/datum/objective/steal/exchange/backstab/set_faction(var/faction) +/datum/objective/steal/exchange/backstab/set_faction(faction) if(faction == "red") targetinfo = new/datum/objective_item/unique/docs_red else if(faction == "blue") @@ -537,7 +537,7 @@ var/global/list/possible_items_special = list() /datum/objective/absorb dangerrating = 10 -/datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6) +/datum/objective/absorb/proc/gen_amount_goal(lowbound = 4, highbound = 6) target_amount = rand (lowbound,highbound) if (ticker) var/n_p = 1 //autowin diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index e1d07164042..430b4c405f7 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -91,7 +91,7 @@ difficulty = 3 excludefromjob = list("Chief Engineer","Research Director","Station Engineer","Scientist","Atmospheric Technician") -/datum/objective_item/plasma/check_special_completion(var/obj/item/weapon/tank/T) +/datum/objective_item/plasma/check_special_completion(obj/item/weapon/tank/T) var/target_amount = text2num(name) var/found_amount = 0 found_amount += T.air_contents.toxins @@ -103,7 +103,7 @@ targetitem = /obj/item/device/aicard difficulty = 20 //beyond the impossible -/datum/objective_item/functionalai/check_special_completion(var/obj/item/device/aicard/C) +/datum/objective_item/functionalai/check_special_completion(obj/item/device/aicard/C) for(var/mob/living/silicon/ai/A in C) if(istype(A, /mob/living/silicon/ai) && A.stat != 2) //See if any AI's are alive inside that card. return 1 @@ -116,7 +116,7 @@ excludefromjob = list("Chief Engineer") altitems = list(/obj/item/weapon/photo) -/datum/objective_item/blueprints/check_special_completion(var/obj/item/I) +/datum/objective_item/blueprints/check_special_completion(obj/item/I) if(istype(I, /obj/item/areaeditor/blueprints)) return 1 if(istype(I, /obj/item/weapon/photo)) @@ -131,7 +131,7 @@ difficulty = 3 excludefromjob = list("Research Director","Scientist") -/datum/objective_item/slime/check_special_completion(var/obj/item/slime_extract/E) +/datum/objective_item/slime/check_special_completion(obj/item/slime_extract/E) if(E.Uses > 0) return 1 return 0 @@ -189,7 +189,7 @@ targetitem = /obj/item/stack/sheet/cardboard difficulty = 9001 -/datum/objective_item/stack/check_special_completion(var/obj/item/stack/S) +/datum/objective_item/stack/check_special_completion(obj/item/stack/S) var/target_amount = text2num(name) var/found_amount = 0 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 58d915a0559..c198a583328 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -95,7 +95,7 @@ return 0 -/datum/game_mode/proc/forge_revolutionary_objectives(var/datum/mind/rev_mind) +/datum/game_mode/proc/forge_revolutionary_objectives(datum/mind/rev_mind) var/list/heads = get_living_heads() for(var/datum/mind/head_mind in heads) var/datum/objective/mutiny/rev_obj = new @@ -104,7 +104,7 @@ rev_obj.explanation_text = "Assassinate or exile [head_mind.name], the [head_mind.assigned_role]." rev_mind.objectives += rev_obj -/datum/game_mode/proc/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1) +/datum/game_mode/proc/greet_revolutionary(datum/mind/rev_mind, you_are=1) var/obj_count = 1 if (you_are) rev_mind.current << "You are a member of the revolutionaries' leadership!" @@ -150,7 +150,7 @@ ///////////////////////////////// //Gives head revs their targets// ///////////////////////////////// -/datum/game_mode/revolution/proc/mark_for_death(var/datum/mind/rev_mind, var/datum/mind/head_mind) +/datum/game_mode/revolution/proc/mark_for_death(datum/mind/rev_mind, datum/mind/head_mind) var/datum/objective/mutiny/rev_obj = new rev_obj.owner = rev_mind rev_obj.target = head_mind diff --git a/code/game/gamemodes/shadowling/ascendant_shadowling.dm b/code/game/gamemodes/shadowling/ascendant_shadowling.dm index dbc93ef2273..c0dc989a7b3 100644 --- a/code/game/gamemodes/shadowling/ascendant_shadowling.dm +++ b/code/game/gamemodes/shadowling/ascendant_shadowling.dm @@ -32,7 +32,7 @@ faction = list("faithless") -/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(movement_dir = 0) return 1 //copypasta from carp code /mob/living/simple_animal/ascendant_shadowling/get_spans() diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 7cfd5f675d9..52fb5a2899e 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -112,14 +112,14 @@ Made by Xhuis ..() return -/datum/game_mode/proc/greet_shadow(var/datum/mind/shadow) +/datum/game_mode/proc/greet_shadow(datum/mind/shadow) shadow.current << "Currently, you are disguised as an employee aboard [world.name]." shadow.current << "In your limited state, you have three abilities: Enthrall, Hatch, and Hivemind Commune." shadow.current << "Any other shadowlings are you allies. You must assist them as they shall assist you." shadow.current << "If you are new to shadowling, or want to read about abilities, check the wiki page at https://tgstation13.org/wiki/Shadowling
      " -/datum/game_mode/proc/process_shadow_objectives(var/datum/mind/shadow_mind) +/datum/game_mode/proc/process_shadow_objectives(datum/mind/shadow_mind) var/objective = "enthrall" //may be devour later, but for now it seems murderbone-y if(objective == "enthrall") @@ -129,7 +129,7 @@ Made by Xhuis shadow_mind.current << "Objective #1: [objective_explanation]
      " -/datum/game_mode/proc/finalize_shadowling(var/datum/mind/shadow_mind) +/datum/game_mode/proc/finalize_shadowling(datum/mind/shadow_mind) var/mob/living/carbon/human/S = shadow_mind.current shadow_mind.current.verbs += /mob/living/carbon/human/proc/shadowling_hatch shadow_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/enthrall diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index dbc3715dfb5..ad849f8e924 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -38,7 +38,7 @@ range = 5 var/blacklisted_lights = list(/obj/item/device/flashlight/flare, /obj/item/device/flashlight/slime) -/obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishItem(var/obj/item/I) //WARNING NOT SUFFICIENT TO EXTINGUISH AN ITEM HELD BY A MOB +/obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishItem(obj/item/I) //WARNING NOT SUFFICIENT TO EXTINGUISH AN ITEM HELD BY A MOB if(istype(I, /obj/item/device/flashlight)) var/obj/item/device/flashlight/F = I if(F.on) @@ -53,7 +53,7 @@ I.SetLuminosity(0) return I.luminosity -/obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishMob(var/mob/living/H) +/obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishMob(mob/living/H) var/blacklistLuminosity = 0 for(var/obj/item/F in H) blacklistLuminosity += extinguishItem(F) @@ -375,7 +375,7 @@ datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowl color = "#000000" //Complete black (RGB: 0, 0, 0) metabolization_rate = 100 //lel -/datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) +/datum/reagent/shadowling_blindness_smoke/on_mob_life(mob/living/M) if(!M) M = holder.my_atom if(!is_shadow_or_thrall(M)) M << "You breathe in the black smoke, and your eyes burn horribly!" @@ -441,7 +441,7 @@ datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowl var/targetsDrained var/list/nearbyTargets -/obj/effect/proc_holder/spell/aoe_turf/drainLife/cast(list/targets, var/mob/living/carbon/human/U = usr) +/obj/effect/proc_holder/spell/aoe_turf/drainLife/cast(list/targets, mob/living/carbon/human/U = usr) targetsDrained = 0 nearbyTargets = list() for(var/turf/T in targets) diff --git a/code/game/gamemodes/shadowling/shadowling_items.dm b/code/game/gamemodes/shadowling/shadowling_items.dm index 01e0f5ae928..3d35167214f 100644 --- a/code/game/gamemodes/shadowling/shadowling_items.dm +++ b/code/game/gamemodes/shadowling/shadowling_items.dm @@ -94,7 +94,7 @@ sleep(100) qdel(src) -/obj/structure/shadow_vortex/Crossed(var/td) +/obj/structure/shadow_vortex/Crossed(td) ..() if(ismob(td)) td << "You enter the rift. Sickening chimes begin to jangle in your ears. \ diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index d614da9b9ca..e444726bfa7 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -28,7 +28,7 @@ target_list[traitor] = traitors[i + 1] ..() -/datum/game_mode/traitor/double_agents/forge_traitor_objectives(var/datum/mind/traitor) +/datum/game_mode/traitor/double_agents/forge_traitor_objectives(datum/mind/traitor) if(target_list.len && target_list[traitor]) // Is a double agent @@ -48,7 +48,7 @@ ..() // Give them standard objectives. return -/datum/game_mode/traitor/double_agents/add_latejoin_traitor(var/datum/mind/character) +/datum/game_mode/traitor/double_agents/add_latejoin_traitor(datum/mind/character) check_potential_agents() diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 6c7b57edd47..e45a673a364 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -69,7 +69,7 @@ ..() return 1 -/datum/game_mode/traitor/make_antag_chance(var/mob/living/carbon/human/character) //Assigns traitor to latejoiners +/datum/game_mode/traitor/make_antag_chance(mob/living/carbon/human/character) //Assigns traitor to latejoiners var/traitorcap = min(round(joined_player_list.len / (config.traitor_scaling_coeff * 2)) + 2 + num_modifier, round(joined_player_list.len/config.traitor_scaling_coeff) + num_modifier ) if(ticker.mode.traitors.len >= traitorcap) //Upper cap for number of latejoin antagonists return @@ -80,11 +80,11 @@ if(!(character.job in restricted_jobs)) add_latejoin_traitor(character.mind) -/datum/game_mode/traitor/proc/add_latejoin_traitor(var/datum/mind/character) +/datum/game_mode/traitor/proc/add_latejoin_traitor(datum/mind/character) character.make_Traitor() -/datum/game_mode/proc/forge_traitor_objectives(var/datum/mind/traitor) +/datum/game_mode/proc/forge_traitor_objectives(datum/mind/traitor) if(istype(traitor.current, /mob/living/silicon)) var/objective_count = 0 @@ -169,7 +169,7 @@ -/datum/game_mode/proc/greet_traitor(var/datum/mind/traitor) +/datum/game_mode/proc/greet_traitor(datum/mind/traitor) traitor.current << "You are the [traitor_name]." var/obj_count = 1 for(var/datum/objective/objective in traitor.objectives) @@ -272,7 +272,7 @@ return 1 -/datum/game_mode/proc/equip_traitor(mob/living/carbon/human/traitor_mob, var/safety = 0) +/datum/game_mode/proc/equip_traitor(mob/living/carbon/human/traitor_mob, safety = 0) if (!istype(traitor_mob)) return . = 1 @@ -325,7 +325,7 @@ if(!safety)//If they are not a rev. Can be added on to. give_codewords(traitor_mob) -/datum/game_mode/proc/assign_exchange_role(var/datum/mind/owner) +/datum/game_mode/proc/assign_exchange_role(datum/mind/owner) //set faction var/faction = "red" if(owner == exchange_blue) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 3fb8fe34f4b..639ae937977 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -20,7 +20,7 @@ var/rend_desc = "You should run now." var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning -/obj/item/weapon/veilrender/attack_self(mob/user as mob) +/obj/item/weapon/veilrender/attack_self(mob/user) if(charges > 0) new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc, spawn_fast) charges-- @@ -57,7 +57,7 @@ if(spawn_amt_left <= 0) qdel(src) -/obj/effect/rend/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/effect/rend/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/nullrod)) user.visible_message("[usr] seals \the [src] with \the [I].") qdel(src) @@ -95,7 +95,7 @@ force = 15 hitsound = 'sound/items/welder2.ogg' -/obj/item/weapon/scrying/attack_self(mob/user as mob) +/obj/item/weapon/scrying/attack_self(mob/user) user << "You can see...everything!" visible_message("[usr] stares into [src], their eyes glazing over.") user.ghostize(1) @@ -162,7 +162,7 @@ listclearnulls(spooky_scaries) //Funny gimmick, skeletons always seem to wear roman/ancient armour -/obj/item/device/necromantic_stone/proc/equip_roman_skeleton(var/mob/living/carbon/human/H) +/obj/item/device/necromantic_stone/proc/equip_roman_skeleton(mob/living/carbon/human/H) for(var/obj/item/I in H) H.unEquip(I) diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index 6f19d7cdd0d..d59f47796b5 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -24,7 +24,7 @@ max_mages = 20 if(max_mages < 1) max_mages = 1 -/datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1) +/datum/game_mode/wizard/raginmages/greet_wizard(datum/mind/wizard, you_are=1) if (you_are) wizard.current << "You are the Space Wizard!" wizard.current << "The Space Wizards Federation has given you the following tasks:" @@ -123,7 +123,7 @@ world << "The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!" ..(1) -/datum/game_mode/wizard/raginmages/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character +/datum/game_mode/wizard/raginmages/proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character if(!G_found || !G_found.key) return //First we spawn a dude. diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 7d1a612ecfc..d7f0cfc38e8 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -1,6 +1,6 @@ //In this file: Summon Magic/Summon Guns/Summon Events -/proc/rightandwrong(var/summon_type, var/mob/user, var/survivor_probability) //0 = Summon Guns, 1 = Summon Magic +/proc/rightandwrong(summon_type, mob/user, survivor_probability) //0 = Summon Guns, 1 = Summon Magic var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg","uzi") var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying","staffdoor", "special") var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos", "necromantic") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index ce8e20d8009..00a3306e3e1 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -13,14 +13,14 @@ /obj/item/device/soulstone/anybody usability = 1 -/obj/item/device/soulstone/pickup(mob/living/user as mob) +/obj/item/device/soulstone/pickup(mob/living/user) if(!iscultist(user) && !iswizard(user) && !usability) user << "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly." user.Dizzy(120) //////////////////////////////Capturing//////////////////////////////////////////////////////// -/obj/item/device/soulstone/attack(mob/living/carbon/human/M as mob, mob/user as mob) +/obj/item/device/soulstone/attack(mob/living/carbon/human/M, mob/user) if(!iscultist(user) && !iswizard(user) && !usability) user.Paralyse(5) user << "Your body is wracked with debilitating pain!" @@ -92,7 +92,7 @@ icon_state = "construct" desc = "A wicked machine used by those skilled in magical arts. It is inactive" -/obj/structure/constructshell/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/structure/constructshell/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/device/soulstone)) var/obj/item/device/soulstone/SS = O SS.transfer_soul("CONSTRUCT",src,user) @@ -101,7 +101,7 @@ ////////////////////////////Proc for moving soul in and out off stone////////////////////////////////////// -/obj/item/device/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob). +/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/U). switch(choice) if("FORCE") if(!iscarbon(target)) //TO-DO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul @@ -188,7 +188,7 @@ return -/proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) +/proc/makeNewConstruct(mob/living/simple_animal/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0) var/mob/living/simple_animal/construct/newstruct = new ctype(get_turf(target)) newstruct.faction |= "\ref[stoner]" newstruct.key = target.key @@ -207,7 +207,7 @@ newstruct.cancel_camera() -/obj/item/device/soulstone/proc/init_shade(var/obj/item/device/soulstone/C, var/mob/living/carbon/human/T, var/mob/U as mob, var/vic = 0) +/obj/item/device/soulstone/proc/init_shade(obj/item/device/soulstone/C, mob/living/carbon/human/T, mob/U, vic = 0) new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton T.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( T.loc ) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 4f1b195dadb..e47331ed349 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -13,11 +13,11 @@ /datum/spellbook_entry/proc/IsAvailible() // For config prefs / gamemode restrictions - these are round applied return 1 -/datum/spellbook_entry/proc/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) // Specific circumstances +/datum/spellbook_entry/proc/CanBuy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) // Specific circumstances if(book.usesYou have learned [S.name]." return 1 -/datum/spellbook_entry/proc/CanRefund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/proc/CanRefund(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) if(!refundable) return 0 if(!S) @@ -65,7 +65,7 @@ return 1 return 0 -/datum/spellbook_entry/proc/Refund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) //return point value or -1 for failure +/datum/spellbook_entry/proc/Refund(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) //return point value or -1 for failure var/area/wizard_station/A = locate() if(!(user in A.contents)) user << "You can only refund spells at the wizard lair" @@ -205,7 +205,7 @@ var/item_path= null -/datum/spellbook_entry/item/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) new item_path(get_turf(user)) feedback_add_details("wizard_spell_learned",log_name) return 1 @@ -249,7 +249,7 @@ item_path = /obj/item/weapon/scrying log_name = "SO" -/datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/scryingorb/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) if(..()) if (!(user.dna.check_mutation(XRAY))) user.dna.add_mutation(XRAY) @@ -261,7 +261,7 @@ item_path = /obj/item/weapon/storage/belt/soulstone/full log_name = "SS" -/datum/spellbook_entry/item/soulstones/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/soulstones/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) . =..() if(.) user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null)) @@ -285,7 +285,7 @@ item_path = /obj/item/clothing/suit/space/hardsuit/wizard log_name = "HS" -/datum/spellbook_entry/item/armor/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/armor/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) . = ..() if(.) new /obj/item/clothing/shoes/sandal(get_turf(user)) //In case they've lost them. @@ -310,7 +310,7 @@ buy_word = "Cast" var/active = 0 -/datum/spellbook_entry/summon/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/CanBuy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) return ..() && !active /datum/spellbook_entry/summon/GetInfo() @@ -337,7 +337,7 @@ return 0 return (ticker.mode.name != "ragin' mages" && !config.no_summon_guns) -/datum/spellbook_entry/summon/guns/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) feedback_add_details("wizard_spell_learned",log_name) rightandwrong(0, user, 25) playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1) @@ -356,7 +356,7 @@ return 0 return (ticker.mode.name != "ragin' mages" && !config.no_summon_magic) -/datum/spellbook_entry/summon/magic/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) feedback_add_details("wizard_spell_learned",log_name) rightandwrong(1, user, 0) book.uses += 1 @@ -377,7 +377,7 @@ return 0 return (ticker.mode.name != "ragin' mages" && !config.no_summon_events) -/datum/spellbook_entry/summon/events/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) feedback_add_details("wizard_spell_learned",log_name) summonevents() times++ @@ -425,7 +425,7 @@ Initialize() -/obj/item/weapon/spellbook/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/item/weapon/spellbook/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/antag_spawner/contract)) var/obj/item/weapon/antag_spawner/contract/contract = O if(contract.used) @@ -439,7 +439,7 @@ src.uses++ qdel(O) -/obj/item/weapon/spellbook/proc/GetCategoryHeader(var/category) +/obj/item/weapon/spellbook/proc/GetCategoryHeader(category) var/dat = "" switch(category) if("Offensive Spells") @@ -460,7 +460,7 @@ dat += "These powerful spells change the very fabric of reality. Not always in your favour.
      " return dat -/obj/item/weapon/spellbook/proc/wrap(var/content) +/obj/item/weapon/spellbook/proc/wrap(content) var/dat = "" dat +="Spellbook" dat += {" @@ -480,7 +480,7 @@ dat += {"[content]"} return dat -/obj/item/weapon/spellbook/attack_self(mob/user as mob) +/obj/item/weapon/spellbook/attack_self(mob/user) if(!owner) user << "You bind the spellbook to yourself." owner = user @@ -574,7 +574,7 @@ /obj/item/weapon/spellbook/oneuse/Initialize() //No need to init return -/obj/item/weapon/spellbook/oneuse/attack_self(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/attack_self(mob/user) var/obj/effect/proc_holder/spell/S = new spell for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list) if(knownspell.type == S.type) @@ -592,10 +592,10 @@ user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) learned the spell [spellname] ([S]).") onlearned(user) -/obj/item/weapon/spellbook/oneuse/proc/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/proc/recoil(mob/user) user.visible_message("[src] glows in a black light!") -/obj/item/weapon/spellbook/oneuse/proc/onlearned(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/proc/onlearned(mob/user) used = 1 user.visible_message("[src] glows dark for a second!") @@ -608,7 +608,7 @@ icon_state ="bookfireball" desc = "This book feels warm to the touch." -/obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user) ..() explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) qdel(src) @@ -619,7 +619,7 @@ icon_state ="booksmoke" desc = "This book is overflowing with the dank arts." -/obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/user) ..() user <<"Your stomach rumbles..." if(user.nutrition) @@ -633,7 +633,7 @@ icon_state ="bookblind" desc = "This book looks blurry, no matter how you look at it." -/obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user) ..() user <<"You go blind!" user.eye_blind = 10 @@ -651,7 +651,7 @@ name = "spellbook of [spellname]" //Note, desc doesn't change by design ..() -/obj/item/weapon/spellbook/oneuse/mindswap/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/mindswap/recoil(mob/user) ..() if(stored_swap in dead_mob_list) stored_swap = null @@ -696,7 +696,7 @@ icon_state ="bookforcewall" desc = "This book has a dedication to mimes everywhere inside the front cover." -/obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user) ..() user <<"You suddenly feel very solid!" var/obj/structure/closet/statue/S = new /obj/structure/closet/statue(user.loc, user) @@ -710,7 +710,7 @@ icon_state ="bookknock" desc = "This book is hard to hold closed properly." -/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user) ..() user <<"You're knocked down!" user.Weaken(20) @@ -721,7 +721,7 @@ icon_state ="bookhorses" desc = "This book is more horse than your mind has room for." -/obj/item/weapon/spellbook/oneuse/barnyard/recoil(mob/living/carbon/user as mob) +/obj/item/weapon/spellbook/oneuse/barnyard/recoil(mob/living/carbon/user) if(istype(user, /mob/living/carbon/human)) user <<"HOR-SIE HAS RISEN" var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead @@ -741,7 +741,7 @@ icon_state ="bookcharge" desc = "This book is made of 100% post-consumer wizard." -/obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user) ..() user <<"[src] suddenly feels very warm!" empulse(src, 1, 1) @@ -752,7 +752,7 @@ icon_state ="booksummons" desc = "This book is bright and garish, very hard to miss." -/obj/item/weapon/spellbook/oneuse/summonitem/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/summonitem/recoil(mob/user) ..() user <<"[src] suddenly vanishes!" qdel(src) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 25f8b25db8c..1fbc7f42955 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -47,7 +47,7 @@ return -/datum/game_mode/proc/forge_wizard_objectives(var/datum/mind/wizard) +/datum/game_mode/proc/forge_wizard_objectives(datum/mind/wizard) switch(rand(1,100)) if(1 to 30) @@ -113,7 +113,7 @@ return -/datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1) +/datum/game_mode/proc/greet_wizard(datum/mind/wizard, you_are=1) if (you_are) wizard.current << "You are the Space Wizard!" wizard.current << "The Space Wizards Federation has given you the following tasks:" @@ -241,7 +241,7 @@ //OTHER PROCS //To batch-remove wizard spells. Linked to mind.dm. -/mob/proc/spellremove(var/mob/M as mob) +/mob/proc/spellremove(mob/M) if(!mind) return for(var/obj/effect/proc_holder/spell/spell_to_remove in src.mind.spell_list) @@ -265,7 +265,7 @@ Made a proc so this is not repeated 14 (or more) times.*/ return 1 -/proc/iswizard(mob/living/M as mob) +/proc/iswizard(mob/living/M) return istype(M) && M.mind && ticker && ticker.mode && (M.mind in ticker.mode.wizards) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 6bb063181f0..96a314d3fde 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -155,7 +155,7 @@ return 1 -/obj/proc/check_access_list(var/list/L) +/obj/proc/check_access_list(list/L) if(!src.req_access && !src.req_one_access) return 1 if(!istype(src.req_access, /list)) return 1 if(!src.req_access.len && (!src.req_one_access || !src.req_one_access.len)) return 1 @@ -218,7 +218,7 @@ /proc/get_all_centcom_access() return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_captain) -/proc/get_ert_access(var/class) +/proc/get_ert_access(class) switch(class) if("commander") return get_all_centcom_access() @@ -232,7 +232,7 @@ /proc/get_all_syndicate_access() return list(access_syndicate, access_syndicate) -/proc/get_region_accesses(var/code) +/proc/get_region_accesses(code) switch(code) if(0) return get_all_accesses() @@ -251,7 +251,7 @@ if(7) //command return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_gateway, access_all_personal_lockers, access_heads_vault, access_hop, access_captain) -/proc/get_region_accesses_name(var/code) +/proc/get_region_accesses_name(code) switch(code) if(0) return "All" diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 6bee48e1f3e..7733a3be546 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -13,7 +13,7 @@ Assistant access = list() //See /datum/job/assistant/get_access() minimal_access = list() //See /datum/job/assistant/get_access() -/datum/job/assistant/equip_items(var/mob/living/carbon/human/H) +/datum/job/assistant/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) if (config.grey_assistants) H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index f94c21e1d2f..0d20ace899d 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -23,7 +23,7 @@ Captain access = list() //See get_access() minimal_access = list() //See get_access() -/datum/job/captain/equip_items(var/mob/living/carbon/human/H) +/datum/job/captain/equip_items(mob/living/carbon/human/H) var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H) U.attachTie(new /obj/item/clothing/tie/medal/gold/captain()) H.equip_to_slot_or_del(U, slot_w_uniform) @@ -84,7 +84,7 @@ Head of Personnel access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom) -/datum/job/hop/equip_items(var/mob/living/carbon/human/H) +/datum/job/hop/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/hopcap(H), slot_head) diff --git a/code/game/jobs/job/cargo_service.dm b/code/game/jobs/job/cargo_service.dm index 23ff5214392..0ecef1296c3 100644 --- a/code/game/jobs/job/cargo_service.dm +++ b/code/game/jobs/job/cargo_service.dm @@ -18,7 +18,7 @@ Quartermaster access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) -/datum/job/qm/equip_items(var/mob/living/carbon/human/H) +/datum/job/qm/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) @@ -44,7 +44,7 @@ Cargo Technician access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting, access_mineral_storeroom) -/datum/job/cargo_tech/equip_items(var/mob/living/carbon/human/H) +/datum/job/cargo_tech/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) @@ -71,7 +71,7 @@ Shaft Miner access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) minimal_access = list(access_mining, access_mining_station, access_mailsorting, access_mineral_storeroom) -/datum/job/mining/equip_items(var/mob/living/carbon/human/H) +/datum/job/mining/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) @@ -106,7 +106,7 @@ Bartender access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_weapons) minimal_access = list(access_bar) -/datum/job/bartender/equip_backpack(var/mob/living/carbon/human/H) +/datum/job/bartender/equip_backpack(mob/living/carbon/human/H) switch(H.backbag) if(1) //No backpack or satchel @@ -126,7 +126,7 @@ Bartender new default_storagebox(BPK) H.equip_to_slot_or_del(BPK, slot_back,1) -/datum/job/bartender/equip_items(var/mob/living/carbon/human/H) +/datum/job/bartender/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform) @@ -158,7 +158,7 @@ Cook access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) minimal_access = list(access_kitchen, access_morgue) -/datum/job/cook/equip_items(var/mob/living/carbon/human/H) +/datum/job/cook/equip_items(mob/living/carbon/human/H) cooks += 1 H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform) @@ -191,7 +191,7 @@ Botanist access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. minimal_access = list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. -/datum/job/hydro/equip_items(var/mob/living/carbon/human/H) +/datum/job/hydro/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves) @@ -219,6 +219,6 @@ Janitor access = list(access_janitor, access_maint_tunnels) minimal_access = list(access_janitor, access_maint_tunnels) -/datum/job/janitor/equip_items(var/mob/living/carbon/human/H) +/datum/job/janitor/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 90700b72776..1de8bd9e469 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -18,7 +18,7 @@ Clown access = list(access_theatre) minimal_access = list(access_theatre) -/datum/job/clown/equip_backpack(var/mob/living/carbon/human/H) +/datum/job/clown/equip_backpack(mob/living/carbon/human/H) var/obj/item/weapon/storage/backpack/BPK = new default_backpack(H) new default_storagebox(BPK) @@ -28,7 +28,7 @@ Clown H.equip_to_slot_or_del(BPK, slot_back) -/datum/job/clown/equip_items(var/mob/living/carbon/human/H) +/datum/job/clown/equip_items(mob/living/carbon/human/H) H.fully_replace_character_name(H.real_name, pick(clown_names)) // Give him a temporary random name to prevent identity revealing H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform) @@ -60,7 +60,7 @@ Mime access = list(access_theatre) minimal_access = list(access_theatre) -/datum/job/mime/equip_backpack(var/mob/living/carbon/human/H) +/datum/job/mime/equip_backpack(mob/living/carbon/human/H) var/obj/item/weapon/storage/backpack/BPK = new default_backpack(H) new default_storagebox(BPK) @@ -69,7 +69,7 @@ Mime H.equip_to_slot_or_del(BPK, slot_back) -/datum/job/mime/equip_items(var/mob/living/carbon/human/H) +/datum/job/mime/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/mime(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/white(H), slot_gloves) @@ -103,7 +103,7 @@ Librarian access = list(access_library) minimal_access = list(access_library) -/datum/job/librarian/equip_items(var/mob/living/carbon/human/H) +/datum/job/librarian/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/librarian(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/books(H), slot_l_hand) @@ -131,7 +131,7 @@ Lawyer access = list(access_lawyer, access_court, access_sec_doors) minimal_access = list(access_lawyer, access_court, access_sec_doors) -/datum/job/lawyer/equip_items(var/mob/living/carbon/human/H) +/datum/job/lawyer/equip_items(mob/living/carbon/human/H) lawyers += 1 switch(lawyers) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 53d8be8e8ad..87ffe8f8b19 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -18,7 +18,7 @@ Chaplain access = list(access_morgue, access_chapel_office, access_crematorium) minimal_access = list(access_morgue, access_chapel_office, access_crematorium) -/datum/job/chaplain/equip_items(var/mob/living/carbon/human/H) +/datum/job/chaplain/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 8c8c69ce873..da315e23444 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -31,7 +31,7 @@ Chief Engineer access_heads, access_construction, access_sec_doors, access_minisat, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_mineral_storeroom) -/datum/job/chief_engineer/equip_items(var/mob/living/carbon/human/H) +/datum/job/chief_engineer/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_engineer(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(H), slot_head) @@ -68,7 +68,7 @@ Station Engineer minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_tcomsat) -/datum/job/engineer/equip_items(var/mob/living/carbon/human/H) +/datum/job/engineer/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) @@ -98,7 +98,7 @@ Atmospheric Technician access_external_airlocks, access_construction, access_atmospherics) minimal_access = list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction) -/datum/job/atmos/equip_items(var/mob/living/carbon/human/H) +/datum/job/atmos/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/analyzer(H), slot_r_store) diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 93c43bd653d..41f5af9ad52 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -49,10 +49,10 @@ var/default_storagebox= /obj/item/weapon/storage/box/survival //Only override this proc -/datum/job/proc/equip_items(var/mob/living/carbon/human/H) +/datum/job/proc/equip_items(mob/living/carbon/human/H) //Or this proc -/datum/job/proc/equip_backpack(var/mob/living/carbon/human/H) +/datum/job/proc/equip_backpack(mob/living/carbon/human/H) switch(H.backbag) if(1) //No backpack or satchel H.equip_to_slot_or_del(new default_storagebox(H), slot_r_hand) @@ -66,7 +66,7 @@ H.equip_to_slot_or_del(BPK, slot_back,1) //But don't override this -/datum/job/proc/equip(var/mob/living/carbon/human/H) +/datum/job/proc/equip(mob/living/carbon/human/H) if(!H) return 0 @@ -100,7 +100,7 @@ //Equip headset H.equip_to_slot_or_del(new src.default_headset(H), slot_ears) -/datum/job/proc/apply_fingerprints(var/mob/living/carbon/human/H) +/datum/job/proc/apply_fingerprints(mob/living/carbon/human/H) if(!istype(H)) return if(H.back) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 6e11a228224..20b0ec7844d 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -27,7 +27,7 @@ Chief Medical Officer access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_sec_doors) -/datum/job/cmo/equip_items(var/mob/living/carbon/human/H) +/datum/job/cmo/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_medical_officer(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat/cmo(H), slot_wear_suit) @@ -60,7 +60,7 @@ Medical Doctor access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) minimal_access = list(access_medical, access_morgue, access_surgery) -/datum/job/doctor/equip_items(var/mob/living/carbon/human/H) +/datum/job/doctor/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat(H), slot_wear_suit) @@ -87,7 +87,7 @@ Chemist access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) minimal_access = list(access_medical, access_chemistry, access_mineral_storeroom) -/datum/job/chemist/equip_items(var/mob/living/carbon/human/H) +/datum/job/chemist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chemist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat/chemist(H), slot_wear_suit) @@ -112,7 +112,7 @@ Geneticist access = list(access_medical, access_morgue, access_chemistry, access_virology, access_genetics, access_research, access_xenobiology, access_robotics, access_mineral_storeroom, access_tech_storage) minimal_access = list(access_medical, access_morgue, access_genetics, access_research) -/datum/job/geneticist/equip_items(var/mob/living/carbon/human/H) +/datum/job/geneticist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/geneticist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat/genetics(H), slot_wear_suit) @@ -140,7 +140,7 @@ Virologist access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) minimal_access = list(access_medical, access_virology, access_mineral_storeroom) -/datum/job/virologist/equip_items(var/mob/living/carbon/human/H) +/datum/job/virologist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 27451f9dedd..488a598c0b0 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -29,7 +29,7 @@ Research Director access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom, access_tech_storage, access_minisat) -/datum/job/rd/equip_items(var/mob/living/carbon/human/H) +/datum/job/rd/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat(H), slot_wear_suit) @@ -60,7 +60,7 @@ Scientist access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom, access_tech_storage, access_genetics) minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom) -/datum/job/scientist/equip_items(var/mob/living/carbon/human/H) +/datum/job/scientist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat/science(H), slot_wear_suit) @@ -86,7 +86,7 @@ Roboticist access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research, access_mineral_storeroom, access_xenobiology, access_genetics) minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research, access_mineral_storeroom) -/datum/job/roboticist/equip_items(var/mob/living/carbon/human/H) +/datum/job/roboticist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat(H), slot_wear_suit) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 6ca62edde8b..73cbbc059de 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -35,7 +35,7 @@ Head of Security access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway) -/datum/job/hos/equip_items(var/mob/living/carbon/human/H) +/datum/job/hos/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/hos/trenchcoat(H), slot_wear_suit) @@ -78,7 +78,7 @@ Warden access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers) minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_weapons) //See /datum/job/warden/get_access() -/datum/job/warden/equip_items(var/mob/living/carbon/human/H) +/datum/job/warden/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/warden(H), slot_wear_suit) @@ -124,7 +124,7 @@ Detective access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons, access_brig, access_security) minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons) -/datum/job/detective/equip_items(var/mob/living/carbon/human/H) +/datum/job/detective/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/det(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(H), slot_head) @@ -174,7 +174,7 @@ Security Officer access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers) minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_weapons) //But see /datum/job/warden/get_access() -/datum/job/officer/equip_items(var/mob/living/carbon/human/H) +/datum/job/officer/equip_items(mob/living/carbon/human/H) assign_sec_to_department(H) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) @@ -206,7 +206,7 @@ Security Officer var/list/sec_departments = list("engineering", "supply", "medical", "science") -/datum/job/officer/proc/assign_sec_to_department(var/mob/living/carbon/human/H) +/datum/job/officer/proc/assign_sec_to_department(mob/living/carbon/human/H) if(!sec_departments.len) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) else diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index 77de7e2ceef..15d9cd2cb2e 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -13,7 +13,7 @@ AI req_admin_notify = 1 minimal_player_age = 30 -/datum/job/ai/equip(var/mob/living/carbon/human/H) +/datum/job/ai/equip(mob/living/carbon/human/H) if(!H) return 0 /datum/job/ai/config_check() @@ -35,6 +35,6 @@ Cyborg selection_color = "#ddffdd" minimal_player_age = 21 -/datum/job/cyborg/equip(var/mob/living/carbon/human/H) +/datum/job/cyborg/equip(mob/living/carbon/human/H) if(!H) return 0 return H.Robotize() diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index f5e4112a7c5..9bcc58643d7 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -123,5 +123,5 @@ var/list/nonhuman_positions = list( ) -/proc/guest_jobbans(var/job) +/proc/guest_jobbans(job) return ((job in command_positions) || (job in nonhuman_positions) || (job in security_positions)) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 26ded6705f1..057bc5b6adb 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -27,7 +27,7 @@ ..() // update the invisibility and icon -/obj/machinery/bluespace_beacon/hide(var/intact) +/obj/machinery/bluespace_beacon/hide(intact) invisibility = intact ? 101 : 0 updateicon() diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 16b8d76da62..5b948573ca7 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -57,13 +57,13 @@ icon_state = "freezer" return -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ai(mob/user as mob) +/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ai(mob/user) return interact(user) -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_paw(mob/user as mob) +/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_paw(mob/user) return interact(user) -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob) +/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user) return interact(user) /obj/machinery/atmospherics/unary/cold_sink/freezer/interact(mob/user) @@ -183,13 +183,13 @@ icon_state = "heater" return -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user as mob) +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_paw(mob/user as mob) +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user) return interact(user) /obj/machinery/atmospherics/unary/heat_reservoir/heater/interact(mob/user) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index ab226c94879..892052ea48d 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -40,7 +40,7 @@ src.colorlist += D -/obj/machinery/pdapainter/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/pdapainter/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/device/pda)) if(storedpda) user << "There is already a PDA inside!" @@ -56,7 +56,7 @@ update_icon() -/obj/machinery/pdapainter/attack_hand(mob/user as mob) +/obj/machinery/pdapainter/attack_hand(mob/user) ..() src.add_fingerprint(user) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index be55c50012c..922c0a71cd5 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -60,7 +60,7 @@ A.blob_act() qdel(src) -/obj/machinery/sleeper/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise +/obj/machinery/sleeper/attack_animal(mob/living/simple_animal/M)//Stop putting hostile mobs in things guise if(M.environment_smash) M.do_attack_animation(src) visible_message("[M.name] smashes [src] apart!") @@ -109,7 +109,7 @@ /obj/machinery/sleeper/container_resist() open_machine() -/obj/machinery/sleeper/relaymove(var/mob/user) +/obj/machinery/sleeper/relaymove(mob/user) ..() open_machine() diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 82d9841d328..0532fc63f3f 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -23,7 +23,7 @@ icon_state = "motion0" stat |= NOPOWER -/obj/machinery/ai_slipper/proc/setState(var/enabled, var/uses) +/obj/machinery/ai_slipper/proc/setState(enabled, uses) src.disabled = disabled src.uses = uses src.power_change() @@ -49,10 +49,10 @@ return return -/obj/machinery/ai_slipper/attack_ai(mob/user as mob) +/obj/machinery/ai_slipper/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/ai_slipper/attack_hand(mob/user as mob) +/obj/machinery/ai_slipper/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return if ( (get_dist(src, user) > 1 )) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index dbeb74c7411..824cd32a54d 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -196,7 +196,7 @@ return -/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return @@ -243,7 +243,7 @@ frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_TO_AIRALARM) -/obj/machinery/alarm/proc/send_signal(var/target, var/list/command)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise +/obj/machinery/alarm/proc/send_signal(target, list/command)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise if(!radio_connection) return 0 @@ -260,7 +260,7 @@ return 1 -/obj/machinery/alarm/proc/populate_status(var/list/data) +/obj/machinery/alarm/proc/populate_status(list/data) var/turf/location = get_turf(src) if(!location) return @@ -304,7 +304,7 @@ environment_data += list(list("name" = "Temperature", "value" = environment.temperature, "unit" = "K ([round(environment.temperature - T0C, 0.1)]C)", "danger_level" = temperature_danger)) data["environment_data"] = environment_data -/obj/machinery/alarm/proc/populate_controls(var/list/data) +/obj/machinery/alarm/proc/populate_controls(list/data) switch(screen) if(AALARM_SCREEN_MAIN) data["mode"] = mode @@ -661,7 +661,7 @@ post_alert(new_area_danger_level) update_icon() -/obj/machinery/alarm/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/machinery/alarm/attackby(obj/item/W, mob/user, params) switch(buildstage) if(2) if(istype(W, /obj/item/weapon/wirecutters) && panel_open && (wires.wires_status == 27 || wires.wires_status == 31)) //this checks for all wires to be cut, except the syphon wire which is optional. @@ -755,7 +755,7 @@ update_icon() -/obj/machinery/alarm/emag_act(mob/user as mob) +/obj/machinery/alarm/emag_act(mob/user) if(!emagged) src.emagged = 1 user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.") @@ -788,7 +788,7 @@ Code shamelessly copied from apc_frame icon_state = "alarm_bitem" flags = CONDUCT -/obj/item/alarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/alarm_frame/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) qdel(src) @@ -883,7 +883,7 @@ FIRE ALARM -/obj/machinery/firealarm/emag_act(mob/user as mob) +/obj/machinery/firealarm/emag_act(mob/user) if(!emagged) src.emagged = 1 user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its thermal sensors.") @@ -904,14 +904,14 @@ FIRE ALARM /obj/machinery/firealarm/bullet_act(BLAH) return src.alarm() -/obj/machinery/firealarm/attack_paw(mob/user as mob) +/obj/machinery/firealarm/attack_paw(mob/user) return src.attack_hand(user) /obj/machinery/firealarm/emp_act(severity) if(prob(50/severity)) alarm() ..() -/obj/machinery/firealarm/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/machinery/firealarm/attackby(obj/item/W, mob/user, params) src.add_fingerprint(user) if (istype(W, /obj/item/weapon/screwdriver) && buildstage == 2) @@ -1008,7 +1008,7 @@ FIRE ALARM if(loc) update_icon() -/obj/machinery/firealarm/attack_hand(mob/user as mob) +/obj/machinery/firealarm/attack_hand(mob/user) if(user.stat || stat & (NOPOWER|BROKEN)) return @@ -1148,7 +1148,7 @@ Code shamelessly copied from apc_frame flags = CONDUCT -/obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/firealarm_frame/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) qdel(src) @@ -1188,7 +1188,7 @@ Code shamelessly copied from apc_frame name = "\improper PARTY BUTTON" desc = "Cuban Pete is in the house!" -/obj/machinery/firealarm/partyalarm/attack_hand(mob/user as mob) +/obj/machinery/firealarm/partyalarm/attack_hand(mob/user) if(user.stat || stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 2063e4d72ae..38d9a29cfed 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -19,7 +19,7 @@ spawn(10) scanscrubbers() -/obj/machinery/computer/area_atmos/attack_hand(var/mob/user as mob) +/obj/machinery/computer/area_atmos/attack_hand(mob/user) if(..(user)) return src.add_fingerprint(usr) @@ -103,7 +103,7 @@ scrubber.on = text2num(href_list["toggle"]) scrubber.update_icon() -/obj/machinery/computer/area_atmos/proc/validscrubber( var/obj/machinery/portable_atmospherics/scrubber/huge/scrubber as obj ) +/obj/machinery/computer/area_atmos/proc/validscrubber( obj/machinery/portable_atmospherics/scrubber/huge/scrubber ) if(!isobj(scrubber) || get_dist(scrubber.loc, src.loc) > src.range || scrubber.loc.z != src.loc.z) return 0 @@ -127,7 +127,7 @@ /obj/machinery/computer/area_atmos/area zone = "This computer is working in a wired network limited to this area." - validscrubber( var/obj/machinery/portable_atmospherics/scrubber/huge/scrubber as obj ) + validscrubber( obj/machinery/portable_atmospherics/scrubber/huge/scrubber ) if(!isobj(scrubber)) return 0 diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 41f22184808..82f0e3a1a78 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -201,7 +201,7 @@ update_flag healthcheck() return -/obj/machinery/portable_atmospherics/canister/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/portable_atmospherics/canister/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) if(Proj.damage) src.health -= round(Proj.damage / 2) @@ -230,7 +230,7 @@ update_flag return return -/obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/portable_atmospherics/canister/attackby(obj/item/weapon/W, mob/user, params) if(!istype(W, /obj/item/weapon/wrench) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda)) visible_message("[user] hits \the [src] with a [W]!") investigate_log("was smacked with \a [W] by [key_name(user)]", "atmos") @@ -253,16 +253,16 @@ update_flag ..() -/obj/machinery/portable_atmospherics/canister/attack_ai(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/canister/attack_paw(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/canister/attack_tk(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attack_tk(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attack_hand(mob/user) return src.ui_interact(user) /obj/machinery/portable_atmospherics/canister/interact(mob/user, ui_key = "main") @@ -271,7 +271,7 @@ update_flag SSnano.try_update_ui(user, src, ui_key, null, src.get_ui_data()) -/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if (src.destroyed) return diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 77f019ffc99..47d32366084 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -91,7 +91,7 @@ user << status() -/obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/meter/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "You begin to unfasten \the [src]..." @@ -105,13 +105,13 @@ return ..() -/obj/machinery/meter/attack_ai(var/mob/user as mob) +/obj/machinery/meter/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/meter/attack_paw(var/mob/user as mob) +/obj/machinery/meter/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/meter/attack_hand(var/mob/user as mob) +/obj/machinery/meter/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return 1 diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 85b57fb7413..bdeb5bb4c62 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -63,7 +63,7 @@ /obj/machinery/portable_atmospherics/portableConnectorReturnAir() return air_contents -/obj/machinery/portable_atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/portable_atmospherics/attackby(obj/item/weapon/W, mob/user, params) if ((istype(W, /obj/item/weapon/tank) && !( src.destroyed ))) if (src.holding) return diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index 5f5519fa105..3602982dbca 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -93,13 +93,13 @@ /obj/machinery/portable_atmospherics/pump/return_air() return air_contents -/obj/machinery/portable_atmospherics/pump/attack_ai(var/mob/user as mob) +/obj/machinery/portable_atmospherics/pump/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/pump/attack_paw(var/mob/user as mob) +/obj/machinery/portable_atmospherics/pump/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/pump/attack_hand(var/mob/user as mob) +/obj/machinery/portable_atmospherics/pump/attack_hand(mob/user) user.set_machine(src) var/holding_text diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 52cd6e636db..4ce9cbb4748 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -48,7 +48,7 @@ else icon_state = "scrubber:0" - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + attackby(obj/item/weapon/W, mob/user) if(istype(W, /obj/item/weapon/wrench)) if(on) user << "Turn it off first!" @@ -65,7 +65,7 @@ /obj/machinery/portable_atmospherics/scrubber/huge/stationary name = "stationary air scrubber" - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + attackby(obj/item/weapon/W, mob/user) if(istype(W, /obj/item/weapon/wrench)) user << "The bolts are too tight for you to unscrew!" return @@ -151,13 +151,13 @@ /obj/machinery/portable_atmospherics/scrubber/return_air() return air_contents -/obj/machinery/portable_atmospherics/scrubber/attack_ai(var/mob/user as mob) +/obj/machinery/portable_atmospherics/scrubber/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/scrubber/attack_paw(var/mob/user as mob) +/obj/machinery/portable_atmospherics/scrubber/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/scrubber/attack_hand(var/mob/user as mob) +/obj/machinery/portable_atmospherics/scrubber/attack_hand(mob/user) user.set_machine(src) var/holding_text diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 5e92ee7468d..73026e5dac1 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -273,7 +273,7 @@ dat += "