From fda5be14ded0b0cd80c22a27760a9e539857d4b5 Mon Sep 17 00:00:00 2001 From: MrYeti Date: Mon, 26 Nov 2012 16:40:19 -0500 Subject: [PATCH 01/35] Added Roaper's Custom Item Deleted some unwanted custom item stuff as well --- code/modules/customitems/item_defines.dm | 17 +++++++++++++---- config/custom_items.txt | 5 ++--- icons/mob/eyes.dmi | Bin 7459 -> 8062 bytes icons/obj/custom_items.dmi | Bin 35288 -> 35600 bytes 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 1c27b362ad1..26fc2faebae 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -301,7 +301,7 @@ icon = 'custom_items.dmi' icon_state = "odysseus_spec_id" -/obj/item/weapon/card/id/fluff/ian_colmid //Roaper: Ian Colm +/obj/item/weapon/card/id/fluff/ian_colm_1 //Roaper: Ian Colm name = "Technician" desc = "An old ID with the words 'Ian Colm's Technician ID' printed on it.." icon = 'custom_items.dmi' @@ -367,11 +367,13 @@ icon = 'custom_items.dmi' icon_state = "book_berner_1" +/* /obj/item/clothing/glasses/fluff/serithi_artalis_1 //serithi: Serithi Artalis name = "extranet HUD" desc = "A heads-up display with limited connectivity to the NanoTrasen Extranet, capable of displaying information from official NanoTrasen records." icon = 'custom_items.dmi' icon_state = "serithi_artalis_1" +*/ /obj/item/clothing/glasses/fluff/uzenwa_sissra_1 //sparklysheep: Uzenwa Sissra name = "Scanning Goggles" @@ -379,6 +381,12 @@ icon = 'custom_items.dmi' icon_state = "uzenwa_sissra_1" +/obj/item/clothing/glasses/welding/fluff/ian_colm_2 //roaper: Ian Colm + name = "Welding Goggles" + desc = "A pair of goggles used in the application of welding." + icon = 'custom_items.dmi' + icon_state = "ian_colm_1" + //////////// Hats //////////// //Removed by request /* @@ -420,11 +428,12 @@ icon = 'custom_items.dmi' icon_state = "taryn_kifer_1" -/obj/item/clothing/head/fluff/enos_adlai_1 //roaper: Enos Adlai +/*/obj/item/clothing/head/fluff/enos_adlai_1 //roaper: Enos Adlai name = "comfy cap" desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense." icon = 'custom_items.dmi' icon_state = "enos_adlai_1" +*/ /obj/item/clothing/head/fluff/edvin_telephosphor_1 //foolamancer: Edvin Telephosphor name = "Edvin's Hat" @@ -534,13 +543,13 @@ //////////// Shoes //////////// -/obj/item/clothing/shoes/fluff/leatherboots //serithi: Serithi Artalis +/*/obj/item/clothing/shoes/fluff/leatherboots //serithi: Serithi Artalis name = "leather boots" desc = "A pair of leather boots. Well-worn, but still kept in good condition. There is a small \"S\" scratched into the back of each boot." icon = 'custom_items.dmi' icon_state = "leatherboots" item_state = "jackboots" - +*/ //////////// Sets //////////// ////// CDC //deusdactyl: Roger Wiles diff --git a/config/custom_items.txt b/config/custom_items.txt index a9f786ea391..220783f37c0 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -38,11 +38,11 @@ orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen paththegreat: Eli Stevens: /obj/item/weapon/pen/fluff/fountainpen phaux: Tian Krieger: /obj/item/clothing/under/fluff/tian_dress rawrtaicho: Riley Rohtin: /obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1 -roaper: Enos Adlai: /obj/item/clothing/head/fluff/enos_adlai_1 +roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colm_1 +roaper: Ian Colm: /obj/item/clothing/glasses/welding/fluff/ian_colm_2 rukral: Nashida Bisha'ra: /obj/item/weapon/reagent_containers/glass/beaker/large/fluff/nashida_bishara_1 searif: Yuki Matsuda: /obj/item/clothing/under/fluff/jumpsuitdown, /obj/item/clothing/head/welding/fluff/yuki_matsuda_1 searif: Ara Al-Jazari: /obj/item/clothing/under/rank/bartender/fluff/classy -serithi: Serithi Artalis: /obj/item/clothing/glasses/fluff/serithi_artalis_1, /obj/item/clothing/shoes/fluff/leatherboots sirribbit: /obj/item/weapon/clipboard/fluff/mcreary_journal sicktrigger: David Fanning: /obj/item/fluff/david_fanning_1 silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1 @@ -59,4 +59,3 @@ tzefa: Wes Solari: /obj/item/fluff/wes_solari_1 vinceluk: Seth Sealis: /obj/item/clothing/suit/det_suit/fluff/graycoat whitellama: Ethan Way: /obj/item/fluff/ethan_way_1 whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1 -roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colmid \ No newline at end of file diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index ab229b90edaf83df8b5097605f369389b622d65a..1a5f94e5d5ac048779636ded50fc9db66489ed8b 100644 GIT binary patch literal 8062 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 U_O_Y_0q}EAMGJ_b0 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 delta 16227 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ⅇ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

6v%>y2N2eFyZHX_!KrDF5t0VGLspAVk8^^D zJ#DB}t~AiQfX;xyr0?q9-rofm^_EtyNYCTCA4@Cxr_*SyY^9)#B8hoNC*w;VjC)*p z@G8@t8j= zUR(Z5eDsP!t?c?0s6`n*b+c95!x`uS0Z@TW6(@-{5%-{DTq@JfPhu^AslYMKtkHf9 zSJONwjzCX&)>QCLW^&H6oQ}28h1TKL93*l|ip+QRSNaVK+1Ac|!S(0sgPi-vg?me( zAWrhQ{8t8b@4&L5)S@LvBo8+qpSoLl3EA$#+_N8=HMa?(WwO00h1_1^U=;}R)luE; z`Hmf^M_VJY69!^;)-ZD()9hAa^Anr-$qOK@Osba*I}Oo&z2!TqfjYLjh0T{8YElil zzA9Ow3g?!?vsE5!epd%;yF;pb8zuFhNhoK7P2jMbsdCjjxtP82{*;VGO2r8{+DQ+o zi8bhHPc)C7@tvt}k}_YlB@Zpne7h|@%*~W8cfZwSG$;Hv@)P15lP9F?94{^ zicU+q9LR_jmI-!ToCg`YWZ>v7lc*J0b=D#-q#gd|5JYlSI4tnrp@iV_LEY9Dg*;6} z(Sz7wRE3$FtFHEw1>t4P8XfYS)?H@2|{WM!E8d zjAW+W?n%@3sZ2_rBj2+gi#GgNGph+Q=InbJ!kzs^fBp!liDYJGrWF^@YCdkGP@eeC zXGY@e6K#Egpojt0Car*A9!6bvu=1|!S_Da~W3krg$o|%R(=bPGDQvP8t}}vg{o=Hr zu{uJ;R~9w6i{V25TB_gspiDT{$f0rjS1$yDCiPfLAZNGR;e;O9x{X`bRrrEEhxIPh zJs2HN2f!1*pH`2^^h zlz-MywCP3&u3-&Ly9pH~iAEGssv?&6+3EDfX+0%4P>6E^D~+ViTk$ld*#M6{_lYO} zc}RpwONu4@Y8uxtfDbIIA$C>{V5kR!Mre3V&?_+i{d*bZu}12DsP_1uiao&e9sm}C ztVdR_Mj8h$oVqT6nUQJt>%Ff>h-F=H$eDaXWb32#{Qaefgp6dkr*%90^f8uT2ze~U znjtojJO^&F!kawZZuMujOD5~`=(jZZz1HLHDQjC=$uMCdd#7#ji|%b3YbP)&zjj<(TO*VLIfImM zi$si*n>~T{Z5d(rPt1g|x-y2z#?a_8%@FH$Pub7np~HL4vles+3#TFI%YIM-fE zY=k-s96S9pERf&xe#_$!_fpix|e2}_#m-s$PEns5dPjC8!-p|DGcv%z4G8ysFN$DW@ty#@yaF79t!3L*b^hgm{C2L~gy=4)kv zA^I1JaqYgKXvYStI~+*I#DwPawR5oO4*BG7i=N{`2ZxaeSSc)RIW2@sE&4VX4d{lCM@U0M;mu7g2&}y9+k@WMz_c;n!7_F6XJ$1wjBZjE1T0DwA&<}ozK~Sf`k%= z-=n1~UvhsC-QE0~0J;sN24H3o{4v1Q>Zd{W+(x$@MXwBSA35(de}QMS9BHP=K}{&6 z;&2xc+3IO$il3^tb715m;sqS$X!eaflHW$N(5`iTy#|LkBiNLoE>@x z7;A3y#U*_G`o`J$bx~1~xw-jj@q!8{#TFJYxk-=@tKM>96WnHDi}y5b0v_E@<=B{7 zUWY`N)nzt&s+Fq*6#hjLaiDX4?{c#G<}O;W8vOY{ERDp-=|&%5^Y16-^71l>+9Z7c zjv+Zwpez)4@7-wm2b1nk%ugw%ufkdMo3SKgR}LbA?t+c4LlQM_Kmr@3gFnAa&dPEG z0**ddWT&-uT54K`#c7PhFz0ET*Mxxr!= znjz*NeaWZ_Wc^mo64iU&X;$MuRA8fD>5?Plwr$;O;S;^p7e^!C8yJGWzCS=LDcjv= zjnwM6{t~5+NTHlRVb~~l<1LHDv9H^KF^|;SrX{dazA-9G*II<^1a bvyMQXJ^3fnq$=GA0sj Date: Mon, 26 Nov 2012 17:15:03 -0500 Subject: [PATCH 02/35] Added Custom Item: Monogrammed Handkerchief --- code/modules/customitems/item_defines.dm | 5 +++++ config/custom_items.txt | 1 + icons/obj/custom_items.dmi | Bin 35600 -> 35740 bytes 3 files changed, 6 insertions(+) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 26fc2faebae..b341d3d0dfd 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -61,6 +61,11 @@ icon_state = "paper" item_state = "paper" +/obj/item/fluff/maurice_bedford_1 + name = "Monogrammed Handkerchief" + desc = "A neatly folded handkerchief embroidered with a 'M'." + icon_state = "maurice_bedford_1" + ////////////////////////////////// ////////// Usable Items ////////// ////////////////////////////////// diff --git a/config/custom_items.txt b/config/custom_items.txt index 220783f37c0..bda1cf5ada6 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -27,6 +27,7 @@ lexusjjss: Lexus Langg: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/we lexusjjss: Zachary Tomlinson: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask madmalicemccrea: Alice McCrea: /obj/item/clothing/head/welding/fluff/alice_mccrea_1 mangled: Li Matsuda: /obj/item/weapon/lighter/zippo/fluff/li_matsuda_1 +maximumbob: Maurice Bedford: /obj/item/fluff/maurice_bedford_1 mcgulliver: Wox Derax: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/lithiumflask misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1 diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index ac4ae2834817ac6160262cbe502af49ea84c50cf..9c552ae4f568699972bbb550298b41f5b4970ca6 100644 GIT binary patch delta 16277 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%0A`+IGvu3XtJVdKcSpk75=h@wRO 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 delta 15942 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 From f1b328f1fb457878a361cd7962301a4a39c645a3 Mon Sep 17 00:00:00 2001 From: MrYeti Date: Mon, 26 Nov 2012 18:55:54 -0500 Subject: [PATCH 03/35] Finished up Roaper's Custom item Now ready to push! --- code/modules/customitems/item_defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index b341d3d0dfd..82d538981ff 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -387,7 +387,7 @@ icon_state = "uzenwa_sissra_1" /obj/item/clothing/glasses/welding/fluff/ian_colm_2 //roaper: Ian Colm - name = "Welding Goggles" + name = "Ian's Goggles" desc = "A pair of goggles used in the application of welding." icon = 'custom_items.dmi' icon_state = "ian_colm_1" From c896fd6fcb2cacb872ba5094e6a86fba2cbfc841 Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Tue, 27 Nov 2012 05:47:43 -0800 Subject: [PATCH 04/35] Added feedback messages for when service bot auto-refills their drink containers. Tweaked battery charge usage for refilling, and fixed bug where it would not refill if you empty it completely. --- .../reagents/reagent_containers/food/drinks.dm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 8471568c3ec..020efe4a313 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -93,15 +93,27 @@ user << "\red [target] is full." return + + + var/datum/reagent/refill + var/datum/reagent/refillName + if(isrobot(user)) + refill = reagents.get_master_reagent_id() + refillName = reagents.get_master_reagent_name() + var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) user << "\blue You transfer [trans] units of the solution to [target]." if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell var/mob/living/silicon/robot/bro = user - bro.cell.use(30) - var/refill = reagents.get_master_reagent_id() - spawn(600) + var/chargeAmount = max(30,4*trans) + bro.cell.use(chargeAmount) + user << "Now synthesizing [trans] units of [refillName]..." + + + spawn(300) reagents.add_reagent(refill, trans) + user << "Cyborg [src] refilled." return From 69992184d30959dd72ef2f946c7bbf271378d4e2 Mon Sep 17 00:00:00 2001 From: MrYeti Date: Tue, 27 Nov 2012 14:16:21 -0500 Subject: [PATCH 05/35] Deleted the items! --- code/modules/customitems/item_defines.dm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 82d538981ff..8f8053bb318 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -372,14 +372,6 @@ icon = 'custom_items.dmi' icon_state = "book_berner_1" -/* -/obj/item/clothing/glasses/fluff/serithi_artalis_1 //serithi: Serithi Artalis - name = "extranet HUD" - desc = "A heads-up display with limited connectivity to the NanoTrasen Extranet, capable of displaying information from official NanoTrasen records." - icon = 'custom_items.dmi' - icon_state = "serithi_artalis_1" -*/ - /obj/item/clothing/glasses/fluff/uzenwa_sissra_1 //sparklysheep: Uzenwa Sissra name = "Scanning Goggles" desc = "A very oddly shaped pair of goggles with bits of wire poking out the sides. A soft humming sound emanates from it." @@ -433,13 +425,6 @@ icon = 'custom_items.dmi' icon_state = "taryn_kifer_1" -/*/obj/item/clothing/head/fluff/enos_adlai_1 //roaper: Enos Adlai - name = "comfy cap" - desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense." - icon = 'custom_items.dmi' - icon_state = "enos_adlai_1" -*/ - /obj/item/clothing/head/fluff/edvin_telephosphor_1 //foolamancer: Edvin Telephosphor name = "Edvin's Hat" desc = "A hat specially tailored for Skrellian anatomy. It has a yellow badge on the front, with a large red 'T' inscribed on it." From 5e74a9803c4e4242f4a796eaae8aea1328c3dc5d Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Tue, 27 Nov 2012 15:16:59 -0800 Subject: [PATCH 06/35] Modified Service Bot's Tray to actually be useful Service Borg's tray now can load and unload items. --- .../mob/living/silicon/robot/robot_items.dm | 79 +++++++++++++++++++ .../mob/living/silicon/robot/robot_modules.dm | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 code/modules/mob/living/silicon/robot/robot_items.dm diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm new file mode 100644 index 00000000000..5d121d909e4 --- /dev/null +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -0,0 +1,79 @@ +// A special tray for the service droid. Allow droid to pick up and drop items as if they were using the tray normally +// Click on table to unload, click on item to load. Otherwise works identically to a tray. + +/obj/item/weapon/tray/robotray + name = "RoboTray" + desc = "An autoloading tray specilized made for carrying refreshments." + +/obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob) + if ( !target ) + return + if ( istype(target,/obj/item)) //pick up items, mostly copied from base tray pickup + if ( !isturf(target.loc) ) // Don't load up stuff if it's inside a container or mob! + return + var turf/pickup = target.loc + + var addedSomething = 0 + + for(var/obj/item/I in pickup) + if( I != src && !I.anchored && !istype(I, /obj/item/clothing/under) && !istype(I, /obj/item/clothing/suit) && !istype(I, /obj/item/projectile) ) + var/add = 0 + if(I.w_class == 1.0) + add = 1 + else if(I.w_class == 2.0) + add = 3 + else + add = 5 + if(calc_carry() + add >= max_carry) + break + + I.loc = src + carrying.Add(I) + overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer) + addedSomething = 1 + if ( addedSomething ) + user.visible_message("\blue [user] load some items onto their service tray.") + + return + + + if ( isturf(target) || istype(target,/obj/structure/table) ) // Unload the tray! + var foundtable = istype(target,/obj/structure/table/) + if ( !foundtable ) //it must be a turf! + for(var/obj/structure/table/T in target) + foundtable = 1 + break + + var turf/dropspot + if ( !foundtable ) // don't unload things onto walls or other silly places. + dropspot = user.loc + else if ( isturf(target) ) // they clicked on a turf with a table in it + dropspot = target + else // they clicked on a table + dropspot = target.loc + + + overlays = null + + var droppedSomething = 0 + + for(var/obj/item/I in carrying) + I.loc = dropspot + carrying.Remove(I) + droppedSomething = 1 + if(!foundtable && isturf(dropspot)) + // if no table, presume that the person just shittily dropped the tray on the ground and made a mess everywhere! + spawn() + for(var/i = 1, i <= rand(1,2), i++) + if(I) + step(I, pick(NORTH,SOUTH,EAST,WEST)) + sleep(rand(2,4)) + if ( droppedSomething ) + if ( foundtable ) + user.visible_message("\blue [user] unloads their service tray.") + else + user.visible_message("\blue [user] drops all the items on their tray.") + + return ..() + + diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 2817ab49579..40ccc5a96dd 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -182,7 +182,7 @@ L.lit = 1 src.modules += L - src.modules += new /obj/item/weapon/tray(src) + src.modules += new /obj/item/weapon/tray/robotray(src) src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src) src.emag = new /obj/item/weapon/reagent_containers/food/drinks/beer(src) From 09f1d74566c8949bcb6b731dea6b8c7c8fb826f4 Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Tue, 27 Nov 2012 15:24:44 -0800 Subject: [PATCH 07/35] Fixed typo in tray description --- code/modules/mob/living/silicon/robot/robot_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 5d121d909e4..cfaaac8a608 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -3,7 +3,7 @@ /obj/item/weapon/tray/robotray name = "RoboTray" - desc = "An autoloading tray specilized made for carrying refreshments." + desc = "An autoloading tray specialized for carrying refreshments." /obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob) if ( !target ) From e11bab8ed7441a44fd2ef14f3480bbba54a4729c Mon Sep 17 00:00:00 2001 From: cib Date: Wed, 28 Nov 2012 02:32:04 +0100 Subject: [PATCH 08/35] Balancing emergency air tanks. - Reduced volume by 33%, since testing revealed they currently last nearly 10 minutes - Made *everyone* spawn with emergency air tanks, as opposed to random jobs like lawyer etc. --- code/game/jobs/job/assistant.dm | 4 ++++ code/game/jobs/job/civilian.dm | 24 +++++++++++++++++++ code/game/jobs/job/civilian_chaplain.dm | 4 ++++ code/game/jobs/job/medical.dm | 8 +++++++ code/game/jobs/job/science.dm | 10 ++++++-- .../objects/items/weapons/tanks/tank_types.dm | 2 +- 6 files changed, 49 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 5a68cf9e182..b5b6f039707 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -12,4 +12,8 @@ if(!H) return 0 H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 274f5146b7b..1347cc2fd24 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -57,6 +57,10 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(H), slot_head) H.equip_to_slot_or_del(new /obj/item/device/pda/chef(H), slot_belt) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -80,6 +84,10 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store) H.equip_to_slot_or_del(new /obj/item/device/pda/botanist(H), slot_belt) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -105,6 +113,10 @@ H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -127,6 +139,10 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/cargo(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -251,6 +267,10 @@ 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/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/janitor(H), slot_belt) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -273,6 +293,10 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/librarian(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/weapon/barcodescanner(H), slot_l_hand) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index eca1cb35828..6ad83d2b238 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -18,6 +18,10 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt) 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/black(H), slot_shoes) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) spawn(0) var/religion_name = "Christianity" var/new_religion = copytext(sanitize(input(H, "You are the Chaplain. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)),1,MAX_NAME_LEN) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 900061d9639..8d57e15fcc1 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -99,6 +99,10 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/chemist(H), slot_wear_suit) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -122,6 +126,10 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/geneticist(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/genetics(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 /* diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index f1a202f1341..0a8a881f34b 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -18,6 +18,10 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -41,6 +45,8 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/science(H), slot_wear_suit) -// H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) -// H.equip_to_slot_or_del(new /obj/item/weapon/tank/oxygen(H), slot_l_hand) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 \ No newline at end of file diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 1cbca540bd1..3d785619255 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -134,7 +134,7 @@ w_class = 2.0 force = 4.0 distribute_pressure = ONE_ATMOSPHERE*O2STANDARD - volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) + volume = 2 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) New() From 2c47afc22e0d469fddf1f59e09627e528a1d7029 Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Wed, 28 Nov 2012 03:03:20 -0800 Subject: [PATCH 09/35] Roboitems - Printing Pen Allows service borg to rename paper. Click on pen to toggle between writing and renaming mode. --- .../mob/living/silicon/robot/robot_items.dm | 30 +++++++++++++++++++ .../mob/living/silicon/robot/robot_modules.dm | 2 +- code/modules/paperwork/paper.dm | 5 +++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index cfaaac8a608..2dd33fd5f6d 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -76,4 +76,34 @@ return ..() +// A special pen for service droids. Can be toggled to switch between normal writting mode, and paper rename mode +// Allows service droids to rename paper items. + +/obj/item/weapon/pen/robopen + desc = "A black ink printing attachment with a paper naming mode." + name = "Printing Pen" + var/mode = 1 + +/obj/item/weapon/pen/robopen/attack_self(mob/user as mob) + playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) + if (mode == 1) + mode = 2 + user << "Changed printing mode to 'Rename Paper'" + return + if (mode == 2) + mode = 1 + user << "Changed printing mode to 'Write Paper'" + +/obj/item/weapon/pen/robopen/proc/RenamePaper(mob/user as mob,obj/paper as obj) + if ( !user || !paper ) + return + var/n_name = input(user, "What would you like to label the paper?", "Paper Labelling", null) as text + if ( !user || !paper ) + return + + n_name = copytext(n_name, 1, 32) + if(( get_dist(user,paper) <= 1 && user.stat == 0)) + paper.name = "paper[(n_name ? text("- '[n_name]'") : null)]" + add_fingerprint(user) + return diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 40ccc5a96dd..7f97fa87bc9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -170,7 +170,7 @@ ..() src.modules += new /obj/item/weapon/reagent_containers/food/drinks/beer(src) src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src) - src.modules += new /obj/item/weapon/pen(src) + src.modules += new /obj/item/weapon/pen/robopen(src) var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src) M.matter = 30 diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index c007425c9b8..ccaf59f8d29 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -264,7 +264,10 @@ clown = 1 if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon)) - user << browse("[name][info_links][stamps]", "window=[name]") + if ( istype(P, /obj/item/weapon/pen/robopen) && P:mode == 2 ) + P:RenamePaper(user,src) + else + user << browse("[name][info_links][stamps]", "window=[name]") //openhelp(user) return else if(istype(P, /obj/item/weapon/stamp)) From 17440ff756db9a08edd73c22cdde9ff95f412399 Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Wed, 28 Nov 2012 12:37:27 -0800 Subject: [PATCH 10/35] Fixed blood regen bug Nutriment is stored in reagents. Vessel is only for blood. --- code/modules/mob/living/carbon/human/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index c4a5ab3fa35..1ef8ed18e28 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -140,7 +140,7 @@ if(D.data["donor"] == src) B = D break - var/datum/reagent/nutriment/F = locate() in vessel.reagent_list + var/datum/reagent/nutriment/F = locate() in reagents.reagent_list if(F != null) if(F.volume >= 1) // nutriment speeds it up quite a bit From 1c3d72e471f405236a732998bcba8e1b734b39ca Mon Sep 17 00:00:00 2001 From: MrYeti Date: Wed, 28 Nov 2012 16:38:40 -0500 Subject: [PATCH 11/35] Added My own Custom item and Misterbook's pipe spawning in his backpack. Also deleted some stuff that were requested for deletion. --- code/modules/customitems/item_defines.dm | 45 +++++++++++------------ config/custom_items.txt | 2 + icons/mob/feet.dmi | Bin 5209 -> 5610 bytes icons/obj/custom_items.dmi | Bin 35740 -> 36106 bytes 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 8f8053bb318..6ee0502c886 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -385,15 +385,6 @@ icon_state = "ian_colm_1" //////////// Hats //////////// -//Removed by request -/* -/obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1 //deusdactyl: Greg Anderson - name = "old hard hat" - desc = "An old dented hard hat with the nametag \"Anderson\". It seems to be backwards." - icon_state = "hardhat0_dblue" //Already an in-game sprite - item_state = "hardhat0_dblue" - color = "dblue" -*/ /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard name = "\improper SWAT hat" @@ -533,25 +524,31 @@ //////////// Shoes //////////// -/*/obj/item/clothing/shoes/fluff/leatherboots //serithi: Serithi Artalis - name = "leather boots" - desc = "A pair of leather boots. Well-worn, but still kept in good condition. There is a small \"S\" scratched into the back of each boot." +/obj/item/clothing/shoes/magboots/fluff/susan_harris_1 //sniperyeti: Susan Harris + name = "Susan's Magboots" + desc = "A colorful pair of magboots with the name Susan Harris clearly written on the back." icon = 'custom_items.dmi' - icon_state = "leatherboots" - item_state = "jackboots" -*/ + icon_state = "atmosmagboots0" + verb/toggle() + set name = "Toggle Magboots" + set category = "Object" + set src in usr + if(src.magpulse) + src.flags &= ~NOSLIP + src.slowdown = SHOES_SLOWDOWN + src.magpulse = 0 + icon_state = "atmosmagboots0" + usr << "You disable the mag-pulse traction system." + else + src.flags |= NOSLIP + src.slowdown = 2 + src.magpulse = 1 + icon_state = "atmosmagboots1" + usr << "You enable the mag-pulse traction system." + //////////// Sets //////////// -////// CDC //deusdactyl: Roger Wiles -//Removed by request. /* -/obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit - name = "\improper CDC jumpsuit" - desc = "A modified standard-issue CDC jumpsuit made of a special fiber that gives special protection against biohazards. It has a biohazard symbol sewn into the back." - icon = 'custom_items.dmi' - icon_state = "cdc_jumpsuit" - color = "cdc_jumpsuit" - /obj/item/clothing/suit/labcoat/fluff/cdc_labcoat name = "\improper CDC labcoat" desc = "A standard-issue CDC labcoat that protects against minor chemical spills. It has the name \"Wiles\" sewn on to the breast pocket." diff --git a/config/custom_items.txt b/config/custom_items.txt index bda1cf5ada6..e2203141e65 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -29,6 +29,7 @@ madmalicemccrea: Alice McCrea: /obj/item/clothing/head/welding/fluff/alice_mccre mangled: Li Matsuda: /obj/item/weapon/lighter/zippo/fluff/li_matsuda_1 maximumbob: Maurice Bedford: /obj/item/fluff/maurice_bedford_1 mcgulliver: Wox Derax: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/lithiumflask +misterbook: Smoke Perkins: /obj/item/clothing/mask/cigarette/pipe misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1 naples: Russell Vierson: /obj/item/weapon/lighter/zippo/fluff/naples_1 @@ -47,6 +48,7 @@ searif: Ara Al-Jazari: /obj/item/clothing/under/rank/bartender/fluff/classy sirribbit: /obj/item/weapon/clipboard/fluff/mcreary_journal sicktrigger: David Fanning: /obj/item/fluff/david_fanning_1 silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1 +sniperyeti: Susan Harris: /obj/item/clothing/shoes/magboots/fluff/susan_harris_1 spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/labcoat/fluff/pink sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1 sparklysheep: Uzenwa Sissra: /obj/item/clothing/glasses/fluff/uzenwa_sissra_1 diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index b7b7b3fdf8bd510b43d14f2a1a09e7547bd5aef3..e254e60ad90ac2a2275d42f8827bea243309fb40 100644 GIT binary patch delta 5121 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%0DHUD`15*;GCzna5 z_K3NeJqxbR6epL3s8mT!Z+$gnGYe&BdySV__%|CPa(fLjNgU#-=uBjBBQgdRj2TSO zQbeiu(zgW9Ce><-QjgRxv$&5v-|{&|rcKUs$D_|+M$A5d1VRdT3*)IKC7 zDEQlaOE-cxak}d4Dp?^3qb>O^AYY~XB$CVCwR5+Y513mh6En?+UJ!Yu6F0obuF@qJ zFOWu{D$J(_+9KoncCsIw4DBYIQZCN`d5{g?bT2}aX9?EDsHX=^HM+H8Ef5j)gaJ*1 z74yw5xmYJl@)}f|5?vE8r|mhXZG<$mY^qGFd|~1RTW}=8ZA2HKE#VC8!WS*)ib?f) z?IF^@^>O+rAn-?z0~*zFJ>ek5J@Ku!q-ydQtKODMT=d2o?FAEUE8g#)A$MpYFB!#t z$?r$cu*q%3?7+RAqyo0vbax^nWf?lbLWw%29yD57SHEaV%g<-ZwY&X-8T14i7pEkn z=uHUVKrYiECdW1!$Ofxdyb_`dn&?rUQgDbu%;$Rau+ zo0?mh5~SAOA(v@vx(pvu4B_8ZUf5km#l%rMW1I#`#)RCcsT8>(MMf=ZrazfLleArq zA7JZ-`Db>+ij49ZnivdU|Kz>p_EaihUh-(oy&;xR_tB?P90)mjXb8+LO&<;D)$bV1 z08yL+CzM*`RcB9O?L$;d%b)`%93SWFLK0+-bf>2bZ)@4U@|Bi@B5AN}vQqlwU;60` zTsc4gaQ)1>@U<3d4xP#4>E=%cf^z^(4LJzR)zVaJdc%K#2E7mS+$5Q8{DylAhl)_| zOtH~bc|Ld@0f;s&(danjcf)-K$tAkxHd~Ck2Mf$aanJ^G1T3&G+{^YtvXRXUpL21M zHuLb8+AHCdbQa$i^}4PKEa3ET32EVPD6y>YAqT3^b9qJX?J5mhhWz$JKaSP2Z`%*i z;OW?#U6pHH$o}zhp~I=88+JVX+53P+{K=1hbi|Fpfn^;38ZP6By~WXR&>H1v`0zLh&z{7N$it^L%52PR3GhnTGtCCv zbZ#mzZrQqqvG%iP>YO$VHAcf|a&uY7O!3f?;?P;r_IlYkXRAM3o8t1j7#IrKBTnc% z1)xFOzQ0>L`CLs}6`<4%AF}KGg2#M^Q0K5Dv|b zVH)Gq=w_d#6;iKaHayA`smFpsCvC*3)3h?`LB`JSHy3z+wqO0rE}Wrn=&{AbT!7;N z5aJ(^`Ja-C+TE?u9&Gp$)dh3F zGFS*|V^{|CyMxH>_3SipzF{x6beGwe95$pF1Er#U$dm?l390^^3KlPW&CiaH33Nke zqWeYN`*%+{vMywKtgkQj=IT0DnB9*24i5E0M0eIU6PEXyM4?v(VNk`~9C3*DOeJzN7G%a$#7*I9ot z8y}k5=lK~87RTd8PU_h8;%ej;tM7VWUF-fN;C>}z1p~Q1RO+1uDO!1D`Hp8H)9ji? z)w$S7RIu)!5TAQjVgMU&h{MX45hESDSW6k+>mxGSZ-{oHmb^VpriDwN`!0_D@PXyz z@#}Z^DhnIsjFgYE;>axwUJ?u4B0 ztcq69)rrPc{1>A9{jAq7nV(+Csjt_}>yxDA5!O%*UfbpsJ8s~LbefPuIy1?xy9f^RVyn}UMT6RsuZxan@x+(k8ZaXd7?$wqx|NMC z@pew$Em6QJsl^}t+xk~~;CW)Xd2&3xUfA;81$FrFCCDjPhF2Lmf+c^0sHEUIT$RPc>RM|AD+-nf$qqdYu4kPJr>s9IekEIk~-fw*hTlZMg0dT?g1 zK%``JMX1KQGv4zv^+i3Kp;?Yuyo`O(H7CA!&t9q}4jrbUB`B~Z^CojI#r+ofh4Qxt zq1wCWPJbUZVGK>)fk2h^sGBbZ|5T(0xq8!5r@QzjU**FZ_X{l^)H0K>z0)dMqfhaS zN%FW}epR8lkJP&m1LTXW98Fc0-*3wdkzotnwWQWX1G5}e4e7Y>AFPbS2XxJyzp%94 btGntkU5Dod`yYHd!ouLHv3~iLdtv_rhOg%( delta 4701 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 diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 9c552ae4f568699972bbb550298b41f5b4970ca6..7ecb7dd33c7d3bcee23e5d1c079fcbd52a2c181d 100644 GIT binary patch delta 16455 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 MN-v(l6<>w@4`w(HWdHyG delta 16274 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%0A`+IGvu3XtJVdKcSpk75=h@wRO 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 Xse(a+#3}^@{85lqeN!p(?&JRe6Q9L* From 06ae2ded6f46b38a73f8ebe623f5bf6b297795ce Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Thu, 29 Nov 2012 12:10:30 -0800 Subject: [PATCH 12/35] Change - Robotray only picks up food/drinks/condiments --- code/modules/mob/living/silicon/robot/robot_items.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 2dd33fd5f6d..a1db309bc9e 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -15,7 +15,9 @@ var addedSomething = 0 - for(var/obj/item/I in pickup) + for(var/obj/item/weapon/reagent_containers/food/I in pickup) + + if( I != src && !I.anchored && !istype(I, /obj/item/clothing/under) && !istype(I, /obj/item/clothing/suit) && !istype(I, /obj/item/projectile) ) var/add = 0 if(I.w_class == 1.0) From 01828f8a02fabe1e460e0d6184f55943b1decdea Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Thu, 29 Nov 2012 12:21:38 -0800 Subject: [PATCH 13/35] Added more comments --- .../mob/living/silicon/robot/robot_items.dm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index a1db309bc9e..4b66af1f7d5 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -1,5 +1,6 @@ // A special tray for the service droid. Allow droid to pick up and drop items as if they were using the tray normally // Click on table to unload, click on item to load. Otherwise works identically to a tray. +// Unlike the base item "tray", robotrays ONLY pick up food, drinks and condiments. /obj/item/weapon/tray/robotray name = "RoboTray" @@ -8,7 +9,9 @@ /obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob) if ( !target ) return - if ( istype(target,/obj/item)) //pick up items, mostly copied from base tray pickup + // pick up items, mostly copied from base tray pickup proc + // see code\game\objects\items\weapons\kitchen.dm line 241 + if ( istype(target,/obj/item)) if ( !isturf(target.loc) ) // Don't load up stuff if it's inside a container or mob! return var turf/pickup = target.loc @@ -38,8 +41,10 @@ return + // Unloads the tray, copied from base item's proc dropped() and altered + // see code\game\objects\items\weapons\kitchen.dm line 263 - if ( isturf(target) || istype(target,/obj/structure/table) ) // Unload the tray! + if ( isturf(target) || istype(target,/obj/structure/table) ) var foundtable = istype(target,/obj/structure/table/) if ( !foundtable ) //it must be a turf! for(var/obj/structure/table/T in target) @@ -78,6 +83,9 @@ return ..() + + + // A special pen for service droids. Can be toggled to switch between normal writting mode, and paper rename mode // Allows service droids to rename paper items. @@ -96,6 +104,9 @@ mode = 1 user << "Changed printing mode to 'Write Paper'" +// Copied over from paper's rename verb +// see code\modules\paperwork\paper.dm line 62 + /obj/item/weapon/pen/robopen/proc/RenamePaper(mob/user as mob,obj/paper as obj) if ( !user || !paper ) return From b8a12b0b52d9fcdaa327950b954219fb0729b273 Mon Sep 17 00:00:00 2001 From: SweeperM Date: Thu, 29 Nov 2012 21:08:58 +0000 Subject: [PATCH 14/35] Fixes to lighting -Fixed #2005 (for sure!) -Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of. -Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on. --- code/controllers/_DynamicAreaLighting_TG.dm | 60 +++++++++++++++++++ code/game/objects/items/candle.dm | 45 ++++++++------ code/game/objects/items/devices/PDA/PDA.dm | 42 ++++++++----- code/game/objects/items/devices/flashlight.dm | 48 +++++++++------ .../objects/items/weapons/cigs_lighters.dm | 40 ++++++++----- code/modules/clothing/head/hardhat.dm | 37 ++++++++---- code/modules/clothing/head/misc_special.dm | 38 +++++++----- code/modules/clothing/spacesuits/rig.dm | 37 ++++++++---- code/modules/mob/living/carbon/carbon.dm | 12 ++-- .../mob/living/carbon/human/inventory.dm | 16 +++-- .../mob/living/carbon/monkey/inventory.dm | 8 ++- .../mob/living/silicon/robot/robot_modules.dm | 2 +- .../reagent_containers/food/snacks/grown.dm | 4 +- code/setup.dm | 2 +- maps/tgstation.2.0.9.1.dmm | 2 +- 15 files changed, 271 insertions(+), 122 deletions(-) diff --git a/code/controllers/_DynamicAreaLighting_TG.dm b/code/controllers/_DynamicAreaLighting_TG.dm index 2bc317aabbc..3d9f66c9f37 100644 --- a/code/controllers/_DynamicAreaLighting_TG.dm +++ b/code/controllers/_DynamicAreaLighting_TG.dm @@ -294,6 +294,66 @@ area //show the dark overlay so areas, not yet in a lighting subarea, won't be bright as day and look silly. SetLightLevel(4) +atom + var/light_on = 0 //Am I emitting light? + var/brightness_on = 0 //Luminosity when the above: light_on = 1 + + //Called when turning off or dropping a flashlight for ex. + //It checks the users slots for another source of light, and return the appropriate brightness. 0 if no other source is found + proc/search_light(mob/M, obj/item/W as obj) + var/list/slots + var/obj/item/I + var brightness = 0 //the new brightness to be returned + + if (istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + slots = list ( + "l_hand", + "r_hand", + "belt", + "head", + "l_pocket", + "r_pocket", + "s_store") + + for (var/slot in slots) + switch(slot) + if("belt") + I = H.belt + if("head") + I = H.head + if("l_hand") + I = H.l_hand + if("r_hand") + I = H.r_hand + if("l_pocket") + I = H.l_store + if("r_pocket") + I = H.r_store + if("s_store") + I = H.s_store + if (I) + if ((I.light_on) && (I != W)) //an item emitting light other than itself + if (I.brightness_on > brightness) + brightness = I.brightness_on + + else if (istype(M, /mob/living/carbon/monkey)) + slots = list ( + "l_hand", + "r_hand") + + for (var/slot in slots) + switch(slot) + if("l_hand") + I = M.l_hand + if("r_hand") + I = M.r_hand + if (I) + if ((I.light_on) && (I != W)) //an item emitting light other than itself + if (I.brightness_on > brightness) + brightness = I.brightness_on + + return brightness #undef LIGHTING_MAX_LUMINOSITY #undef LIGHTING_MAX_LUMINOSITY_MOB diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index b47a2a30684..0ea57a12561 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -5,9 +5,11 @@ icon_state = "candle1" item_state = "candle1" w_class = 1 + light_on = 0 + brightness_on = 3 //luminosity when on var/wax = 200 - var/lit = 0 + proc light(var/flavor_text = "\red [usr] lights the [name].") @@ -19,7 +21,7 @@ else if(wax>80) i = 2 else i = 3 - icon_state = "candle[i][lit ? "_lit" : ""]" + icon_state = "candle[i][light_on ? "_lit" : ""]" attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -30,30 +32,30 @@ light("\red [user] casually lights the [name] with [W], what a badass.") else if(istype(W, /obj/item/weapon/lighter)) var/obj/item/weapon/lighter/L = W - if(L.lit) + if(L.light_on) light() else if(istype(W, /obj/item/weapon/match)) var/obj/item/weapon/match/M = W - if(M.lit) + if(M.light_on) light() else if(istype(W, /obj/item/candle)) var/obj/item/candle/C = W - if(C.lit) + if(C.light_on) light() light(var/flavor_text = "\red [usr] lights the [name].") - if(!src.lit) - src.lit = 1 + if(!src.light_on) + src.light_on = 1 //src.damtype = "fire" for(var/mob/O in viewers(usr, null)) O.show_message(flavor_text, 1) - SetLuminosity(CANDLE_LUM) + SetLuminosity(brightness_on) processing_objects.Add(src) process() - if(!lit) + if(!light_on) return wax-- if(!wax) @@ -68,20 +70,29 @@ attack_self(mob/user as mob) - if(lit) - lit = 0 + if(light_on) + light_on = 0 update_icon() SetLuminosity(0) - user.SetLuminosity(user.luminosity - CANDLE_LUM) + user.SetLuminosity(search_light(user, src)) pickup(mob/user) - if(lit) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) SetLuminosity(0) - user.SetLuminosity(user.luminosity + CANDLE_LUM) dropped(mob/user) - if(lit) - user.SetLuminosity(user.luminosity - CANDLE_LUM) - SetLuminosity(CANDLE_LUM) + if(light_on) + if ((layer <= 3) || (loc != user.loc)) + user.SetLuminosity(search_light(user, src)) + SetLuminosity(brightness_on) + + + equipped(mob/user, slot) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) + SetLuminosity(0) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 1207d01fad4..f0edf678650 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -13,6 +13,8 @@ var/global/list/obj/item/device/pda/PDAs = list() w_class = 1.0 flags = FPRINT | TABLEPASS slot_flags = SLOT_ID | SLOT_BELT + light_on = 0 //Is the flashlight function on? + brightness_on = 4 //Luminosity for the flashlight function //Main variables var/owner = null @@ -22,8 +24,6 @@ var/global/list/obj/item/device/pda/PDAs = list() //Secondary variables var/scanmode = 0 //1 is medical scanner, 2 is forensics, 3 is reagent scanner. - var/fon = 0 //Is the flashlight function on? - var/f_lum = 4 //Luminosity for the flashlight function var/silent = 0 //To beep or not to beep, that is the question var/toff = 0 //If 1, messenger disabled var/tnote = null //Current Texts @@ -192,14 +192,22 @@ var/global/list/obj/item/device/pda/PDAs = list() * The Actual PDA */ /obj/item/device/pda/pickup(mob/user) - if(fon) + if(light_on) + if(user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) SetLuminosity(0) - user.SetLuminosity(user.luminosity + f_lum) /obj/item/device/pda/dropped(mob/user) - if(fon) - user.SetLuminosity(user.luminosity - f_lum) - SetLuminosity(f_lum) + if(light_on) + if ((layer <= 3) || (loc != user.loc)) + user.SetLuminosity(search_light(user, src)) + SetLuminosity(brightness_on) + +/obj/item/device/pda/equipped(mob/user, slot) + if(light_on) + if(user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) + SetLuminosity(0) /obj/item/device/pda/New() ..() @@ -320,7 +328,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if (cartridge.access_remote_door) dat += "

  • Toggle Remote Door
    • " dat += "
  • Atmospheric Scan
    • " - dat += "
  • [fon ? "Disable" : "Enable"] Flashlight
    • " + dat += "
  • [light_on ? "Disable" : "Enable"] Flashlight
    • " if (pai) if(pai.loc != src) pai = null @@ -495,14 +503,18 @@ var/global/list/obj/item/device/pda/PDAs = list() //MAIN FUNCTIONS=================================== if("Light") - if(fon) - fon = 0 - if(src in U.contents) U.SetLuminosity(U.luminosity - f_lum) - else SetLuminosity(0) + if(light_on) + light_on = 0 + if(src in U.contents) + U.SetLuminosity(search_light(U, src)) + else + SetLuminosity(0) else - fon = 1 - if(src in U.contents) U.SetLuminosity(U.luminosity + f_lum) - else SetLuminosity(f_lum) + light_on = 1 + if((src in U.contents) && (U.luminosity < brightness_on)) + U.SetLuminosity(brightness_on) + else + SetLuminosity(brightness_on) if("Medical Scan") if(scanmode == 1) scanmode = 0 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 40c8fcdc89f..166b534bb72 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -10,12 +10,13 @@ m_amt = 50 g_amt = 20 icon_action_button = "action_flashlight" - var/on = 0 - var/brightness_on = 4 //luminosity when on + light_on = 0 + brightness_on = 4 //luminosity when on + var brightness = 0 /obj/item/device/flashlight/initialize() ..() - if(on) + if(light_on) icon_state = "[initial(icon_state)]-on" SetLuminosity(brightness_on) else @@ -23,16 +24,16 @@ SetLuminosity(0) /obj/item/device/flashlight/proc/update_brightness(var/mob/user = null) - if(on) + if(light_on) icon_state = "[initial(icon_state)]-on" - if(loc == user) - user.SetLuminosity(user.luminosity + brightness_on) + if((loc == user) && (user.luminosity < brightness_on)) + user.SetLuminosity(brightness_on) else if(isturf(loc)) SetLuminosity(brightness_on) else icon_state = initial(icon_state) if(loc == user) - user.SetLuminosity(user.luminosity - brightness_on) + user.SetLuminosity(search_light(user, src)) else if(isturf(loc)) SetLuminosity(0) @@ -40,14 +41,14 @@ if(!isturf(user.loc)) user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities. return - on = !on + light_on = !light_on update_brightness(user) return /obj/item/device/flashlight/attack(mob/living/M as mob, mob/living/user as mob) add_fingerprint(user) - if(on && user.zone_sel.selecting == "eyes") + if(light_on && user.zone_sel.selecting == "eyes") if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly return ..() //just hit them in the head @@ -88,15 +89,24 @@ /obj/item/device/flashlight/pickup(mob/user) - if(on) - user.SetLuminosity(user.luminosity + brightness_on) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) SetLuminosity(0) /obj/item/device/flashlight/dropped(mob/user) - if(on) - user.SetLuminosity(user.luminosity - brightness_on) - SetLuminosity(brightness_on) + if(light_on) + if ((layer <= 3) || (loc != user.loc)) + user.SetLuminosity(search_light(user, src)) + SetLuminosity(brightness_on) + + +/obj/item/device/flashlight/equipped(mob/user, slot) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) + SetLuminosity(0) /obj/item/device/flashlight/pen @@ -119,7 +129,7 @@ flags = FPRINT | TABLEPASS | CONDUCT m_amt = 0 g_amt = 0 - on = 1 + light_on = 1 // green-shaded desk lamp @@ -159,14 +169,14 @@ var/turf/pos = get_turf(src) pos.hotspot_expose(produce_heat, 5) fuel = max(fuel - 1, 0) - if(!fuel || !on) + if(!fuel || !light_on) turn_off() if(!fuel) src.icon_state = "[initial(icon_state)]-empty" processing_objects -= src /obj/item/device/flashlight/flare/proc/turn_off() - on = 0 + light_on = 0 src.force = initial(src.force) src.damtype = initial(src.damtype) if(ismob(loc)) @@ -182,12 +192,12 @@ if(!fuel) user << "It's out of fuel." return - if(!on) + if(!light_on) user.visible_message("[user] activates the flare.", "You pull the cord on the flare, activating it!") else return // All good, turn it on. - on = 1 + light_on = 1 update_brightness(user) src.force = on_damage src.damtype = "fire" diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 9499b40f617..5d5b6d6ea48 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -85,12 +85,12 @@ ZIPPO else if(istype(W, /obj/item/weapon/lighter/zippo)) var/obj/item/weapon/lighter/zippo/Z = W - if(Z.lit) + if(Z.light_on) light("With a single flick of their wrist, [user] smoothly lights their [name] with their [W]. Damn they're cool.") else if(istype(W, /obj/item/weapon/lighter)) var/obj/item/weapon/lighter/L = W - if(L.lit) + if(L.light_on) light("After some fiddling, [user] manages to light their [name] with [W].") else if(istype(W, /obj/item/weapon/match)) @@ -375,7 +375,8 @@ ZIPPO flags = TABLEPASS | CONDUCT slot_flags = SLOT_BELT attack_verb = list("burnt", "singed") - var/lit = 0 + light_on = 0 + brightness_on = 2 //luminosity when on /obj/item/weapon/lighter/zippo name = "Zippo lighter" @@ -394,8 +395,8 @@ ZIPPO /obj/item/weapon/lighter/attack_self(mob/living/user) if(user.r_hand == src || user.l_hand == src) - if(!lit) - lit = 1 + if(!light_on) + light_on = 1 icon_state = icon_on item_state = icon_on if(istype(src, /obj/item/weapon/lighter/zippo) ) @@ -411,10 +412,11 @@ ZIPPO user.apply_damage(2,BURN,"r_hand") user.visible_message("After a few attempts, [user] manages to light the [src], they however burn their finger in the process.") - user.SetLuminosity(user.luminosity + 2) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) processing_objects.Add(src) else - lit = 0 + light_on = 0 icon_state = icon_off item_state = icon_off if(istype(src, /obj/item/weapon/lighter/zippo) ) @@ -422,7 +424,7 @@ ZIPPO else user.visible_message("[user] quietly shuts off the [src].") - user.SetLuminosity(user.luminosity - 2) + user.SetLuminosity(search_light(user, src)) processing_objects.Remove(src) else return ..() @@ -433,7 +435,7 @@ ZIPPO if(!istype(M, /mob)) return - if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth" && lit) + if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth" && light_on) var/obj/item/clothing/mask/cigarette/cig = M.wear_mask if(M == user) cig.attackby(src, user) @@ -453,14 +455,24 @@ ZIPPO /obj/item/weapon/lighter/pickup(mob/user) - if(lit) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) SetLuminosity(0) - user.SetLuminosity(user.luminosity+2) return /obj/item/weapon/lighter/dropped(mob/user) - if(lit) - user.SetLuminosity(user.luminosity-2) - SetLuminosity(2) + if(light_on) + if ((layer <= 3) || (loc != user.loc)) + user.SetLuminosity(search_light(user, src)) + SetLuminosity(brightness_on) + return + + +/obj/item/weapon/lighter/equipped(mob/user, slot) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) + SetLuminosity(0) return diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index dfca62aa013..f35ddfb30c9 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -4,8 +4,8 @@ icon_state = "hardhat0_yellow" flags = FPRINT | TABLEPASS item_state = "hardhat0_yellow" - var/brightness_on = 4 //luminosity when on - var/on = 0 + brightness_on = 4 //luminosity when on + light_on = 0 color = "yellow" //Determines used sprites: hardhat[on]_[color] and hardhat[on]_[color]2 (lying down sprite) armor = list(melee = 30, bullet = 5, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20) flags_inv = 0 @@ -15,24 +15,35 @@ if(!isturf(user.loc)) user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. return - on = !on - icon_state = "hardhat[on]_[color]" - item_state = "hardhat[on]_[color]" + light_on = !light_on + icon_state = "hardhat[light_on]_[color]" + item_state = "hardhat[light_on]_[color]" - if(on) user.SetLuminosity(user.luminosity + brightness_on) - else user.SetLuminosity(user.luminosity - brightness_on) + if((light_on) && (user.luminosity < brightness_on)) + user.SetLuminosity(brightness_on) + else + user.SetLuminosity(search_light(user, src)) pickup(mob/user) - if(on) - user.SetLuminosity(user.luminosity + brightness_on) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) // user.UpdateLuminosity() //TODO: Carn SetLuminosity(0) dropped(mob/user) - if(on) - user.SetLuminosity(user.luminosity - brightness_on) -// user.UpdateLuminosity() - SetLuminosity(brightness_on) + if(light_on) + if ((layer <= 3) || (loc != user.loc)) + user.SetLuminosity(search_light(user, src)) + SetLuminosity(brightness_on) + // user.UpdateLuminosity() + + equipped(mob/user, slot) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) +// user.UpdateLuminosity() //TODO: Carn + SetLuminosity(0) /obj/item/clothing/head/hardhat/orange diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 96d6ad87059..5a3a1a18338 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -122,32 +122,42 @@ color = "pumpkin" flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE - var/brightness_on = 2 //luminosity when on - var/on = 0 + brightness_on = 2 //luminosity when on + light_on = 0 attack_self(mob/user) if(!isturf(user.loc)) user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. return - on = !on - icon_state = "hardhat[on]_[color]" - item_state = "hardhat[on]_[color]" + light_on = !light_on + icon_state = "hardhat[light_on]_[color]" + item_state = "hardhat[light_on]_[color]" - if(on) user.SetLuminosity(user.luminosity + brightness_on) - else user.SetLuminosity(user.luminosity - brightness_on) + if((light_on) && (user.luminosity < brightness_on)) + user.SetLuminosity(brightness_on) + else + user.SetLuminosity(search_light(user, src)) pickup(mob/user) - if(on) - user.SetLuminosity(user.luminosity + brightness_on) -// user.UpdateLuminosity() + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) +// user.UpdateLuminosity() //TODO: Carn SetLuminosity(0) dropped(mob/user) - if(on) - user.SetLuminosity(user.luminosity - brightness_on) -// user.UpdateLuminosity() - SetLuminosity(brightness_on) + if(light_on) + if ((layer <= 3) || (loc != user.loc)) + user.SetLuminosity(search_light(user, src)) + SetLuminosity(brightness_on) + // user.UpdateLuminosity() + equipped(mob/user, slot) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) +// user.UpdateLuminosity() //TODO: Carn + SetLuminosity(0) /* * Kitty ears */ diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index ab04e347fe8..d90e9cee49c 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -6,8 +6,8 @@ item_state = "eng_helm" armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/device/flashlight) - var/brightness_on = 4 //luminosity when on - var/on = 0 + brightness_on = 4 //luminosity when on + light_on = 0 color = "engineering" //Determines used sprites: rig[on]-[color] and rig[on]-[color]2 (lying down sprite) icon_action_button = "action_hardhat" heat_protection = HEAD @@ -17,24 +17,35 @@ if(!isturf(user.loc)) user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. return - on = !on - icon_state = "rig[on]-[color]" + light_on = !light_on + icon_state = "rig[light_on]-[color]" // item_state = "rig[on]-[color]" - if(on) user.SetLuminosity(user.luminosity + brightness_on) - else user.SetLuminosity(user.luminosity - brightness_on) + if((light_on) && (user.luminosity < brightness_on)) + user.SetLuminosity(brightness_on) + else + user.SetLuminosity(search_light(user, src)) pickup(mob/user) - if(on) - user.SetLuminosity(user.luminosity + brightness_on) -// user.UpdateLuminosity() + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) +// user.UpdateLuminosity() //TODO: Carn SetLuminosity(0) dropped(mob/user) - if(on) - user.SetLuminosity(user.luminosity - brightness_on) -// user.UpdateLuminosity() - SetLuminosity(brightness_on) + if(light_on) + if ((layer <= 3) || (loc != user.loc)) + user.SetLuminosity(search_light(user, src)) + SetLuminosity(brightness_on) + // user.UpdateLuminosity() + + equipped(mob/user, slot) + if(light_on) + if (user.luminosity < brightness_on) + user.SetLuminosity(brightness_on) +// user.UpdateLuminosity() //TODO: Carn + SetLuminosity(0) /obj/item/clothing/suit/space/rig name = "engineering hardsuit" diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 2024fefdbc7..939d78b0d67 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -421,19 +421,19 @@ if(!item) return //Grab processing has a chance of returning null + item.layer = initial(item.layer) u_equip(item) update_icons() - if(src.client) - src.client.screen -= item + //if(src.client) + //src.client.screen -= item - item.loc = src.loc + //item.loc = src.loc - if(istype(item, /obj/item)) - item:dropped(src) // let it know it's been dropped + //if(istype(item, /obj/item)) + //item:dropped(src) // let it know it's been dropped //actually throw it! if (item) - item.layer = initial(item.layer) src.visible_message("\red [src] has thrown [item].") if(!src.lastarea) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 614715275e9..db7342061cd 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -159,9 +159,8 @@ client.screen -= W W.loc = loc W.dropped(src) - if(W) - W.layer = initial(W.layer) - + //if(W) + //W.layer = initial(W.layer) update_action_buttons() return 1 @@ -592,7 +591,15 @@ It can still be worn/put on as normal. target.internals.icon_state = "internal1" if(slot_to_process) if(strip_item) //Stripping an item from the mob - target.u_equip(strip_item) + var/obj/item/W = strip_item + target.u_equip(W) + if (target.client) + target.client.screen -= W + if (W) + W.loc = target.loc + W.layer = initial(W.layer) + W.dropped(target) + W.add_fingerprint(source) if(slot_to_process == slot_l_store) //pockets! Needs to process the other one too. Snowflake code, wooo! It's not like anyone will rewrite this anytime soon. If I'm wrong then... CONGRATULATIONS! ;) if(target.r_store) target.u_equip(target.r_store) //At this stage l_store is already processed by the code above, we only need to process r_store. @@ -601,6 +608,7 @@ It can still be worn/put on as normal. if(item.mob_can_equip(target, slot_to_process, 0)) source.u_equip(item) target.equip_to_slot_if_possible(item, slot_to_process, 0, 1, 1) + item.dropped(source) source.update_icons() target.update_icons() diff --git a/code/modules/mob/living/carbon/monkey/inventory.dm b/code/modules/mob/living/carbon/monkey/inventory.dm index b1060ad9a96..e9f57611620 100644 --- a/code/modules/mob/living/carbon/monkey/inventory.dm +++ b/code/modules/mob/living/carbon/monkey/inventory.dm @@ -102,8 +102,8 @@ target.client.screen -= W if (W) W.loc = target.loc - W.dropped(target) W.layer = initial(W.layer) + W.dropped(target) W.add_fingerprint(source) else if (istype(item, /obj/item)) @@ -112,6 +112,8 @@ item.layer = 20 target.l_hand = item item.loc = target + item.dropped(source) + item.equipped(target,target.l_hand) if("r_hand") if (target.r_hand) var/obj/item/W = target.r_hand @@ -120,8 +122,8 @@ target.client.screen -= W if (W) W.loc = target.loc - W.dropped(target) W.layer = initial(W.layer) + W.dropped(target) W.add_fingerprint(source) else if (istype(item, /obj/item)) @@ -130,6 +132,8 @@ item.layer = 20 target.r_hand = item item.loc = target + item.dropped(source) + item.equipped(target,target.r_hand) if("back") if (target.back) var/obj/item/W = target.back diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 2817ab49579..c7a956bd0db 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -179,7 +179,7 @@ src.modules += new /obj/item/weapon/reagent_containers/robodropper(src) var/obj/item/weapon/lighter/zippo/L = new /obj/item/weapon/lighter/zippo(src) - L.lit = 1 + L.light_on = 1 src.modules += L src.modules += new /obj/item/weapon/tray(src) diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 3d0cb1ee66a..31d1536eb4b 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -216,8 +216,8 @@ seed = "/obj/item/seeds/glowberryseed" name = "bunch of glow-berries" desc = "Nutritious!" - var/on = 1 - var/brightness_on = 2 //luminosity when on + light_on = 1 + brightness_on = 2 //luminosity when on icon_state = "glowberrypile" New() ..() diff --git a/code/setup.dm b/code/setup.dm index 0fe085d5a6b..1abc93a19bb 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -534,7 +534,7 @@ var/list/liftable_structures = list(\ #define INVISIBILITY_MAXIMUM 100 //Object specific defines -#define CANDLE_LUM 3 //For how bright candles are +//#define CANDLE_LUM 3 //For how bright candles are //Why is this here? Moved to candle.dm (brightness_on) -SweeperM //Some mob defines below diff --git a/maps/tgstation.2.0.9.1.dmm b/maps/tgstation.2.0.9.1.dmm index c6f444dd29b..c1758f271e8 100644 --- a/maps/tgstation.2.0.9.1.dmm +++ b/maps/tgstation.2.0.9.1.dmm @@ -784,7 +784,7 @@ "apd" = (/turf/simulated/floor/carpet,/area/security/detectives_office) "ape" = (/obj/structure/table/woodentable,/obj/item/weapon/cigpacket,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/carpet,/area/security/detectives_office) "apf" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/carpet,/area/security/detectives_office) -"apg" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{on = 0; pixel_x = -3; pixel_y = 8},/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) +"apg" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{light_on = 0; pixel_x = -3; pixel_y = 8},/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "aph" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/requests_console{department = "Law office"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/wood,/area/lawoffice) "api" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/wood,/area/lawoffice) "apj" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/pen/red,/turf/simulated/floor/wood,/area/lawoffice) From 5c9738aab6007fddaa04f773875f7198cba07a3c Mon Sep 17 00:00:00 2001 From: SweeperM Date: Sat, 1 Dec 2012 03:49:41 +0000 Subject: [PATCH 15/35] added requested changes --- code/controllers/_DynamicAreaLighting_TG.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/controllers/_DynamicAreaLighting_TG.dm b/code/controllers/_DynamicAreaLighting_TG.dm index 3d9f66c9f37..c8f52ef9365 100644 --- a/code/controllers/_DynamicAreaLighting_TG.dm +++ b/code/controllers/_DynamicAreaLighting_TG.dm @@ -353,6 +353,13 @@ atom if (I.brightness_on > brightness) brightness = I.brightness_on + else + for (I in M.contents) //Justin Case + if (I) + if ((I.light_on) && (I != W)) //an item emitting light other than itself + if (I.brightness_on > brightness) + brightness = I.brightness_on + return brightness #undef LIGHTING_MAX_LUMINOSITY From 85c2af3871f9e5ee4d39267c435216efc30ac60f Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 1 Dec 2012 09:04:20 +0400 Subject: [PATCH 16/35] Started cleanup of medical stacks code. Removed silly way to get targeted organ. Removed child organs being affected sometimes. --- code/game/objects/items/stacks/medical.dm | 30 +---------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 5df2b005bc6..559d8255d36 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -23,40 +23,12 @@ if (istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M - var/datum/organ/external/affecting = H.get_organ("chest") + var/datum/organ/external/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) if(affecting.status & ORGAN_ROBOT) user << "\red This isn't useful at all on a robotic limb.." return 1 - if(istype(user, /mob/living/carbon/human)) - var/mob/living/carbon/human/user2 = user - affecting = H.get_organ(check_zone(user2.zone_sel.selecting)) - else - if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0) - affecting = H.get_organ("head") - - // If we're targetting arms or legs, also heal the respective hand/foot - if(affecting.name in list("l_arm","r_arm","l_leg","r_leg")) - var/datum/organ/external/child - if(affecting.name == "l_arm") - child = H.get_organ("l_hand") - else if(affecting.name == "r_arm") - child = H.get_organ("r_hand") - else if(affecting.name == "r_leg") - child = H.get_organ("r_foot") - else if(affecting.name == "l_leg") - child = H.get_organ("l_foot") - - if(src.heal_brute) - if(!affecting.bandage() && !child.bandage()) - user << "\red The wounds on this limb have already been bandaged." - return 1 - else if(src.heal_burn) - if(!affecting.salve() && !child.salve()) - user << "\red The wounds on this limb have already been salved." - return 1 - else if(src.heal_brute) if(!affecting.bandage()) user << "\red The wounds on this limb have already been bandaged." From 2f7baa26f82327a90513f422fe4569c23c605e19 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 1 Dec 2012 17:49:34 +1000 Subject: [PATCH 17/35] antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas Signed-off-by: Cael_Aislinn --- baystation12.dme | 4 ++ .../components/binary_devices/pump.dm | 6 ++ .../WorkInProgress/Cael_Aislinn/Rust/areas.dm | 61 ++++++++++++++++--- code/game/area/Space Station 13 areas.dm | 24 ++++++++ code/game/objects/effects/signs.dm | 9 +++ code/game/objects/sign_decals.dm | 49 +++++++++++++++ .../crates_lockers/closets/wardrobe.dm | 20 ++++++ 7 files changed, 166 insertions(+), 7 deletions(-) create mode 100644 code/game/objects/sign_decals.dm diff --git a/baystation12.dme b/baystation12.dme index 5ab7609868a..ce69add117c 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -288,6 +288,7 @@ #include "code\ATMOSPHERICS\he_pipes.dm" #include "code\ATMOSPHERICS\pipes.dm" #include "code\ATMOSPHERICS\components\portables_connector.dm" +#include "code\ATMOSPHERICS\components\tvalve.dm" #include "code\ATMOSPHERICS\components\valve.dm" #include "code\ATMOSPHERICS\components\binary_devices\binary_atmos_base.dm" #include "code\ATMOSPHERICS\components\binary_devices\circulator.dm" @@ -635,6 +636,7 @@ #include "code\game\objects\explosion_recursive.dm" #include "code\game\objects\items.dm" #include "code\game\objects\objs.dm" +#include "code\game\objects\sign_decals.dm" #include "code\game\objects\structures.dm" #include "code\game\objects\weapons.dm" #include "code\game\objects\closets\walllocker.dm" @@ -1206,6 +1208,7 @@ #include "code\modules\power\switch.dm" #include "code\modules\power\terminal.dm" #include "code\modules\power\tracker.dm" +#include "code\modules\power\turbine.dm" #include "code\modules\power\antimatter\containment_jar.dm" #include "code\modules\power\antimatter\control.dm" #include "code\modules\power\antimatter\shielding.dm" @@ -1338,6 +1341,7 @@ #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm" #include "code\WorkInProgress\Cael_Aislinn\shield_capacitor.dm" #include "code\WorkInProgress\Cael_Aislinn\shield_gen.dm" +#include "code\WorkInProgress\Cael_Aislinn\Rust\areas.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_monitor.dm" diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 03c5ec3eee6..7746d238d22 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -26,6 +26,12 @@ obj/machinery/atmospherics/binary/pump var/id = null var/datum/radio_frequency/radio_connection + highcap + name = "High capacity gas pump" + desc = "A high capacity pump" + + target_pressure = 15000000 + on on = 1 icon_state = "intact_on" diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm index d59882ee9ab..a8822acb60b 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm @@ -1,14 +1,61 @@ -/area/engine/cooling +//reactor areas -/area/engine/port_gyro_bay +/area/engine + fore + name = "\improper Fore" -/area/engine/starboard_gyro_bay + construction_storage + name = "\improper Construction storage" -/area/engine/generators + locker + name = "\improper Locker room" -/area/engine/turbine_control + atmos_storage + name = "\improper Atmos storage" -/area/engine/reactor_core + control + name = "\improper Control" -/area/engine/aux_control + electrical_storage + name = "\improper Electrical storage" + + reactor_core + name = "\improper Reactor Core" + icon_state = "engine_core" + + reactor_gas + name = "Reactor Gas Storage" + icon_state = "engine_atmos" + + aux_control + name = "Reactor Auxiliary Control" + icon_state = "engine_aux" + + turbine_control + name = "Turbine Control" + icon_state = "engine_turbine" + + reactor_airlock + name = "\improper Reactor Primary Entrance" + icon_state = "engine_airlock" + + reactor_fuel_storage + name = "Reactor Fuel Storage" + icon_state = "engine_fuel" + + reactor_fuel_ports + name = "\improper Reactor Fuel Ports" + icon_state = "engine_port" + + generators + name = "\improper Generator Room" + icon_state = "engine_generators" + + port_gyro_bay + name = "\improper Port Gyrotron Bay" + icon_state = "engine_starboardgyro" + + starboard_gyro_bay + name = "\improper Starboard Gyrotron Bay" + icon_state = "engine_portgyro" diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index e3e081d772c..ad012b025a1 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -684,6 +684,26 @@ proc/process_ghost_teleport_locs() name = "\improper Captain's Quarters" icon_state = "captain" +/area/crew_quarters/heads/hop + name = "\improper Head of Personnel's Quarters" + icon_state = "head_quarters" + +/area/crew_quarters/heads/hor + name = "\improper Research Director's Quarters" + icon_state = "head_quarters" + +/area/crew_quarters/heads/chief + name = "\improper Chief Engineer's Quarters" + icon_state = "head_quarters" + +/area/crew_quarters/heads/hos + name = "\improper Head of Security's Quarters" + icon_state = "head_quarters" + +/area/crew_quarters/heads/cmo + name = "\improper Chief Medical Officer's Quarters" + icon_state = "head_quarters" + /area/crew_quarters/courtroom name = "\improper Courtroom" icon_state = "courtroom" @@ -1001,6 +1021,10 @@ proc/process_ghost_teleport_locs() name = "\improper Security Office" icon_state = "security" +/area/security/lobby + name = "\improper Security lobby" + icon_state = "security" + /area/security/brig name = "\improper Brig" icon_state = "brig" diff --git a/code/game/objects/effects/signs.dm b/code/game/objects/effects/signs.dm index bec0ba7d64f..64cbc125f1a 100644 --- a/code/game/objects/effects/signs.dm +++ b/code/game/objects/effects/signs.dm @@ -77,6 +77,15 @@ opacity = 0 density = 0 +/obj/effect/sign/movingparts + desc = "A warning sign which reads 'CAUTION: MOVING PARTS, machinery liable to stop and start at random'" + name = "CAUTION" + icon = 'decals.dmi' + icon_state = "securearea" + anchored = 1.0 + opacity = 0 + density = 0 + /obj/effect/sign/examroom desc = "A guidance sign which reads 'EXAM ROOM'" name = "EXAM" diff --git a/code/game/objects/sign_decals.dm b/code/game/objects/sign_decals.dm new file mode 100644 index 00000000000..10a08d81363 --- /dev/null +++ b/code/game/objects/sign_decals.dm @@ -0,0 +1,49 @@ +/obj/effect/sign/barsign + icon = 'barsigns.dmi' + icon_state = "empty" + anchored = 1 + New() + ChangeSign(pick("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead")) + return + proc/ChangeSign(var/Text) + src.icon_state = "[Text]" + //on = 0 + //brightness_on = 4 //uncomment these when the lighting fixes get in + return + +/obj/effect/sign/securearea/ex_act(severity) + switch(severity) + if(1.0) + del(src) + return + if(2.0) + del(src) + return + if(3.0) + del(src) + return + else + return + +/obj/effect/sign/securearea/blob_act() + del(src) + return + + +/obj/effect/sign/ex_act(severity) + switch(severity) + if(1.0) + del(src) + return + if(2.0) + del(src) + return + if(3.0) + del(src) + return + else + return + +/obj/effect/sign/blob_act() + del(src) + return \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 801befad0b4..fb0b72a8d4e 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -279,6 +279,26 @@ return +/obj/structure/closet/wardrobe/medic_white + name = "medical wardrobe" + icon_state = "white" + icon_closed = "white" + +/obj/structure/closet/wardrobe/virology_white/New() + new /obj/item/clothing/under/rank/medical(src) + new /obj/item/clothing/under/rank/medical(src) + new /obj/item/clothing/under/rank/medical/blue(src) + new /obj/item/clothing/under/rank/medical/green(src) + new /obj/item/clothing/under/rank/medical/purple(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/mask/surgical(src) + new /obj/item/clothing/mask/surgical(src) + return + + /obj/structure/closet/wardrobe/grey name = "grey wardrobe" icon_state = "grey" From 7e0b6a14abceb680f1fd37dc2ce84d2dc043c74b Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 1 Dec 2012 17:49:43 +1000 Subject: [PATCH 18/35] fixed most incompatabilities with antiqua.dmm (exception being disposals sorting junctions) Signed-off-by: Cael_Aislinn --- maps/Antiqua.dmm | 584 +++++++++++++++++++++++------------------------ 1 file changed, 292 insertions(+), 292 deletions(-) diff --git a/maps/Antiqua.dmm b/maps/Antiqua.dmm index f58949a590d..74f26d466fe 100644 --- a/maps/Antiqua.dmm +++ b/maps/Antiqua.dmm @@ -137,9 +137,9 @@ "acG" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor,/area/toxins/mixing) "acH" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/toxins/mixing) "acI" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"acJ" = (/obj/machinery/portable_atmospherics/canister/air,/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"acJ" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) "acK" = (/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/toxins/mixing) -"acL" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"acL" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) "acM" = (/obj/effect/decal/cleanable/cobweb2,/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) "acN" = (/obj/machinery/deployable/barrier,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury) "acO" = (/obj/machinery/deployable/barrier,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury) @@ -173,8 +173,8 @@ "adq" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Tank Drain"; target_pressure = 202.6},/turf/simulated/floor,/area/toxins/mixing) "adr" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/toxins/mixing) "ads" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"adt" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"adu" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"adt" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"adu" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) "adv" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) "adw" = (/obj/machinery/flasher/portable,/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury) "adx" = (/obj/structure/window/reinforced,/obj/item/weapon/wrench,/obj/machinery/flasher/portable,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury) @@ -197,13 +197,13 @@ "adO" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/turf/simulated/floor{icon_state = "bot"},/area/toxins/mixing) "adP" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "bot"},/area/toxins/mixing) "adQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/effect/sign/securearea{desc = "A warning sign which reads 'DANGER: FIRE'"; icon_state = "fire"; layer = 4; name = "DANGER: FIRE"},/turf/simulated/floor/plating,/area/toxins/mixing) -"adR" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"adS" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"adT" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"adU" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/effect/sign/securearea{desc = "A warning sign which reads 'DANGER: FIRE'"; icon_state = "fire"; name = "DANGER: FIRE"; pixel_x = 32},/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"adR" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"adS" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"adT" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"adU" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'DANGER: FIRE'"; icon_state = "fire"; name = "DANGER: FIRE"; pixel_x = 32},/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) "adV" = (/obj/machinery/deployable/barrier,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury) "adW" = (/obj/machinery/deployable/barrier,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury) -"adX" = (/obj/structure/rack,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor,/area/security/armoury) +"adX" = (/obj/structure/rack,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/turf/simulated/floor,/area/security/armoury) "adY" = (/obj/structure/rack,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/baton,/obj/item/weapon/storage/handcuff_kit,/turf/simulated/floor,/area/security/armoury) "adZ" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/armoury) "aea" = (/obj/structure/table/reinforced,/obj/item/ammo_casing/shotgun/beanbag,/obj/item/ammo_casing/shotgun/beanbag,/obj/item/ammo_casing/shotgun/beanbag,/obj/item/ammo_casing/shotgun/beanbag,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/armoury) @@ -245,9 +245,9 @@ "aeK" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/fore) "aeL" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/fore) "aeM" = (/turf/simulated/wall,/area/security/armoury) -"aeN" = (/obj/structure/reagent_dispensers/peppertank{pixel_x = -30},/obj/effect/decal/warning_stripes{tag = "icon-N-corner"; icon_state = "N-corner"},/turf/simulated/floor,/area/security/armoury) -"aeO" = (/obj/effect/decal/warning_stripes{tag = "icon-N-corner"; icon_state = "N-corner"},/turf/simulated/floor,/area/security/armoury) -"aeP" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor,/area/security/armoury) +"aeN" = (/obj/structure/reagent_dispensers/peppertank{pixel_x = -30},/turf/simulated/floor,/area/security/armoury) +"aeO" = (/turf/simulated/floor,/area/security/armoury) +"aeP" = (/turf/simulated/floor,/area/security/armoury) "aeQ" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor,/area/security/armoury) "aeR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/fore) "aeS" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/assembly/assembly_line) @@ -266,10 +266,10 @@ "aff" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'NO SMOKING'"; icon_state = "nosmoking2"; name = "NO SMOKING"; pixel_x = -29; pixel_y = 1},/turf/simulated/floor,/area/toxins/mixing) "afg" = (/obj/machinery/atmospherics/portables_connector{dir = 1; name = "Node 2"},/turf/simulated/floor{icon_state = "bot"},/area/toxins/mixing) "afh" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/effect/sign/nosmoking_2{layer = 4},/turf/simulated/floor/plating,/area/toxins/mixing) -"afi" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"afj" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"afk" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"afl" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/effect/sign/securearea{desc = "A warning sign which reads 'NO SMOKING'"; icon_state = "nosmoking2"; name = "NO SMOKING"; pixel_x = 29; pixel_y = 1},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"afi" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"afj" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"afk" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"afl" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/sign/securearea{desc = "A warning sign which reads 'NO SMOKING'"; icon_state = "nosmoking2"; name = "NO SMOKING"; pixel_x = 29; pixel_y = 1},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) "afm" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea,/turf/simulated/floor/plating/airless,/area/toxins/test_area) "afn" = (/turf/simulated/floor/plating/airless,/area/toxins/test_area) "afo" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating/airless,/area/toxins/test_area) @@ -304,10 +304,10 @@ "afR" = (/obj/structure/filingcabinet,/obj/machinery/camera{c_tag = "Research Director's Office"; dir = 8; network = "Research"},/turf/simulated/floor,/area/toxins/rdoffice) "afS" = (/obj/machinery/light,/turf/simulated/floor,/area/toxins/mixing) "afT" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"afU" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) -"afV" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"afU" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) +"afV" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing) "afW" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating/airless,/area/toxins/test_area) -"afX" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor/plating/airless,/area/toxins/test_area) +"afX" = (/turf/simulated/floor/plating/airless,/area/toxins/test_area) "afY" = (/obj/structure/closet/emcloset,/obj/effect/decal/cleanable/blood,/obj/effect/decal/remains/human,/turf/simulated/floor/plating/airless,/area/toxins/test_area) "afZ" = (/obj/machinery/camera{c_tag = "North"; network = "Bomb Testing"},/obj/machinery/light/spot{dir = 1},/turf/simulated/floor/airless,/area/toxins/test_area) "aga" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/maintenance/fore) @@ -319,7 +319,7 @@ "agg" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/assembly/assembly_line) "agh" = (/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/head/welding,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/head/welding,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/assembly/assembly_line) "agi" = (/obj/machinery/power/apc{dir = 1; name = "Assembly Line APC"; pixel_x = 1; pixel_y = 25},/turf/simulated/floor,/area/assembly/assembly_line) -"agj" = (/obj/machinery/conveyor{dir = 4; id = "assemblyline1"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor,/area/assembly/assembly_line) +"agj" = (/obj/machinery/conveyor{dir = 4; id = "assemblyline1"},/turf/simulated/floor,/area/assembly/assembly_line) "agk" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor,/area/assembly/assembly_line) "agl" = (/obj/structure/table/reinforced,/obj/item/weapon/stamp,/obj/structure/table,/obj/item/weapon/clipboard,/turf/simulated/floor,/area/assembly/assembly_line) "agm" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/assembly/assembly_line) @@ -346,8 +346,8 @@ "agH" = (/obj/machinery/magnetic_controller{autolink = 1; code = 712; density = 0; name = "Target Control Console"; path = "SNNSSNNSSN"; pixel_x = 0; pixel_y = 0},/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/security/range) "agI" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range) "agJ" = (/turf/simulated/floor,/area/security/range) -"agK" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor,/area/security/range) -"agL" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range) +"agK" = (/turf/simulated/floor,/area/security/range) +"agL" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range) "agM" = (/obj/effect/decal/cleanable/cobweb,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/security/range) "agN" = (/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,/area/assembly/assembly_line) "agO" = (/obj/machinery/computer/rdconsole{id = 2; name = "Robotics R&D Console"; req_access = null; req_access_txt = "29"},/turf/simulated/floor,/area/assembly/assembly_line) @@ -363,18 +363,18 @@ "agY" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) "agZ" = (/obj/structure/closet/secure_closet/scientist,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "aha" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor,/area/toxins/lab) -"ahb" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-out"; icon_state = "SE-out"},/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/toxins/lab) -"ahc" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor,/area/toxins/lab) -"ahd" = (/obj/machinery/vending/plasmaresearch,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/toxins/lab) -"ahe" = (/obj/structure/dispenser,/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor,/area/toxins/lab) +"ahb" = (/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/toxins/lab) +"ahc" = (/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor,/area/toxins/lab) +"ahd" = (/obj/machinery/vending/plasmaresearch,/turf/simulated/floor,/area/toxins/lab) +"ahe" = (/obj/structure/dispenser,/turf/simulated/floor,/area/toxins/lab) "ahf" = (/obj/machinery/firealarm{layer = 3.7; pixel_y = 27},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "ahg" = (/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "ahh" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "ahi" = (/obj/machinery/alarm{frequency = 1437; layer = 3.7; pixel_y = 23},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "ahj" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/computer/security/telescreen{department = ""; desc = "Used for watching the explosives testing area."; layer = 4; name = "Test Chamber Telescreen"; network = "Bomb Testing"; pixel_x = 32; pixel_y = 0},/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "ahk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/toxins/lab) -"ahl" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor/airless,/area/toxins/test_area) -"ahm" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/airless,/area/toxins/test_area) +"ahl" = (/turf/simulated/floor/airless,/area/toxins/test_area) +"ahm" = (/turf/simulated/floor/airless,/area/toxins/test_area) "ahn" = (/obj/structure/table,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main) "aho" = (/obj/structure/stool/bed,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main) "ahp" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/machinery/door/airlock/security{name = "Execution"; req_access = null; req_access_txt = "19; 1"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main) @@ -382,7 +382,7 @@ "ahr" = (/obj/machinery/disposal,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/security/main) "ahs" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/security/main) "aht" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/basic{dir = 5},/turf/simulated/floor/plating,/area/security/main) -"ahu" = (/obj/effect/decal/warning_stripes{tag = "icon-U-W"; icon_state = "U-W"},/turf/simulated/floor,/area/security/range) +"ahu" = (/turf/simulated/floor,/area/security/range) "ahv" = (/obj/structure/target_stake,/obj/machinery/magnetic_module{code = 712; magnetic_field = 2; max_dist = 5; on = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range) "ahw" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range) "ahx" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/range) @@ -396,21 +396,21 @@ "ahF" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/closet/l3closet/scientist,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) "ahG" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) "ahH" = (/obj/structure/closet/l3closet/scientist,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) -"ahI" = (/obj/machinery/portable_atmospherics/pump,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/requests_console{department = "Toxins Lab"; departmentType = 2; name = "Tox lab Requests Console"; pixel_x = -30; pixel_y = -3},/turf/simulated/floor,/area/toxins/lab) -"ahJ" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/toxins/lab) +"ahI" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/requests_console{department = "Toxins Lab"; departmentType = 2; name = "Tox lab Requests Console"; pixel_x = -30; pixel_y = -3},/turf/simulated/floor,/area/toxins/lab) +"ahJ" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/toxins/lab) "ahK" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/computer/security/telescreen{department = ""; desc = "Used for watching the explosives testing area."; layer = 4; name = "Test Chamber Telescreen"; network = "Bomb Testing"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "ahL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/toxins/lab) -"ahM" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor/airless,/area/toxins/test_area) -"ahN" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-out"; icon_state = "SE-out"},/turf/simulated/floor/airless,/area/toxins/test_area) +"ahM" = (/turf/simulated/floor/airless,/area/toxins/test_area) +"ahN" = (/turf/simulated/floor/airless,/area/toxins/test_area) "ahO" = (/obj/structure/table,/obj/item/weapon/reagent_containers/ld50_syringe/choral{pixel_x = 3; pixel_y = 10},/obj/item/weapon/reagent_containers/ld50_syringe/choral{pixel_x = 3; pixel_y = 6},/obj/item/weapon/reagent_containers/ld50_syringe/choral{pixel_x = 3; pixel_y = 2},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main) "ahP" = (/obj/machinery/camera{c_tag = "Interrogation"; dir = 8; network = "Security"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main) "ahQ" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/security/main) "ahR" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/security/main) "ahS" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/security/range) "ahT" = (/obj/machinery/recharger,/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/security/range) -"ahU" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range) +"ahU" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range) "ahV" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range) -"ahW" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range) +"ahW" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range) "ahX" = (/obj/effect/sign/vacuum,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "ahY" = (/obj/machinery/door/airlock/external{name = "E.V.A."; req_access_txt = "18"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "ahZ" = (/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) @@ -419,27 +419,27 @@ "aic" = (/obj/structure/table,/obj/item/device/multitool,/obj/item/weapon/crowbar,/obj/item/device/multitool,/turf/simulated/floor,/area/assembly/assembly_line) "aid" = (/obj/machinery/camera{c_tag = "Robotics Port"; dir = 1; network = "Research"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/assembly/assembly_line) "aie" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/light,/turf/simulated/floor,/area/assembly/assembly_line) -"aif" = (/obj/machinery/conveyor{dir = 4; id = "assemblyline2"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor,/area/assembly/assembly_line) +"aif" = (/obj/machinery/conveyor{dir = 4; id = "assemblyline2"},/turf/simulated/floor,/area/assembly/assembly_line) "aig" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/structure/table,/turf/simulated/floor,/area/assembly/assembly_line) "aih" = (/turf/simulated/floor{tag = "icon-whitehall (SOUTHWEST)"; icon_state = "whitehall"; dir = 10},/area/toxins/hallway) "aii" = (/turf/simulated/floor{dir = 8; icon_state = "whitecorner"},/area/toxins/hallway) "aij" = (/obj/effect/sign/nosmoking_2,/turf/simulated/wall/r_wall,/area/toxins/lab) "aik" = (/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) "ail" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'DANGER: FIRE'"; icon_state = "fire"; name = "DANGER: FIRE"},/turf/simulated/wall/r_wall,/area/toxins/lab) -"aim" = (/obj/machinery/atmospherics/pipe/simple{dir = 6; icon_state = "intact"; initialize_directions = 6; level = 2},/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor,/area/toxins/lab) +"aim" = (/obj/machinery/atmospherics/pipe/simple{dir = 6; icon_state = "intact"; initialize_directions = 6; level = 2},/turf/simulated/floor,/area/toxins/lab) "ain" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1; icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/toxins/lab) -"aio" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact"; dir = 10; pixel_x = 0; level = 2; initialize_directions = 10},/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor,/area/toxins/lab) +"aio" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact"; dir = 10; pixel_x = 0; level = 2; initialize_directions = 10},/turf/simulated/floor,/area/toxins/lab) "aip" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "aiq" = (/obj/machinery/driver_button{dir = 2; id = "toxinsdriver"; pixel_x = 24; pixel_y = -24},/obj/machinery/computer/security/telescreen{department = ""; desc = "Used for watching the explosives testing area."; layer = 4; name = "Test Chamber Telescreen"; network = "Bomb Testing"; pixel_x = 32; pixel_y = 0},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "air" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/toxins/lab) -"ais" = (/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor/airless,/area/toxins/test_area) -"ait" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-out"; icon_state = "SW-out"},/turf/simulated/floor/airless,/area/toxins/test_area) +"ais" = (/turf/simulated/floor/airless,/area/toxins/test_area) +"ait" = (/turf/simulated/floor/airless,/area/toxins/test_area) "aiu" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/fore) "aiv" = (/obj/machinery/door/poddoor/shutters{id = "Execution"},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/security/main) "aiw" = (/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/security/main) "aix" = (/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 30},/turf/simulated/floor,/area/security/range) "aiy" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor,/area/security/range) -"aiz" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/range) +"aiz" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/range) "aiA" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/ai_monitored/storage/eva) "aiB" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "aiC" = (/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plating/airless,/area) @@ -463,11 +463,11 @@ "aiU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/toxins/lab) "aiV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/toxins/lab) "aiW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/toxins/lab) -"aiX" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/light/spot{dir = 8; layer = 2.8},/turf/simulated/floor/airless,/area/toxins/test_area) -"aiY" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/airless,/area/toxins/test_area) -"aiZ" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor/airless,/area/toxins/test_area) -"aja" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor/airless,/area/toxins/test_area) -"ajb" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor/airless,/area/toxins/test_area) +"aiX" = (/obj/machinery/light/spot{dir = 8; layer = 2.8},/turf/simulated/floor/airless,/area/toxins/test_area) +"aiY" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/airless,/area/toxins/test_area) +"aiZ" = (/turf/simulated/floor/airless,/area/toxins/test_area) +"aja" = (/turf/simulated/floor/airless,/area/toxins/test_area) +"ajb" = (/turf/simulated/floor/airless,/area/toxins/test_area) "ajc" = (/obj/structure/table{pixel_y = 0},/obj/machinery/door_control{id = "Execution"; name = "Shutter Control"; pixel_x = -25; pixel_y = 6},/turf/simulated/floor,/area/security/main) "ajd" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/security/main) "aje" = (/obj/structure/stool/bed/chair{dir = 1},/obj/item/device/radio/intercom{freerange = 1; frequency = 1443; name = "AI Private Channel"; pixel_x = 30},/turf/simulated/floor,/area/security/main) @@ -520,11 +520,11 @@ "ajZ" = (/obj/machinery/light{dir = 1},/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/assembly/chargebay) "aka" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/mecha_wreckage/durand,/turf/simulated/floor,/area/assembly/chargebay) "akb" = (/turf/simulated/wall,/area/assembly/chargebay) -"akc" = (/obj/machinery/light/spot{dir = 8; layer = 2.8},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/airless,/area/toxins/test_area) -"akd" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/airless,/area/toxins/test_area) -"ake" = (/obj/machinery/camera{c_tag = "West"; dir = 4; network = "Bomb Testing"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/airless,/area/toxins/test_area) -"akf" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor/airless,/area/toxins/test_area) -"akg" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor/airless,/area/toxins/test_area) +"akc" = (/obj/machinery/light/spot{dir = 8; layer = 2.8},/turf/simulated/floor/airless,/area/toxins/test_area) +"akd" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/airless,/area/toxins/test_area) +"ake" = (/obj/machinery/camera{c_tag = "West"; dir = 4; network = "Bomb Testing"},/turf/simulated/floor/airless,/area/toxins/test_area) +"akf" = (/turf/simulated/floor/airless,/area/toxins/test_area) +"akg" = (/turf/simulated/floor/airless,/area/toxins/test_area) "akh" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/computer/secure_data,/turf/simulated/floor,/area/security/main) "aki" = (/obj/structure/stool/bed/chair,/obj/machinery/computer/security/telescreen{desc = "Used for observing Interrogation."; layer = 4; network = "Interrogation"; pixel_y = -30},/turf/simulated/floor,/area/security/main) "akj" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/security/main) @@ -547,7 +547,7 @@ "akA" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack,/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "akB" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack,/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/ai_monitored/storage/eva) "akC" = (/obj/item/device/radio,/obj/item/device/assembly/timer,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/ai_monitored/storage/eva) -"akD" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/ai_monitored/storage/eva) +"akD" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/ai_monitored/storage/eva) "akE" = (/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil,/obj/item/weapon/wirecutters,/turf/simulated/floor/plating/airless,/area) "akF" = (/obj/item/weapon/screwdriver{pixel_y = 16},/turf/simulated/floor/plating/airless,/area) "akG" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/photocopier,/turf/simulated/floor,/area/assembly/assembly_line) @@ -587,7 +587,7 @@ "alo" = (/obj/machinery/door/window/eastright{name = "Research Division Delivery"; req_access_txt = "34"},/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "Research Division"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "bot"},/area/maintenance/starboard) "alp" = (/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard) "alq" = (/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard) -"alr" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-out"; icon_state = "NE-out"},/turf/simulated/floor/airless,/area/toxins/test_area) +"alr" = (/turf/simulated/floor/airless,/area/toxins/test_area) "als" = (/turf/simulated/floor{icon_state = "dark"},/area/security/main) "alt" = (/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "dark"},/area/security/main) "alu" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/security/main) @@ -704,7 +704,7 @@ "anB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating/airless,/area) "anC" = (/obj/machinery/door/airlock/external,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating/airless,/area/toxins/test_area) "anD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating/airless,/area/toxins/test_area) -"anE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating/airless,/area/toxins/test_area) +"anE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating/airless,/area/toxins/test_area) "anF" = (/obj/machinery/power/apc{dir = 4; name = "Explosives Testing APC"; pixel_x = 25},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/toxins/test_area) "anG" = (/obj/machinery/camera{c_tag = "South"; dir = 1; network = "Bomb Testing"},/obj/machinery/light/spot,/turf/simulated/floor/airless,/area/toxins/test_area) "anH" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Locker Room"; req_access = null; req_access_txt = "1"},/turf/simulated/floor{icon_state = "dark"},/area/security/main) @@ -763,7 +763,7 @@ "aoI" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Locker Room"; req_access = null; req_access_txt = "1"},/turf/simulated/floor,/area/security/main) "aoJ" = (/turf/simulated/wall,/area/security/detectives_office) "aoK" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/security/detectives_office) -"aoL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{name = "\improper Detective's Office"; req_access_txt = "4"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/detectives_office) +"aoL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "\improper Detective's Office"; req_access_txt = "4"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/detectives_office) "aoM" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/hallway/primary/fore) "aoN" = (/turf/simulated/floor,/area/hallway/primary/fore) "aoO" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/primary/fore) @@ -771,7 +771,7 @@ "aoQ" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/hallway/primary/fore) "aoR" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/primary/fore) "aoS" = (/obj/item/weapon/caution{desc = "Caution! Construction area!"; name = "construction area sign"},/turf/simulated/floor,/area/hallway/primary/fore) -"aoT" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor,/area/hallway/primary/fore) +"aoT" = (/turf/simulated/floor,/area/hallway/primary/fore) "aoU" = (/obj/structure/cable,/turf/simulated/floor/plating,/area/hallway/primary/fore) "aoV" = (/obj/machinery/light{dir = 1},/obj/item/weapon/caution{desc = "Caution! Construction area!"; name = "construction area sign"},/turf/simulated/floor,/area/hallway/primary/fore) "aoW" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor,/area/hallway/primary/fore) @@ -786,11 +786,11 @@ "apf" = (/obj/structure/closet/l3closet/scientist,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "apg" = (/obj/structure/closet/secure_closet/scientist,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "aph" = (/obj/machinery/disposal,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) -"api" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/toxins/xenobiology) -"apj" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Xeno Containment"},/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/toxins/xenobiology) -"apk" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor,/area/toxins/xenobiology) +"api" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/toxins/xenobiology) +"apj" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Xeno Containment"},/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/toxins/xenobiology) +"apk" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor,/area/toxins/xenobiology) "apl" = (/obj/machinery/atmospherics/pipe/simple/general/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) -"apm" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor,/area/toxins/xenobiology) +"apm" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor,/area/toxins/xenobiology) "apn" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xenobio"; name = "Containment Shutter"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/toxins/xenobiology) "apo" = (/obj/machinery/atmospherics/pipe/simple/general/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology) "app" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id = "n2o_in"; on = 1; pixel_y = 1},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology) @@ -805,7 +805,7 @@ "apy" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/hallway/primary/fore) "apz" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xeno"; name = "Containment Shutter"; opacity = 0},/obj/machinery/door/airlock/glass_medical{name = "Xenobiology"; req_access_txt = "55"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "apA" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) -"apB" = (/obj/machinery/disposal,/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/toxins/xenobiology) +"apB" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/toxins/xenobiology) "apC" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xenobio"; name = "Containment Shutter"; opacity = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/toxins/xenobiology) "apD" = (/obj/structure/disposaloutlet{dir = 4},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology) "apE" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology) @@ -830,7 +830,7 @@ "apX" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/hallway/primary/fore) "apY" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xeno"; name = "Containment Shutter"; opacity = 0},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/toxins/xenobiology) "apZ" = (/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) -"aqa" = (/obj/structure/table,/obj/machinery/door_control{id = "xenobio"; name = "Emergency Containment Seal"; pixel_x = -1; pixel_y = 7},/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor,/area/toxins/xenobiology) +"aqa" = (/obj/structure/table,/obj/machinery/door_control{id = "xenobio"; name = "Emergency Containment Seal"; pixel_x = -1; pixel_y = 7},/turf/simulated/floor,/area/toxins/xenobiology) "aqb" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xenobio"; name = "Containment Shutter"; opacity = 0},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/toxins/xenobiology) "aqc" = (/turf/simulated/wall/r_wall,/area/security/main) "aqd" = (/obj/machinery/power/apc{dir = 4; name = "Security APC"; pixel_x = 25; pixel_y = 0},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/main) @@ -848,8 +848,8 @@ "aqp" = (/obj/structure/table,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "aqq" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "aqr" = (/obj/machinery/optable{name = "Xenobiology Operating Table"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) -"aqs" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor,/area/toxins/xenobiology) -"aqt" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/shieldwallgen{req_access = list(55)},/turf/simulated/floor{icon_state = "bot"},/area/toxins/xenobiology) +"aqs" = (/turf/simulated/floor,/area/toxins/xenobiology) +"aqt" = (/obj/machinery/shieldwallgen{req_access = list(55)},/turf/simulated/floor{icon_state = "bot"},/area/toxins/xenobiology) "aqu" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/toxins/xenobiology) "aqv" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "aqw" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) @@ -862,7 +862,7 @@ "aqD" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "carpetside"},/area/security/detectives_office) "aqE" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "carpet"},/area/security/detectives_office) "aqF" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "carpet"},/area/security/detectives_office) -"aqG" = (/obj/structure/table/woodentable,/obj/item/clothing/gloves/detective,/obj/item/device/taperecorder,/obj/item/device/detective_scanner,/obj/machinery/light{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "carpetside"},/area/security/detectives_office) +"aqG" = (/obj/structure/table/woodentable,/obj/item/device/taperecorder,/obj/item/device/detective_scanner,/obj/machinery/light{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "carpetside"},/area/security/detectives_office) "aqH" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/hallway/primary/port) "aqI" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/port) "aqJ" = (/turf/simulated/floor/plating,/area/hallway/primary/port) @@ -931,7 +931,7 @@ "arU" = (/turf/simulated/wall,/area/toxins/lab) "arV" = (/obj/structure/rack{dir = 1},/obj/item/stack/sheet/metal{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) "arW" = (/obj/structure/rack{dir = 1},/obj/item/stack/sheet/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/sheet/glass{amount = 50; pixel_x = 0; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) -"arX" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor,/area/toxins/lab) +"arX" = (/turf/simulated/floor,/area/toxins/lab) "arY" = (/obj/machinery/r_n_d/circuit_imprinter,/turf/simulated/floor,/area/toxins/lab) "arZ" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50; pixel_x = 3; pixel_y = 3},/turf/simulated/floor,/area/toxins/lab) "asa" = (/obj/machinery/r_n_d/protolathe,/turf/simulated/floor,/area/toxins/lab) @@ -1015,7 +1015,7 @@ "atA" = (/obj/structure/disposalpipe/sortjunction{backsort = 1; backType = list("Research Director","Robotics"); icon_state = "pipe-j2s"; sortType = list("Research Division")},/turf/simulated/floor,/area/toxins/hallway) "atB" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass_medical{name = "Technological Research Laboratory"; req_access_txt = "7"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) "atC" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) -"atD" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/toxins/lab) +"atD" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/toxins/lab) "atE" = (/obj/machinery/r_n_d/destructive_analyzer,/turf/simulated/floor,/area/toxins/lab) "atF" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/toxins/lab) "atG" = (/obj/machinery/computer/rdconsole{id = 1; name = "Core R&D Console"},/turf/simulated/floor,/area/toxins/lab) @@ -1031,7 +1031,7 @@ "atQ" = (/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/captain) "atR" = (/obj/machinery/shower{dir = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/captain) "atS" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/oxygen/yellow,/obj/machinery/light/small,/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/engine/fore) -"atT" = (/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor,/area/engine/construction_storage) +"atT" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor,/area/engine/construction_storage) "atU" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'Nuclear Warhead'"; icon_state = "radiation"; name = "Nuclear Warhead"; pixel_x = -32; pixel_y = 0},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot,/turf/simulated/floor{icon_state = "dark"},/area/security/nuke_storage) "atV" = (/obj/structure/closet/crate,/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage) "atW" = (/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage) @@ -1041,9 +1041,9 @@ "aua" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area) "aub" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass_medical{name = "Research Division"; req_access_txt = "47"},/turf/simulated/floor,/area/toxins/hallway) "auc" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/toxins/lab) -"aud" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/toxins/lab) -"aue" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/toxins/lab) -"auf" = (/obj/structure/table,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 31},/turf/simulated/floor,/area/toxins/lab) +"aud" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/toxins/lab) +"aue" = (/turf/simulated/floor,/area/toxins/lab) +"auf" = (/obj/structure/table,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 31},/turf/simulated/floor,/area/toxins/lab) "aug" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/fore) "auh" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/fore) "aui" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/brig) @@ -1133,7 +1133,7 @@ "avO" = (/obj/structure/table,/obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/beaker,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "avP" = (/obj/item/weapon/stock_parts/console_screen,/obj/structure/table,/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},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "avQ" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fore) -"avR" = (/obj/structure/closet/wardrobe/warden,/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_x = -30; pixel_y = 0},/turf/simulated/floor,/area/security/warden) +"avR" = (/obj/structure/closet/secure_closet/warden,/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_x = -30; pixel_y = 0},/turf/simulated/floor,/area/security/warden) "avS" = (/obj/structure/closet/secure_closet/warden,/turf/simulated/floor,/area/security/warden) "avT" = (/obj/structure/filingcabinet,/obj/machinery/camera{c_tag = "Wardens Office"; network = "Security"; pixel_x = 22},/turf/simulated/floor,/area/security/warden) "avU" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor,/area/security/warden) @@ -1242,11 +1242,11 @@ "axT" = (/obj/structure/table,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "yellow"; dir = 10},/area/engine/turbine_control) "axU" = (/obj/machinery/computer/turbine_computer{vent_network = "Vent Seal"},/turf/simulated/floor{icon_state = "yellow"},/area/engine/turbine_control) "axV" = (/obj/structure/table,/turf/simulated/floor{icon_state = "yellow"},/area/engine/turbine_control) -"axW" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/wall/heatshield,/area/engine/reactor_core) +"axW" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/area/engine/reactor_core) "axX" = (/turf/simulated/floor/engine,/area/engine/reactor_core) "axY" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; 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,/area/engine/reactor_core) "axZ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/engine,/area/engine/reactor_core) -"aya" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/wall/heatshield,/area/engine/reactor_core) +"aya" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/structure/window/reinforced{dir = 1},/area/engine/reactor_core) "ayb" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/engine/aux_control) "ayc" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/machinery/light{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/aux_control) "ayd" = (/obj/structure/table,/turf/simulated/floor{icon_state = "yellow"; dir = 10},/area/engine/aux_control) @@ -1262,7 +1262,7 @@ "ayn" = (/obj/structure/closet/secure_closet/brig{name = "Secure Holding Locker 1"; req_access_txt = "2"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/security/warden) "ayo" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/security/warden) "ayp" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor,/area/security/warden) -"ayq" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{name = "Warden's Office"; req_access_txt = "2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/warden) +"ayq" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Warden's Office"; req_access_txt = "2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/warden) "ayr" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/brig) "ays" = (/obj/structure/disposalpipe/sortjunction/nonsorting/NW,/turf/simulated/floor,/area/security/brig) "ayt" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "brig"; name = "Security Shutters"; opacity = 0},/obj/machinery/door/window/brigdoor{dir = 4; icon_state = "left"; id = "Cell 4"; name = "Cell 4"; req_access_txt = "1"; tag = "icon-left (EAST)"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/brig) @@ -1285,10 +1285,10 @@ "ayK" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/turbine_control) "ayL" = (/obj/structure/stool/bed/chair{dir = 1},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/turbine_control) "ayM" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{dir = 5; icon_state = "yellow"},/area/engine/turbine_control) -"ayN" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/wall/heatshield,/area/engine/reactor_core) -"ayO" = (/obj/machinery/power/turbine{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/wall/heatshield,/area/engine/reactor_core) -"ayP" = (/obj/machinery/power/turbine{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/wall/heatshield,/area/engine/reactor_core) -"ayQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/wall/heatshield,/area/engine/reactor_core) +"ayN" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/area/engine/reactor_core) +"ayO" = (/obj/machinery/power/turbine{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/area/engine/reactor_core) +"ayP" = (/obj/machinery/power/turbine{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/area/engine/reactor_core) +"ayQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/area/engine/reactor_core) "ayR" = (/obj/machinery/atmospherics/valve/digital,/turf/simulated/floor/plating,/area/engine/aux_control) "ayS" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/engine/aux_control) "ayT" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/aux_control) @@ -1328,9 +1328,9 @@ "azB" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/engine/turbine_control) "azC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/turbine_control) "azD" = (/turf/simulated/floor,/area/engine/turbine_control) -"azE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/wall/heatshield,/area/engine/reactor_core) -"azF" = (/obj/machinery/compressor{comp_id = "turbine_gens"; dir = 2},/turf/simulated/wall/heatshield,/area/engine/reactor_core) -"azG" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/wall/heatshield,/area/engine/reactor_core) +"azE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 8},/area/engine/reactor_core) +"azF" = (/obj/machinery/compressor{comp_id = "turbine_gens"; dir = 2},/area/engine/reactor_core) +"azG" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 8},/area/engine/reactor_core) "azH" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plating,/area/engine/aux_control) "azI" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/obj/machinery/meter,/turf/simulated/floor/plating,/area/engine/aux_control) "azJ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/engine/aux_control) @@ -1351,14 +1351,14 @@ "azY" = (/turf/simulated/shuttle/wall{tag = "icon-swall7"; icon_state = "swall7"; dir = 2},/area/shuttle/arrival/station) "azZ" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_r (WEST)"; icon_state = "burst_r"; dir = 8},/turf/space,/area/shuttle/arrival/station) "aAa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden) -"aAb" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/obj/machinery/door/airlock/glass/glass_security{name = "Secure Holding Cell 2"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden) -"aAc" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/obj/machinery/door/airlock/glass/glass_security{name = "Secure Holding Cell 1"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden) +"aAb" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/obj/machinery/door/airlock/glass_security{name = "Secure Holding Cell 2"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden) +"aAc" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/obj/machinery/door/airlock/glass_security{name = "Secure Holding Cell 1"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden) "aAd" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'For EMERGENCY use'"; name = "EMERGENCY"},/turf/simulated/wall,/area/security/warden) "aAe" = (/obj/effect/landmark{name = "emcloset"},/turf/simulated/floor,/area/security/warden) "aAf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/warden) "aAg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/brig) -"aAh" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{name = "Security"; req_access_txt = "1"},/turf/simulated/floor,/area/security/brig) -"aAi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{name = "Security"; req_access_txt = "1"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/brig) +"aAh" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Security"; req_access_txt = "1"},/turf/simulated/floor,/area/security/brig) +"aAi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Security"; req_access_txt = "1"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/brig) "aAj" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/hallway/primary/port) "aAk" = (/turf/simulated/wall/r_wall,/area/bridge) "aAl" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/bridge) @@ -1411,7 +1411,7 @@ "aBg" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/security/lobby) "aBh" = (/obj/machinery/firealarm{dir = 2; layer = 4; pixel_x = 0; pixel_y = 25},/obj/machinery/camera{c_tag = "Security Lobby"; dir = 2; network = "Security"},/turf/simulated/floor,/area/security/lobby) "aBi" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/security/lobby) -"aBj" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass/glass_security{name = "Security"; req_access_txt = "0"},/turf/simulated/floor,/area/security/lobby) +"aBj" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass_security{name = "Security"; req_access_txt = "0"},/turf/simulated/floor,/area/security/lobby) "aBk" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/command{name = "Bridge"; req_access = null; req_access_txt = "19"},/turf/simulated/floor,/area/bridge) "aBl" = (/turf/simulated/floor,/area/bridge) "aBm" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/bridge) @@ -1550,13 +1550,13 @@ "aDP" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6; icon_state = "intact"; tag = "icon-intact (NORTHEAST)"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/port_gyro_bay) "aDQ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/meter,/turf/simulated/floor/plating,/area/engine/port_gyro_bay) "aDR" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/rust/gyrotron{dir = 4},/turf/simulated/floor/plating,/area/engine/port_gyro_bay) -"aDS" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/port_gyro_bay) +"aDS" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/port_gyro_bay) "aDT" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; 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,/area/engine/reactor_core) "aDU" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/engine,/area/engine/reactor_core) "aDV" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/engine,/area/engine/reactor_core) "aDW" = (/obj/machinery/rust/core,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/engine,/area/engine/reactor_core) "aDX" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (NORTHWEST)"; icon_state = "intact"; dir = 9},/turf/simulated/floor/engine,/area/engine/reactor_core) -"aDY" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/starboard_gyro_bay) +"aDY" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/starboard_gyro_bay) "aDZ" = (/obj/machinery/rust/gyrotron{dir = 8},/turf/simulated/floor/plating,/area/engine/starboard_gyro_bay) "aEa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/starboard_gyro_bay) "aEb" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/wall/r_wall,/area/maintenance/starboard) @@ -1590,10 +1590,10 @@ "aED" = (/obj/structure/table,/obj/item/device/aicard,/turf/simulated/floor,/area/bridge) "aEE" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/machinery/power/apc{dir = 8; name = "Reactor Port Gyrotron Bay"; pixel_x = -24; pixel_y = 0; pixel_z = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"; tag = "icon-warnplate (SOUTHWEST)"},/area/engine/port_gyro_bay) "aEF" = (/obj/machinery/rust/fuel_injector{dir = 4; stage = "SCRAM"},/turf/simulated/floor/plating,/area/engine/port_gyro_bay) -"aEG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/port_gyro_bay) +"aEG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/port_gyro_bay) "aEH" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/engine,/area/engine/reactor_core) "aEI" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (SOUTHEAST)"; icon_state = "intact"; dir = 6},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (NORTHWEST)"; icon_state = "intact"; dir = 9},/turf/simulated/floor/engine,/area/engine/reactor_core) -"aEJ" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/starboard_gyro_bay) +"aEJ" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/starboard_gyro_bay) "aEK" = (/obj/machinery/rust/fuel_injector{dir = 8; stage = "SCRAM"},/turf/simulated/floor/plating,/area/engine/starboard_gyro_bay) "aEL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"; tag = "icon-warnplate (SOUTHWEST)"},/area/engine/starboard_gyro_bay) "aEM" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -1606,8 +1606,8 @@ "aET" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1; icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor/plating,/area) "aEU" = (/obj/machinery/atmospherics/binary/pump/highcap{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area) "aEV" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/poddoor{id = "Starboard aft shell access"; name = "Blast Door"},/turf/simulated/floor/plating,/area) -"aEW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aEX" = (/obj/machinery/door/airlock/external{name = "Arrival Dock Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/docking) +"aEW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aEX" = (/obj/machinery/door/airlock/external{name = "Arrival Dock Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "aEY" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/port) "aEZ" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/security/lobby) "aFa" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/security/lobby) @@ -1619,29 +1619,29 @@ "aFg" = (/obj/machinery/door/poddoor{id = "Fuel storage / Port auxiliary injection"; name = "Blast Door"; network = "Reactor core"},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/port_gyro_bay) "aFh" = (/obj/machinery/door/poddoor{id = "Starboard auxiliary injection / Plasma storage"; name = "Blast Door"; network = "Reactor core"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/starboard_gyro_bay) "aFi" = (/obj/machinery/camera{c_tag = "AI Core Port"; dir = 4; network = "Command"},/obj/machinery/telecomms/allinone{frequency = 144.7},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai) -"aFj" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) -"aFk" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) -"aFl" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"aFj" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"aFk" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"aFl" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "aFm" = (/obj/machinery/camera{c_tag = "AI Core Starboard"; dir = 8; network = "Command"},/obj/machinery/power/smes{charge = 5e+006},/obj/effect/decal/cleanable/dirt,/obj/structure/cable,/turf/simulated/floor,/area/turret_protected/ai) "aFn" = (/obj/machinery/rust/fuel_compressor{pixel_x = -24},/turf/simulated/floor/plating,/area) "aFo" = (/obj/machinery/atmospherics/tvalve/mirrored/digital{icon_state = "tvalvem1"; state = 1},/turf/simulated/floor/plating,/area) "aFp" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area) "aFq" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9; icon_state = "intact"; tag = "icon-intact (NORTHEAST)"},/turf/simulated/floor/plating,/area) "aFr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor/plating,/area) -"aFs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aFt" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aFu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aFv" = (/turf/simulated/floor,/area/hallway/secondary/docking) -"aFw" = (/obj/structure/grille,/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aFx" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aFy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aFz" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/docking) -"aFA" = (/obj/structure/stool/bed/chair,/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Docking Arm APC"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor,/area/hallway/secondary/docking) -"aFB" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/hallway/secondary/docking) -"aFC" = (/obj/structure/stool/bed/chair,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/secondary/docking) -"aFD" = (/obj/structure/stool/bed/chair,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/hallway/secondary/docking) -"aFE" = (/obj/structure/stool/bed/chair,/obj/machinery/camera{c_tag = "Arrivals Checkpoint"; network = "Command"; pixel_x = 22},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/secondary/docking) -"aFF" = (/obj/machinery/scanner{dir = 1},/turf/simulated/floor,/area/hallway/secondary/docking) +"aFs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aFt" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aFu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aFv" = (/turf/simulated/floor,/area/hallway/secondary/entry) +"aFw" = (/obj/structure/grille,/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aFx" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aFy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aFz" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/entry) +"aFA" = (/obj/structure/stool/bed/chair,/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Docking Arm APC"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor,/area/hallway/secondary/entry) +"aFB" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/hallway/secondary/entry) +"aFC" = (/obj/structure/stool/bed/chair,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/secondary/entry) +"aFD" = (/obj/structure/stool/bed/chair,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/hallway/secondary/entry) +"aFE" = (/obj/structure/stool/bed/chair,/obj/machinery/camera{c_tag = "Arrivals Checkpoint"; network = "Command"; pixel_x = 22},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/secondary/entry) +"aFF" = (/obj/machinery/dna_scannernew{dir = 1},/turf/simulated/floor,/area/hallway/secondary/entry) "aFG" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/device/flash,/turf/simulated/floor{icon_state = "red"; dir = 10},/area/bridge) "aFH" = (/obj/structure/window/reinforced,/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/floor{icon_state = "red"},/area/bridge) "aFI" = (/obj/structure/closet/fireaxecabinet{pixel_x = 32; pixel_y = 0},/obj/machinery/camera{c_tag = "Bridge (North)"; dir = 8; network = "Command"},/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/bridge) @@ -1656,41 +1656,41 @@ "aFR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/engine/reactor_gas) "aFS" = (/turf/simulated/wall/r_wall,/area/engine/reactor_gas) "aFT" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = -28; pixel_y = 0},/turf/simulated/floor,/area/turret_protected/ai) -"aFU" = (/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"aFU" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "aFV" = (/obj/machinery/ai_slipper,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) -"aFW" = (/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"aFW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "aFX" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/turf/simulated/floor,/area/turret_protected/ai) -"aFY" = (/turf/simulated/wall,/area/construction/under_construction_small) -"aFZ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/construction/under_construction_small) -"aGa" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/construction/under_construction_small) -"aGb" = (/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/construction/under_construction_small) -"aGc" = (/turf/simulated/floor,/area/construction/under_construction_small) -"aGd" = (/turf/simulated/floor/plating,/area/construction/under_construction_small) -"aGe" = (/obj/item/stack/tile/plasteel,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/construction/under_construction_small) -"aGf" = (/obj/item/stack/tile/plasteel,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small) -"aGg" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small) +"aFY" = (/turf/simulated/wall,/area/security/vacantoffice) +"aFZ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/security/vacantoffice) +"aGa" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/vacantoffice) +"aGb" = (/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/vacantoffice) +"aGc" = (/turf/simulated/floor,/area/security/vacantoffice) +"aGd" = (/turf/simulated/floor/plating,/area/security/vacantoffice) +"aGe" = (/obj/item/stack/tile/plasteel,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/security/vacantoffice) +"aGf" = (/obj/item/stack/tile/plasteel,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/vacantoffice) +"aGg" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/vacantoffice) "aGh" = (/obj/structure/closet/crate,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/turf/simulated/floor/plating,/area) "aGi" = (/obj/machinery/atmospherics/pipe/simple/insulated{dir = 5},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/plating,/area) "aGj" = (/obj/machinery/atmospherics/pipe/manifold{dir = 2; icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor/plating,/area) "aGk" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"; tag = "icon-warnplate (SOUTHWEST)"},/area) "aGl" = (/obj/machinery/light/small,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area) -"aGm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aGn" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/docking) -"aGo" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/camera{c_tag = "Docking Arm Port"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/docking) -"aGp" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/hallway/secondary/docking) -"aGq" = (/obj/machinery/light{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/hallway/secondary/docking) -"aGr" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/secondary/docking) -"aGs" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/secondary/docking) -"aGt" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/docking) -"aGu" = (/obj/effect/landmark{name = "emcloset"},/turf/simulated/floor,/area/hallway/secondary/docking) -"aGv" = (/obj/machinery/camera{c_tag = "Docking Arm Central"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/docking) -"aGw" = (/obj/machinery/firealarm{dir = 1; pixel_y = 30},/turf/simulated/floor,/area/hallway/secondary/docking) -"aGx" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/secondary/docking) -"aGy" = (/obj/machinery/camera{c_tag = "Docking Arm Starboard"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/docking) -"aGz" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/turf/simulated/floor,/area/hallway/secondary/docking) +"aGm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aGn" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/entry) +"aGo" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/camera{c_tag = "Docking Arm Port"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/entry) +"aGp" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/hallway/secondary/entry) +"aGq" = (/obj/machinery/light{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/hallway/secondary/entry) +"aGr" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/secondary/entry) +"aGs" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/secondary/entry) +"aGt" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/entry) +"aGu" = (/obj/effect/landmark{name = "emcloset"},/turf/simulated/floor,/area/hallway/secondary/entry) +"aGv" = (/obj/machinery/camera{c_tag = "Docking Arm Central"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/entry) +"aGw" = (/obj/machinery/firealarm{dir = 1; pixel_y = 30},/turf/simulated/floor,/area/hallway/secondary/entry) +"aGx" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/secondary/entry) +"aGy" = (/obj/machinery/camera{c_tag = "Docking Arm Starboard"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/entry) +"aGz" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/turf/simulated/floor,/area/hallway/secondary/entry) "aGA" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"; tag = ""},/turf/simulated/floor/plating,/area/bridge) "aGB" = (/obj/structure/window/reinforced/tinted{dir = 5},/turf/simulated/floor{dir = 9; icon_state = "blue"},/area/bridge) -"aGC" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/recordsbox,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/bridge) +"aGC" = (/obj/structure/table/reinforced,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/bridge) "aGD" = (/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 30},/turf/simulated/floor,/area/bridge) "aGE" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/generators) "aGF" = (/obj/machinery/rust/fuel_compressor{pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/plating,/area/engine/reactor_fuel_storage) @@ -1698,10 +1698,10 @@ "aGH" = (/obj/machinery/atmospherics/trinary/filter{dir = 4},/turf/simulated/floor/plating,/area/engine/reactor_fuel_storage) "aGI" = (/obj/machinery/atmospherics/tvalve/digital{dir = 4; layer = 2.4},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/engine/reactor_fuel_storage) "aGJ" = (/obj/machinery/power/apc{dir = 4; name = "Reactor Fuel Storage APC"; pixel_x = 24; pixel_y = 0; pixel_z = 0},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/turf/simulated/floor/plating,/area/engine/reactor_fuel_storage) -"aGK" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/reactor_core) -"aGL" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/reactor_core) -"aGM" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/wall/heatshield,/area/engine/reactor_core) -"aGN" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/reactor_core) +"aGK" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/reactor_core) +"aGL" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/reactor_core) +"aGM" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/obj/machinery/atmospherics/pipe/simple/general/visible,/area/engine/reactor_core) +"aGN" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/reactor_core) "aGO" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/engine/reactor_gas) "aGP" = (/obj/machinery/atmospherics/binary/pump/highcap,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/engine/reactor_gas) "aGQ" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/engine/reactor_gas) @@ -1711,7 +1711,7 @@ "aGU" = (/obj/machinery/turret{desc = "aicore"; dir = 4},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai) "aGV" = (/obj/machinery/turret{dir = 8; id = "aicore"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai) "aGW" = (/obj/machinery/door/poddoor{id = "Port aft shell access"; name = "Blast Door"},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area) -"aGX" = (/obj/item/device/radio/beacon,/turf/simulated/floor,/area/hallway/secondary/docking) +"aGX" = (/obj/item/device/radio/beacon,/turf/simulated/floor,/area/hallway/secondary/entry) "aGY" = (/obj/machinery/computer/communications,/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/bridge) "aGZ" = (/obj/machinery/hologram/holopad,/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/bridge) "aHa" = (/obj/machinery/computer/card,/turf/simulated/floor,/area/bridge) @@ -1736,14 +1736,14 @@ "aHt" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/turf/simulated/floor/plating,/area/maintenance/starboard) "aHu" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plating,/area/maintenance/starboard) "aHv" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot,/turf/simulated/floor,/area/turret_protected/ai) -"aHw" = (/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/obj/effect/decal/cleanable/dirt,/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) -"aHx" = (/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/cleanable/dirt,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"aHw" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) +"aHx" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "aHy" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor,/area/turret_protected/ai) "aHz" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/hallway/primary/starboard) -"aHA" = (/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating,/area/construction/under_construction_small) -"aHB" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plating,/area/construction/under_construction_small) +"aHA" = (/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating,/area/security/vacantoffice) +"aHB" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plating,/area/security/vacantoffice) "aHC" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard) -"aHD" = (/obj/machinery/light,/turf/simulated/floor,/area/hallway/secondary/docking) +"aHD" = (/obj/machinery/light,/turf/simulated/floor,/area/hallway/secondary/entry) "aHE" = (/obj/structure/window/reinforced/tinted{dir = 5},/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/bridge) "aHF" = (/obj/machinery/computer/station_alert,/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/bridge) "aHG" = (/obj/structure/table,/obj/item/weapon/storage/PDAbox,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/turf/simulated/floor,/area/bridge) @@ -1764,13 +1764,13 @@ "aHV" = (/obj/machinery/door/airlock/highsecurity{name = "AI Core"; req_access_txt = "16"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "aHW" = (/obj/machinery/camera{c_tag = "Starboard Hallway - Construction"; dir = 4; network = "SS13"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/hallway/primary/starboard) "aHX" = (/obj/item/weapon/caution{desc = "Caution! Construction area!"; name = "construction area sign"},/turf/simulated/floor,/area/hallway/primary/starboard) -"aHY" = (/obj/machinery/door/airlock/maintenance{name = "Construction Area"; req_access_txt = "10"},/turf/simulated/floor/plating,/area/construction/under_construction_small) -"aHZ" = (/obj/structure/table,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plating,/area/construction/under_construction_small) -"aIa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aIb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/effect/sign/redcross{name = "Emergency Shuttle"},/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aIc" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aId" = (/obj/machinery/door/airlock/external{name = "Evacuation Dock Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/docking) -"aIe" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/hallway/secondary/docking) +"aHY" = (/obj/machinery/door/airlock/maintenance{name = "Construction Area"; req_access_txt = "10"},/turf/simulated/floor/plating,/area/security/vacantoffice) +"aHZ" = (/obj/structure/table,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plating,/area/security/vacantoffice) +"aIa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aIb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/effect/sign/redcross{name = "Emergency Shuttle"},/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aIc" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aId" = (/obj/machinery/door/airlock/external{name = "Evacuation Dock Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/entry) +"aIe" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "aIf" = (/turf/simulated/wall,/area/security/checkpoint) "aIg" = (/obj/item/weapon/pen,/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/item/weapon/stamp/hop,/turf/simulated/floor,/area/security/checkpoint) "aIh" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/security/checkpoint) @@ -1800,8 +1800,8 @@ "aIF" = (/obj/machinery/atmospherics/pipe/tank/toxins{dir = 1},/turf/simulated/floor/plating,/area/engine/reactor_gas) "aIG" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plating,/area/maintenance/starboard) "aIH" = (/obj/machinery/turretid{id = "upload"; pixel_x = -24; pixel_y = -7},/obj/machinery/turretid{id = "aicore"; pixel_x = -24; pixel_y = 7},/obj/effect/decal/cleanable/dirt,/obj/effect/sign/electricshock{desc = "A warning sign which reads 'SENTRY GUNS'"; name = "WARNING: SENTRY GUNS"; pixel_x = 32; pixel_y = 0},/obj/machinery/camera{c_tag = "AI Core Access"; dir = 8; network = "Command"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) -"aII" = (/obj/item/weapon/crowbar,/turf/simulated/floor,/area/construction/under_construction_small) -"aIJ" = (/obj/structure/table,/obj/item/weapon/cable_coil,/turf/simulated/floor/plating,/area/construction/under_construction_small) +"aII" = (/obj/item/weapon/crowbar,/turf/simulated/floor,/area/security/vacantoffice) +"aIJ" = (/obj/structure/table,/obj/item/weapon/cable_coil,/turf/simulated/floor/plating,/area/security/vacantoffice) "aIK" = (/turf/space,/area/shuttle/escape/station) "aIL" = (/obj/structure/filingcabinet,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/security/checkpoint) "aIM" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/security/checkpoint) @@ -1818,10 +1818,10 @@ "aIX" = (/obj/machinery/door/poddoor{id = "Assembly room / Primary injection"; name = "Blast Door"; network = "Reactor core"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/reactor_core) "aIY" = (/obj/machinery/door/poddoor{id = "Assembly room / Plasma Storage"; name = "Blast Door"; network = "Reactor core"},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/reactor_gas) "aIZ" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) -"aJa" = (/obj/machinery/door/airlock/highsecurity{name = "AI Core"; req_access_txt = "16"},/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) -"aJb" = (/obj/machinery/light/spot,/turf/simulated/floor,/area/construction/under_construction_small) -"aJc" = (/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating,/area/construction/under_construction_small) -"aJd" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/construction/under_construction_small) +"aJa" = (/obj/machinery/door/airlock/highsecurity{name = "AI Core"; req_access_txt = "16"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"aJb" = (/obj/machinery/light/spot,/turf/simulated/floor,/area/security/vacantoffice) +"aJc" = (/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating,/area/security/vacantoffice) +"aJd" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/security/vacantoffice) "aJe" = (/obj/machinery/disposal,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/security/checkpoint) "aJf" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/checkpoint) "aJg" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_command{name = "\improper Arrivals Checkpoint"; req_access_txt = "19; 15"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/checkpoint) @@ -1849,15 +1849,15 @@ "aJC" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/engine/reactor_fuel_ports) "aJD" = (/turf/simulated/wall/r_wall,/area/engine/reactor_fuel_ports) "aJE" = (/obj/machinery/turret{dir = 4; id = "upload"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/turret_protected/ai_upload) -"aJF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/aistatus{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload) -"aJG" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/borgupload/mainframe{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload) +"aJF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai_upload) +"aJG" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/borgupload{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload) "aJH" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) -"aJI" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/aiupload/mainframe{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload) -"aJJ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/aiuploadcloset{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload) +"aJI" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/aiupload,/turf/simulated/floor,/area/turret_protected/ai_upload) +"aJJ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai_upload) "aJK" = (/obj/machinery/turret{dir = 8; id = "upload"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/turret_protected/ai_upload) "aJL" = (/turf/simulated/wall,/area/quartermaster/sorting) -"aJM" = (/obj/machinery/light/spot,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small) -"aJN" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/plating,/area/construction/under_construction_small) +"aJM" = (/obj/machinery/light/spot,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/vacantoffice) +"aJN" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/plating,/area/security/vacantoffice) "aJO" = (/obj/machinery/photocopier,/obj/machinery/camera{c_tag = "Arrivals Office"; dir = 4; network = "Command"},/turf/simulated/floor,/area/security/checkpoint) "aJP" = (/mob/living/simple_animal/corgi/Ian,/turf/simulated/floor,/area/security/checkpoint) "aJQ" = (/obj/machinery/vending/cart,/turf/simulated/floor,/area/security/checkpoint) @@ -1927,7 +1927,7 @@ "aLc" = (/turf/simulated/floor/plating,/area/quartermaster/sorting) "aLd" = (/obj/machinery/conveyor{dir = 2; id = "MailRoom"},/turf/simulated/floor/plating,/area/quartermaster/sorting) "aLe" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Cargo Bay"; departmentType = 6; name = "Cargo Bay Requests Console"; pixel_y = 24},/turf/simulated/floor,/area/quartermaster/sorting) -"aLf" = (/obj/structure/closet/secure_closet/cargo_tech_personal,/turf/simulated/floor,/area/quartermaster/sorting) +"aLf" = (/turf/simulated/floor,/area/quartermaster/sorting) "aLg" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/basic{dir = 5},/turf/simulated/floor/plating,/area/quartermaster/sorting) "aLh" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/device/radio,/turf/simulated/floor,/area/quartermaster/storage) "aLi" = (/obj/machinery/autolathe,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/quartermaster/storage) @@ -1972,7 +1972,7 @@ "aLV" = (/obj/structure/window/basic{dir = 1},/obj/structure/closet/crate,/turf/simulated/floor,/area/quartermaster/sorting) "aLW" = (/obj/structure/window/basic{dir = 1},/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/quartermaster/sorting) "aLX" = (/turf/simulated/floor,/area/quartermaster/sorting) -"aLY" = (/obj/structure/closet/secure_closet/cargo_tech_personal,/turf/simulated/floor/plating,/area/quartermaster/sorting) +"aLY" = (/turf/simulated/floor/plating,/area/quartermaster/sorting) "aLZ" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/turf/simulated/floor,/area/quartermaster/storage) "aMa" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage) "aMb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -2063,8 +2063,8 @@ "aNI" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/obj/machinery/door/poddoor/shutters{density = 0; icon_state = "shutter0"; network = "Observation Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/control) "aNJ" = (/obj/machinery/power/monitor{name = "Generator Power Output"},/turf/simulated/floor,/area/engine/control) "aNK" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/engine/control) -"aNL" = (/obj/machinery/computer/security/engineering,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/engine/control) -"aNM" = (/obj/machinery/computer/lockdown{department = "Engineering"; name = "Engineering Lockdown Control"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/engine/control) +"aNL" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/engine/control) +"aNM" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/engine/control) "aNN" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/engine/control) "aNO" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/engine/control) "aNP" = (/obj/machinery/computer/general_air_control{frequency = 1450; name = "Core Atmospherics Monitoring"; sensors = list("reactor_sensor" = "Reactor Core")},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/engine/control) @@ -2156,8 +2156,8 @@ "aPx" = (/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/structure/table,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/quartermaster/qm) "aPy" = (/obj/structure/table,/obj/item/weapon/clipboard{pixel_y = 4},/obj/machinery/requests_console{announcementConsole = 1; department = "Quartermaster"; departmentType = 6; name = "Quartermaster's Requests Console"; pixel_x = 0; pixel_y = 30},/turf/simulated/floor,/area/quartermaster/qm) "aPz" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor,/area/quartermaster/qm) -"aPA" = (/obj/machinery/computer/security/cargo,/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor,/area/quartermaster/qm) -"aPB" = (/obj/structure/closet/wardrobe/qm_yellow,/turf/simulated/floor,/area/quartermaster/qm) +"aPA" = (/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor,/area/quartermaster/qm) +"aPB" = (/turf/simulated/floor,/area/quartermaster/qm) "aPC" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/quartermaster/qm) "aPD" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell{maxcharge = 2000},/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/quartermaster/storage) "aPE" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/turf/simulated/floor,/area/quartermaster/storage) @@ -2168,16 +2168,16 @@ "aPJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage) "aPK" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/body_bag_box,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) "aPL" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/wrench,/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Emergency Room APC"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) -"aPM" = (/obj/machinery/atmospherics/portables_connector{dir = 2; name = "Gas Input"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/machinery/camera{c_tag = "Medbay Emergency Room Port"; dir = 2; network = "Medbay"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) +"aPM" = (/obj/machinery/atmospherics/portables_connector{dir = 2; name = "Gas Input"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/machinery/camera{c_tag = "Medbay Emergency Room Port"; dir = 2; network = "Medbay"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) "aPN" = (/obj/machinery/atmospherics/unary/cold_sink/freezer,/obj/machinery/light{dir = 1},/obj/effect/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) "aPO" = (/obj/machinery/atmospherics/portables_connector{dir = 2; name = "Gas Input"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/window/reinforced/tinted/frosted{tag = "icon-fwindow (EAST)"; icon_state = "fwindow"; dir = 4},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) "aPP" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) -"aPQ" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) +"aPQ" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) "aPR" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) "aPS" = (/obj/machinery/vending/medical,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) -"aPT" = (/obj/structure/closet/secure_closet/medicine,/obj/machinery/light{dir = 1},/obj/effect/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) +"aPT" = (/obj/structure/closet/secure_closet/medical1,/obj/machinery/light{dir = 1},/obj/effect/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) "aPU" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/firstaid/fire{pixel_y = 6},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/regular{pixel_x = 4; pixel_y = 3},/obj/machinery/camera{c_tag = "Emergency Room Starboard"; network = "Medbay"; pixel_x = 22},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) -"aPV" = (/obj/structure/closet/secure_closet/doctor_personal,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) +"aPV" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) "aPW" = (/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/hallway/primary/port) "aPX" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Head of Security"},/turf/simulated/floor,/area/bridge/meeting_room) "aPY" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/bridge/meeting_room) @@ -2210,11 +2210,11 @@ "aQz" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/cmo) "aQA" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) "aQB" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) -"aQC" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/structure/window/reinforced/tinted/frosted,/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) -"aQD" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/machinery/door/window/eastright{dir = 2; icon_state = "leftdeny"; req_access_txt = "5"; tag = "Cryo Control"},/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) -"aQE" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/structure/window/reinforced/tinted/frosted{tag = "icon-fwindow (EAST)"; icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/tinted/frosted,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) -"aQF" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) -"aQG" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) +"aQC" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) +"aQD" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/machinery/door/window/eastright{dir = 2; icon_state = "leftdeny"; req_access_txt = "5"; tag = "Cryo Control"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) +"aQE" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/structure/window/reinforced/tinted/frosted{tag = "icon-fwindow (EAST)"; icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) +"aQF" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) +"aQG" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"}) "aQH" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/syringes,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) "aQI" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/aft) "aQJ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft) @@ -2222,18 +2222,18 @@ "aQL" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/autolathe) "aQM" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/storage/autolathe) "aQN" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/engine/control) -"aQO" = (/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering"; req_access_txt = "10"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/control) +"aQO" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/control) "aQP" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engine/control) "aQQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/engine/control) -"aQR" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/engine/engineering_break_room) -"aQS" = (/obj/machinery/vending/cola,/turf/simulated/floor,/area/engine/engineering_break_room) -"aQT" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/engine/engineering_break_room) -"aQU" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/engine/engineering_break_room) -"aQV" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/engine/engineering_break_room) -"aQW" = (/turf/simulated/floor,/area/engine/engineering_break_room) -"aQX" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/engine/engineering_break_room) -"aQY" = (/obj/machinery/disposal,/turf/simulated/floor,/area/engine/engineering_break_room) -"aQZ" = (/turf/simulated/wall/r_wall,/area/engine/engineering_break_room) +"aQR" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/engine/break_room) +"aQS" = (/obj/machinery/vending/cola,/turf/simulated/floor,/area/engine/break_room) +"aQT" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/engine/break_room) +"aQU" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/engine/break_room) +"aQV" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/engine/break_room) +"aQW" = (/turf/simulated/floor,/area/engine/break_room) +"aQX" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/engine/break_room) +"aQY" = (/obj/machinery/disposal,/turf/simulated/floor,/area/engine/break_room) +"aQZ" = (/turf/simulated/wall/r_wall,/area/engine/break_room) "aRa" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/control) "aRb" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) "aRc" = (/turf/simulated/wall/r_wall,/area/tcommsat/chamber{name = "Telecommunications Compartment"}) @@ -2258,8 +2258,8 @@ "aRv" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo) "aRw" = (/obj/effect/landmark{name = "emcloset"},/obj/machinery/power/apc{dir = 1; name = "CMOs Office APC"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo) "aRx" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/stma_kit{pixel_x = 6; pixel_y = 6},/obj/item/weapon/storage/lglo_kit,/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) -"aRy" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) -"aRz" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) +"aRy" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) +"aRz" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) "aRA" = (/obj/machinery/light{dir = 4},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/hallway/primary/port) "aRB" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/bridge/meeting_room) "aRC" = (/obj/structure/stool/bed/chair{dir = 1},/obj/effect/landmark/start{name = "Chief Medical Officer"},/turf/simulated/floor,/area/bridge/meeting_room) @@ -2274,7 +2274,7 @@ "aRL" = (/obj/structure/table,/turf/simulated/floor,/area/storage/autolathe) "aRM" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/storage/autolathe) "aRN" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area) -"aRO" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor,/area/engine/engineering_break_room) +"aRO" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor,/area/engine/break_room) "aRP" = (/obj/machinery/telecomms/server/presets/science,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) "aRQ" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id = "o2_in"; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) "aRR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) @@ -2286,7 +2286,7 @@ "aRX" = (/obj/machinery/telecomms/server/presets/command,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) "aRY" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/starboard) "aRZ" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/starboard) -"aSa" = (/obj/structure/closet/secure_closet/qm_personal,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/quartermaster/qm) +"aSa" = (/obj/structure/closet/secure_closet/quartermaster,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/quartermaster/qm) "aSb" = (/obj/machinery/photocopier,/obj/machinery/light/spot,/turf/simulated/floor,/area/quartermaster/qm) "aSc" = (/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Quartermaster"},/turf/simulated/floor,/area/quartermaster/qm) "aSd" = (/obj/item/weapon/stamp{name = "Quartermaster's stamp"; pixel_x = -3; pixel_y = 3},/obj/item/weapon/stamp/denied,/obj/structure/table,/obj/machinery/camera{c_tag = "Quartermaster's Office"; dir = 1; network = "Cargo"},/turf/simulated/floor,/area/quartermaster/qm) @@ -2297,12 +2297,12 @@ "aSi" = (/obj/machinery/conveyor_switch{id = "QMshuttle"},/turf/simulated/floor,/area/quartermaster/storage) "aSj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/movingparts,/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage) "aSk" = (/turf/simulated/wall,/area/medical/patients_rooms) -"aSl" = (/obj/machinery/computer/lockdown{department = "Medbay"; name = "Medbay Lockdown Control"},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) +"aSl" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "aSm" = (/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo) "aSn" = (/obj/structure/table,/obj/item/clothing/glasses/hud/health,/obj/item/weapon/reagent_containers/hypospray,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "aSo" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo) "aSp" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo) -"aSq" = (/obj/structure/closet/wardrobe/cmo,/obj/machinery/camera{c_tag = "CMO's Office"; dir = 8; network = "Medbay"},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo) +"aSq" = (/obj/machinery/camera{c_tag = "CMO's Office"; dir = 8; network = "Medbay"},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo) "aSr" = (/obj/machinery/sleep_console{icon_state = "sleeperconsole-r"; orient = "RIGHT"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) "aSs" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) "aSt" = (/obj/machinery/bodyscanner,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) @@ -2310,15 +2310,15 @@ "aSv" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/effect/sign/securearea{desc = "A warning sign which reads 'For EMERGENCY use'"; layer = 4; name = "EMERGENCY"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"}) "aSw" = (/obj/effect/sign/redcross,/turf/simulated/wall,/area/medical/cryo{name = "Emergency Room"}) "aSx" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) -"aSy" = (/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) +"aSy" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) "aSz" = (/obj/structure/table,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor,/area/bridge/meeting_room) "aSA" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/bridge/meeting_room) "aSB" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "19"},/turf/simulated/floor,/area/storage/autolathe) "aSC" = (/turf/simulated/floor,/area/storage/autolathe) "aSD" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/storage/autolathe) "aSE" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area) -"aSF" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/engine/engineering_break_room) -"aSG" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/engine/engineering_break_room) +"aSF" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/engine/break_room) +"aSG" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/engine/break_room) "aSH" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable,/turf/simulated/floor/plating,/area/engine/control) "aSI" = (/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) "aSJ" = (/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) @@ -2331,7 +2331,7 @@ "aSQ" = (/obj/structure/closet/crate/internals,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage) "aSR" = (/obj/structure/closet/crate,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage) "aSS" = (/obj/structure/closet/crate/medical,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage) -"aST" = (/obj/machinery/conveyor{backwards = 4; dir = 5; forwards = 2; id = "QMshuttle"; reverseSpriteMoveDir = 1},/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aST" = (/obj/machinery/conveyor{backwards = 4; dir = 5; forwards = 2; id = "QMshuttle"; reverseSpriteMoveDir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) "aSU" = (/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor,/area/quartermaster/storage) "aSV" = (/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/turf/simulated/floor/plating,/area/quartermaster/storage) "aSW" = (/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/obj/machinery/door/poddoor{density = 1; icon_state = "pdoor1"; id = "QMLoaddoor"; layer = 3.7; name = "Supply Dock Loading Door"; opacity = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -2358,20 +2358,20 @@ "aTr" = (/obj/machinery/disposal,/turf/simulated/floor,/area/storage/autolathe) "aTs" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/storage/autolathe) "aTt" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area) -"aTu" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/engine/engineering_break_room) -"aTv" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/engine/engineering_break_room) -"aTw" = (/obj/structure/table,/turf/simulated/floor,/area/engine/engineering_break_room) -"aTx" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor,/area/engine/engineering_break_room) +"aTu" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/engine/break_room) +"aTv" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/engine/break_room) +"aTw" = (/obj/structure/table,/turf/simulated/floor,/area/engine/break_room) +"aTx" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor,/area/engine/break_room) "aTy" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/engine/control) "aTz" = (/turf/simulated/wall/r_wall,/area/engine/locker) "aTA" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Locker Room Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/locker) "aTB" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Locker Room Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/locker) "aTC" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Locker Room Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/locker) "aTD" = (/obj/machinery/telecomms/server/presets/cargo,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) -"aTE" = (/obj/machinery/telecomms/bus/antiqua_one,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) -"aTF" = (/obj/machinery/telecomms/receiver/antiqua_left,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) -"aTG" = (/obj/machinery/telecomms/receiver/antiqua_right,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) -"aTH" = (/obj/machinery/telecomms/bus/antiqua_two,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) +"aTE" = (/obj/machinery/telecomms/bus/preset_one,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) +"aTF" = (/obj/machinery/telecomms/receiver/preset_left,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) +"aTG" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) +"aTH" = (/obj/machinery/telecomms/bus/preset_two,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) "aTI" = (/obj/machinery/telecomms/server/presets/security,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"}) "aTJ" = (/obj/structure/disposalpipe/sortjunction{icon_state = "pipe-j2s"; mailsort = 0; sortType = list("Cargo Bay","QM Office")},/turf/simulated/floor,/area/hallway/primary/starboard) "aTK" = (/obj/structure/disposalpipe/segment,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/hallway/primary/starboard) @@ -2381,7 +2381,7 @@ "aTO" = (/turf/simulated/floor,/area/quartermaster/office) "aTP" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor,/area/quartermaster/office) "aTQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/quartermaster/storage) -"aTR" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aTR" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/turf/simulated/floor/plating,/area/quartermaster/storage) "aTS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/movingparts,/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage) "aTT" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/patients_rooms) "aTU" = (/turf/simulated/floor{icon_state = "white"},/area/medical/patients_rooms) @@ -2398,8 +2398,8 @@ "aUf" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/storage/autolathe) "aUg" = (/obj/machinery/power/apc{dir = 2; name = "Autolathe Storage APC"; pixel_x = 0; pixel_y = -24; pixel_z = 0},/obj/structure/cable,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/storage/autolathe) "aUh" = (/turf/simulated/wall/r_wall,/area/maintenance/aft) -"aUi" = (/obj/machinery/light{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/engineering_break_room) -"aUj" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/engine/engineering_break_room) +"aUi" = (/obj/machinery/light{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/break_room) +"aUj" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/engine/break_room) "aUk" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/atmos) "aUl" = (/turf/simulated/floor,/area/atmos) "aUm" = (/obj/effect/landmark{name = "plant"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/atmos) @@ -2421,7 +2421,7 @@ "aUC" = (/obj/machinery/computer/ordercomp,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor,/area/quartermaster/office) "aUD" = (/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor,/area/quartermaster/storage) "aUE" = (/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage) -"aUF" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aUF" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plating,/area/quartermaster/storage) "aUG" = (/obj/machinery/sleeper,/turf/simulated/floor{icon_state = "white"},/area/medical/patients_rooms) "aUH" = (/obj/machinery/sleep_console,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms) "aUI" = (/obj/machinery/camera{c_tag = "Patient Treatment Room 1"; dir = 1; network = "Medbay"; pixel_x = 22},/turf/simulated/floor{icon_state = "white"},/area/medical/patients_rooms) @@ -2441,9 +2441,9 @@ "aUW" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/storage/autolathe) "aUX" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "19"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/storage/autolathe) "aUY" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "12"},/turf/simulated/floor,/area/maintenance/aft) -"aUZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/engineering_break_room) -"aVa" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/engine/engineering_break_room) -"aVb" = (/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor,/area/engine/engineering_break_room) +"aUZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/break_room) +"aVa" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/engine/break_room) +"aVb" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor,/area/engine/break_room) "aVc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/atmos) "aVd" = (/obj/machinery/door/airlock/engineering,/turf/simulated/floor,/area/engine/locker) "aVe" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "12"},/turf/simulated/floor,/area/engine/locker) @@ -2451,8 +2451,8 @@ "aVg" = (/obj/machinery/disposal,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor,/area/quartermaster/office) "aVh" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass{name = "QM Warehouse"; req_access_txt = "31"},/turf/simulated/floor,/area/quartermaster/storage) "aVi" = (/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/storage) -"aVj" = (/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/storage) -"aVk" = (/obj/machinery/conveyor{backwards = 1; dir = 10; forwards = 8; id = "QMshuttle"},/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aVj" = (/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aVk" = (/obj/machinery/conveyor{backwards = 1; dir = 10; forwards = 8; id = "QMshuttle"},/turf/simulated/floor/plating,/area/quartermaster/storage) "aVl" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms) "aVm" = (/obj/effect/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms) "aVn" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms) @@ -2465,25 +2465,25 @@ "aVu" = (/obj/machinery/door/poddoor/shutters{density = 0; icon_state = "shutter0"; id = "sshutters"; name = "Surgery Shutters"},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aVv" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{name = "Surgery"; req_access = null; req_access_txt = "45"},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/surgery) "aVw" = (/turf/simulated/wall,/area/medical/surgery) -"aVx" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) -"aVy" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) +"aVx" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) +"aVy" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port) "aVz" = (/obj/machinery/door/airlock/highsecurity{name = "Teleport Access"; req_access_txt = "17"},/turf/simulated/floor/plating,/area/teleporter) "aVA" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/aft) "aVB" = (/obj/machinery/light/small{dir = 1},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/maintenance/aft) "aVC" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/maintenance/aft) "aVD" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/aft) -"aVE" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/engine/engineering_break_room) -"aVF" = (/obj/machinery/power/apc{dir = 2; name = "Construction Storage APC"; pixel_x = 0; pixel_y = -24; pixel_z = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/turf/simulated/floor,/area/engine/engineering_break_room) -"aVG" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/engineering_break_room) -"aVH" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/engine/engineering_break_room) -"aVI" = (/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering"; req_access_txt = "10"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/engineering_break_room) +"aVE" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/engine/break_room) +"aVF" = (/obj/machinery/power/apc{dir = 2; name = "Construction Storage APC"; pixel_x = 0; pixel_y = -24; pixel_z = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/turf/simulated/floor,/area/engine/break_room) +"aVG" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/break_room) +"aVH" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/engine/break_room) +"aVI" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/break_room) "aVJ" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/atmos) "aVK" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/atmos) "aVL" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/atmos) "aVM" = (/obj/machinery/door/airlock/engineering,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/locker) "aVN" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/engine/locker) "aVO" = (/obj/structure/closet/firecloset,/turf/simulated/floor,/area/engine/locker) -"aVP" = (/obj/structure/closet/secure_closet/atmos_personal,/turf/simulated/floor,/area/engine/locker) +"aVP" = (/turf/simulated/floor,/area/engine/locker) "aVQ" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 8; icon_state = "loadingarea"; tag = "loading"},/area/hallway/primary/starboard) "aVR" = (/obj/structure/plasticflaps,/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/office) "aVS" = (/turf/simulated/floor{dir = 4; icon_state = "loadingarea"; tag = "loading"},/area/quartermaster/office) @@ -2492,14 +2492,14 @@ "aVV" = (/obj/machinery/camera{c_tag = "Warehouse Aft"; dir = 8; network = "Cargo"},/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor,/area/quartermaster/storage) "aVW" = (/obj/machinery/camera{c_tag = "Patient Treatment"; dir = 4; network = "Medbay"},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms) "aVX" = (/obj/machinery/door/firedoor/border_only{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms) -"aVY" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{tag = "icon-whitehall (NORTHWEST)"; icon_state = "whitehall"; dir = 9},/area/medical/medbay) -"aVZ" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/medical/medbay) -"aWa" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/medical/medbay) +"aVY" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{tag = "icon-whitehall (NORTHWEST)"; icon_state = "whitehall"; dir = 9},/area/medical/medbay) +"aVZ" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/medical/medbay) +"aWa" = (/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/medical/medbay) "aWb" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) -"aWc" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/cleaner,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) +"aWc" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aWd" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/stma_kit{pixel_x = 6; pixel_y = 6},/obj/item/weapon/storage/lglo_kit,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aWe" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) -"aWf" = (/obj/structure/closet/secure_closet/anaesthetic,/obj/machinery/power/apc{dir = 4; name = "Surgery APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) +"aWf" = (/obj/structure/closet/secure_closet/medical2,/obj/machinery/power/apc{dir = 4; name = "Surgery APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aWg" = (/obj/structure/table,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aWh" = (/obj/structure/table,/obj/item/weapon/hand_tele,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aWi" = (/obj/structure/table,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) @@ -2509,9 +2509,9 @@ "aWm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/teleporter) "aWn" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "19"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads) "aWo" = (/turf/simulated/wall/r_wall,/area/crew_quarters/chief) -"aWp" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering_break_room) -"aWq" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering_break_room) -"aWr" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering_break_room) +"aWp" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/break_room) +"aWq" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/break_room) +"aWr" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/break_room) "aWs" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/atmos) "aWt" = (/obj/machinery/light{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/locker) "aWu" = (/obj/structure/closet/secure_closet/engineering_personal,/turf/simulated/floor,/area/engine/locker) @@ -2519,9 +2519,9 @@ "aWw" = (/obj/machinery/camera{c_tag = "Starboard Hallway - Quartermasters"; dir = 4; network = "SS13"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/starboard) "aWx" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=4"; dir = 2; freq = 1400; location = "QM #2"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/office) "aWy" = (/obj/machinery/conveyor_switch{id = "qmout"},/turf/simulated/floor,/area/quartermaster/storage) -"aWz" = (/obj/machinery/conveyor{backwards = 4; dir = 5; forwards = 2; id = "qmout"; reverseSpriteMoveDir = 1},/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor/plating,/area/quartermaster/storage) -"aWA" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage) -"aWB" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aWz" = (/obj/machinery/conveyor{backwards = 4; dir = 5; forwards = 2; id = "qmout"; reverseSpriteMoveDir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aWA" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aWB" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage) "aWC" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 31},/turf/simulated/floor,/area/quartermaster/storage) "aWD" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/port) "aWE" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{name = "Patient Room 2"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms) @@ -2544,10 +2544,10 @@ "aWV" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/machinery/power/apc{desc = "Hehehe, it says Head Quarters."; dir = 1; name = "Head Quarters APC"; pixel_y = 25},/turf/simulated/floor,/area/crew_quarters/heads) "aWW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads) "aWX" = (/turf/simulated/wall,/area/crew_quarters/chief) -"aWY" = (/obj/structure/table,/obj/item/wardrobe/chief_engineer,/turf/simulated/floor,/area/crew_quarters/chief) +"aWY" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/chief) "aWZ" = (/obj/effect/landmark{name = "plant"},/obj/machinery/power/apc{dir = 1; name = "CE Quarters APC"; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/crew_quarters/chief) "aXa" = (/obj/structure/bookcase/manuals/engineering,/turf/simulated/floor,/area/crew_quarters/chief) -"aXb" = (/obj/machinery/computer/security/engineering,/turf/simulated/floor,/area/crew_quarters/chief) +"aXb" = (/turf/simulated/floor,/area/crew_quarters/chief) "aXc" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/chief) "aXd" = (/turf/simulated/wall/r_wall,/area/atmos) "aXe" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/atmos) @@ -2559,13 +2559,13 @@ "aXk" = (/obj/machinery/power/apc{dir = 2; name = "Cargo Foyer APC"; pixel_x = 1; pixel_y = -24},/turf/simulated/floor,/area/quartermaster/office) "aXl" = (/obj/machinery/camera{c_tag = "Public Lobby"; dir = 1; network = "Cargo"},/turf/simulated/floor,/area/quartermaster/office) "aXm" = (/obj/machinery/light/spot,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/office) -"aXn" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/office) -"aXo" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 8; id = "qmout"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/storage) -"aXp" = (/obj/machinery/conveyor{backwards = 1; dir = 10; forwards = 8; id = "qmout"},/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor/plating,/area/quartermaster/storage) -"aXq" = (/obj/machinery/conveyor{backwards = 2; dir = 5; forwards = 4; id = "refiner"; reverseSpriteMoveDir = 1},/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor/plating,/area/quartermaster/storage) -"aXr" = (/obj/machinery/conveyor{dir = 4; id = "refiner"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/quartermaster/storage) -"aXs" = (/obj/machinery/conveyor{dir = 4; id = "refiner"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/storage) -"aXt" = (/obj/machinery/conveyor{backwards = 8; dir = 10; forwards = 1; id = "refiner"},/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aXn" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/office) +"aXo" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aXp" = (/obj/machinery/conveyor{backwards = 1; dir = 10; forwards = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aXq" = (/obj/machinery/conveyor{backwards = 2; dir = 5; forwards = 4; id = "refiner"; reverseSpriteMoveDir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aXr" = (/obj/machinery/conveyor{dir = 4; id = "refiner"},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/quartermaster/storage) +"aXs" = (/obj/machinery/conveyor{dir = 4; id = "refiner"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"aXt" = (/obj/machinery/conveyor{backwards = 8; dir = 10; forwards = 1; id = "refiner"},/turf/simulated/floor/plating,/area/quartermaster/storage) "aXu" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/mining/station) "aXv" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/mining/station) "aXw" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/mining/station) @@ -2618,7 +2618,7 @@ "aYr" = (/obj/structure/closet/emcloset,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "aYs" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aYt" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/hemostat,/obj/machinery/light,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) -"aYu" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/surgical_tool/bonesetter,/obj/item/weapon/surgical_tool/bonegel,/obj/machinery/camera{c_tag = "Surgery"; dir = 1; network = "Medbay"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) +"aYu" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/bonesetter,/obj/item/weapon/bonegel,/obj/machinery/camera{c_tag = "Surgery"; dir = 1; network = "Medbay"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aYv" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/scalpel,/obj/machinery/door_control{id = "sshutters"; name = "Privacy Shutters"; pixel_y = -25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aYw" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/surgicaldrill,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aYx" = (/obj/structure/table{pixel_y = 0},/obj/item/clothing/glasses/hud/health,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) @@ -2669,9 +2669,9 @@ "aZq" = (/obj/structure/closet/crate,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aZr" = (/obj/machinery/shieldwallgen,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aZs" = (/obj/machinery/shieldwallgen,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) -"aZt" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) -"aZu" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) -"aZv" = (/obj/machinery/power/apc{dir = 4; name = "Teleporter APC"; pixel_x = 25; pixel_y = 0},/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) +"aZt" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) +"aZu" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) +"aZv" = (/obj/machinery/power/apc{dir = 4; name = "Teleporter APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aZw" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/crew_quarters/hor) "aZx" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/hor) "aZy" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/hor) @@ -2720,12 +2720,12 @@ "bap" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/elite,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/elite,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/crew_quarters/chief) "baq" = (/obj/structure/closet/secure_closet/engineering_chief,/turf/simulated/floor,/area/crew_quarters/chief) "bar" = (/obj/machinery/power/monitor{name = "Engineering Power Monitor"},/turf/simulated/floor,/area/crew_quarters/chief) -"bas" = (/obj/machinery/computer/lockdown{department = "Engineering"; name = "Engineering Lockdown Control"},/turf/simulated/floor,/area/crew_quarters/chief) +"bas" = (/turf/simulated/floor,/area/crew_quarters/chief) "bat" = (/obj/effect/sign/fire{desc = "A warning sign which reads 'INFLAMMABLE'"; name = "INFLAMMABLE"},/turf/simulated/wall/r_wall,/area/atmos) "bau" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/pump,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/atmos) "bav" = (/obj/machinery/camera{c_tag = "Refilling Station"; dir = 8; network = "Atmospherics"},/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/atmos) "baw" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cola{volume = 5},/turf/simulated/floor,/area/quartermaster/miningdock) -"bax" = (/obj/structure/table,/obj/item/weapon/cigpacket,/obj/item/weapon/matchbox,/turf/simulated/floor,/area/quartermaster/miningdock) +"bax" = (/obj/structure/table,/obj/item/weapon/cigpacket,/turf/simulated/floor,/area/quartermaster/miningdock) "bay" = (/turf/simulated/floor,/area/quartermaster/miningdock) "baz" = (/obj/machinery/mineral/processing_unit_console{id = "furnace"; name = "Production machine console"; pixel_x = 0},/turf/simulated/wall,/area/quartermaster/miningdock) "baA" = (/obj/machinery/mineral/processing_unit{id = "furnace"},/turf/simulated/floor/plating,/area/quartermaster/miningdock) @@ -2777,7 +2777,7 @@ "bbu" = (/turf/simulated/wall,/area/maintenance/aft) "bbv" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft) "bbw" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/aft) -"bbx" = (/obj/structure/walllocker/emerglocker/west,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/heads) +"bbx" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/heads) "bby" = (/obj/machinery/camera{c_tag = "Head's Quarters Hallway"; dir = 8; network = "Command"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads) "bbz" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/crew_quarters/heads/hop) "bbA" = (/obj/structure/bookcase{category = "Fiction"; name = "bookcase (Fiction)"},/turf/simulated/floor,/area/crew_quarters/heads/hop) @@ -2862,8 +2862,8 @@ "bdb" = (/obj/structure/table,/obj/item/weapon/storage/mousetraps,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; pixel_y = 29},/turf/simulated/floor,/area/janitor) "bdc" = (/obj/structure/table,/obj/item/weapon/storage/lightbox/bulbs,/obj/item/weapon/storage/lightbox/tubes,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/janitor) "bdd" = (/obj/structure/closet/l3closet/janitor,/turf/simulated/floor,/area/janitor) -"bde" = (/obj/structure/closet/secure_closet/janitor_personal,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/janitor) -"bdf" = (/obj/structure/closet/jcloset2,/obj/effect/decal/cleanable/cobweb2,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/janitor) +"bde" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/janitor) +"bdf" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/janitor) "bdg" = (/obj/machinery/computer/med_data,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/crew_quarters/heads/cmo) "bdh" = (/turf/simulated/floor,/area/crew_quarters/heads/cmo) "bdi" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/heads/cmo) @@ -2879,8 +2879,8 @@ "bds" = (/obj/machinery/power/apc{dir = 8; name = "Mining Dock APC"; pixel_x = -27; pixel_y = 2},/turf/simulated/floor,/area/quartermaster/miningdock) "bdt" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/quartermaster/miningdock) "bdu" = (/obj/structure/closet/secure_closet/miner,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor,/area/quartermaster/miningdock) -"bdv" = (/obj/structure/closet/secure_closet/chemist_personal,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) -"bdw" = (/obj/structure/closet/secure_closet/chemist_personal,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) +"bdv" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) +"bdw" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "bdx" = (/obj/structure/closet/wardrobe/chemistry_white,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "bdy" = (/obj/machinery/disposal,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "bdz" = (/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) @@ -2932,7 +2932,7 @@ "bet" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "beu" = (/obj/effect/landmark{name = "emcloset"},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay) "bev" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/filingcabinet,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) -"bew" = (/obj/structure/closet/secure_closet/medicine,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) +"bew" = (/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "bex" = (/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "bey" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "bez" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor,/area/janitor) @@ -2945,10 +2945,10 @@ "beG" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/heads/cmo) "beH" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/green,/turf/simulated/floor,/area/crew_quarters/heads/cmo) "beI" = (/obj/structure/closet/secure_closet/CMO,/turf/simulated/floor,/area/crew_quarters/heads/cmo) -"beJ" = (/obj/structure/closet/wardrobe/cmo,/turf/simulated/floor,/area/crew_quarters/heads/cmo) +"beJ" = (/turf/simulated/floor,/area/crew_quarters/heads/cmo) "beK" = (/obj/structure/table,/obj/machinery/recharger,/turf/simulated/floor,/area/crew_quarters/heads/hop) "beL" = (/obj/structure/closet/secure_closet/hop,/obj/machinery/light,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor,/area/crew_quarters/heads/hop) -"beM" = (/obj/structure/closet/wardrobe/hop,/turf/simulated/floor,/area/crew_quarters/heads/hop) +"beM" = (/turf/simulated/floor,/area/crew_quarters/heads/hop) "beN" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/hallway/primary/aft) "beO" = (/obj/machinery/power/apc{dir = 1; name = "Hallway Aft APC"; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/hallway/primary/aft) "beP" = (/obj/machinery/disposal,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/obj/structure/disposalpipe/trunk,/turf/simulated/floor,/area/hallway/primary/aft) @@ -2956,10 +2956,10 @@ "beR" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/engine/atmos_storage) "beS" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/engine/atmos_storage) "beT" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/chemistry) -"beU" = (/obj/structure/table,/obj/item/weapon/storage/beakerbox{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/large,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) +"beU" = (/obj/structure/table,/obj/item/weapon/storage/beakerbox{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/glass,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "beV" = (/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "beW" = (/obj/structure/table,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science{pixel_x = 4; pixel_y = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) -"beX" = (/obj/structure/table,/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = -4},/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = 4},/obj/item/device/assembly/igniter,/obj/item/weapon/chem_grenade{pixel_x = 4; pixel_y = 4},/obj/item/weapon/chem_grenade{pixel_x = 8; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) +"beX" = (/obj/structure/table,/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = -4},/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = 4},/obj/item/device/assembly/igniter,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "beY" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "beZ" = (/obj/machinery/door/firedoor/border_only,/obj/structure/table/reinforced{layer = 2.6},/obj/machinery/door/window/westright{dir = 4; icon_state = "right"; name = "Chemistry Desk"; req_access_txt = "5"; tag = "icon-right (EAST)"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "bfa" = (/obj/machinery/photocopier,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay) @@ -2970,8 +2970,8 @@ "bff" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/hallway/primary/aft) "bfg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/hallway/primary/aft) "bfh" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 31},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/aft) -"bfi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering Access, Refilling Station"; req_access_txt = "0"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/atmos) -"bfj" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering Access, Refilling Station"; req_access_txt = "0"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/atmos) +"bfi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Access, Refilling Station"; req_access_txt = "0"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/atmos) +"bfj" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Access, Refilling Station"; req_access_txt = "0"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/atmos) "bfk" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/starboard) "bfl" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor,/area/hallway/primary/starboard) "bfm" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/maintenance/disposal) @@ -2985,7 +2985,7 @@ "bfu" = (/obj/machinery/chem_master,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "bfv" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "bfw" = (/obj/structure/table,/obj/item/stack/sheet/plasma,/obj/item/stack/sheet/plasma{pixel_x = -6; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) -"bfx" = (/obj/structure/table,/obj/item/weapon/chem_grenade{pixel_x = 8; pixel_y = 8},/obj/item/weapon/chem_grenade{pixel_x = 8},/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = -4},/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = 4},/obj/item/device/assembly/timer,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) +"bfx" = (/obj/structure/table,/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = -4},/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = 4},/obj/item/device/assembly/timer,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "bfy" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor,/area/medical/medbay) "bfz" = (/obj/structure/disposalpipe/sortjunction{backsort = 1; backType = list("Chemistry","CMO"); dir = 4; icon_state = "pipe-j1s"; sortType = list("Morgue","Genetics")},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay) "bfA" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/machinery/door/airlock/glass_medical{name = "Medbay"; req_access = null; req_access_txt = "5"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) @@ -3106,7 +3106,7 @@ "bhL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Dormitory"},/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters) "bhM" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Dormitory"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "neutralcorner"; dir = 4},/area/crew_quarters) "bhN" = (/turf/simulated/wall/r_wall,/area/crew_quarters) -"bhO" = (/obj/structure/closet/secure_closet/genetics_personal,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) +"bhO" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) "bhP" = (/obj/structure/table,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) "bhQ" = (/obj/machinery/computer/cloning{wantspod = 1; wantsscan = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) "bhR" = (/obj/machinery/clonepod,/obj/machinery/camera{c_tag = "Genetical Research"; dir = 2; network = "Medbay"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) @@ -3119,8 +3119,8 @@ "bhY" = (/turf/simulated/wall,/area/medical/genetics) "bhZ" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/medbay) "bia" = (/obj/machinery/vending/medical,/obj/machinery/light_switch{dir = 8; pixel_x = -24},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) -"bib" = (/obj/structure/table,/obj/item/weapon/cleaner{pixel_x = 8; pixel_y = 3},/obj/item/weapon/hand_labeler,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) -"bic" = (/obj/structure/table,/obj/item/weapon/storage/backpack/medic/full,/obj/item/weapon/storage/backpack/medic/full,/obj/item/weapon/storage/backpack/medic/full,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) +"bib" = (/obj/structure/table,/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 8; pixel_y = 3},/obj/item/weapon/hand_labeler,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) +"bic" = (/obj/structure/table,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "bid" = (/obj/structure/table,/obj/item/weapon/storage/gl_kit{pixel_x = 4; pixel_y = 3},/obj/item/weapon/storage/syringes,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "bie" = (/obj/structure/bookcase/manuals/medical,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "bif" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) @@ -3141,10 +3141,10 @@ "biu" = (/obj/structure/table,/obj/machinery/door_control{dir = 1; id = "barshutter"; name = "Bar Shutters"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "biv" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "biw" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) -"bix" = (/obj/structure/closet/secure_closet/barman_personal,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) +"bix" = (/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "biy" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar) "biz" = (/obj/structure/sink/kitchen,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar) -"biA" = (/obj/structure/closet/secure_closet/fridge,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar) +"biA" = (/obj/structure/closet/secure_closet/freezer/kitchen,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar) "biB" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar) "biC" = (/obj/structure/table,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "biD" = (/obj/structure/closet/crate/hydroponics/prespawned,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) @@ -3166,7 +3166,7 @@ "biT" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/chapel/office) "biU" = (/obj/structure/bookcase{category = "Religion"; name = "bookcase (Religious)"},/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/chapel/office) "biV" = (/obj/structure/bookcase{category = "Non-Fiction"; name = "bookcase (Non-Fiction)"},/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/chapel/office) -"biW" = (/obj/structure/closet/secure_closet/counselor_personal,/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/chapel/office) +"biW" = (/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/chapel/office) "biX" = (/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters) "biY" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/crew_quarters) "biZ" = (/obj/machinery/disposal,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "neutral"; dir = 9},/area/crew_quarters) @@ -3244,10 +3244,10 @@ "bkt" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "bku" = (/obj/structure/table,/obj/item/weapon/book/manual/barman_recipes,/obj/machinery/power/apc{dir = 4; name = "Bar APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "bkv" = (/obj/machinery/camera{c_tag = "Bar Freezer"; dir = 4; network = "SS13"},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar) -"bkw" = (/obj/structure/closet/secure_closet/hydro_personal,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"bkw" = (/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "bkx" = (/obj/machinery/light/spot,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "bky" = (/obj/machinery/camera{c_tag = "Hydrophonics Back Room"; dir = 1; network = "SS13"},/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) -"bkz" = (/obj/structure/closet/wardrobe/hydro_green,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"bkz" = (/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "bkA" = (/obj/effect/landmark{name = "plant"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/hydroponics) "bkB" = (/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "bkC" = (/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main) @@ -3281,7 +3281,7 @@ "ble" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire{pixel_x = 4; pixel_y = 3},/obj/item/weapon/storage/firstaid/fire,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "blf" = (/obj/structure/table,/obj/item/weapon/gun/syringe{pixel_y = 4},/obj/item/weapon/gun/syringe,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "blg" = (/obj/structure/closet/wardrobe/medic_white,/obj/machinery/camera{c_tag = "Medbay Storage"; dir = 1; network = "Medbay"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) -"blh" = (/obj/structure/closet/secure_closet/anaesthetic,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) +"blh" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "bli" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) "blj" = (/obj/structure/table,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) "blk" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) @@ -3351,7 +3351,7 @@ "bmw" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/genetics) "bmx" = (/obj/structure/table,/obj/item/weapon/storage/syringes{pixel_x = 6; pixel_y = 6},/obj/item/weapon/storage/lglo_kit,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) "bmy" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) -"bmz" = (/obj/machinery/scan_consolenew,/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) +"bmz" = (/obj/machinery/computer/scan_consolenew,/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) "bmA" = (/obj/structure/morgue,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "bmB" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "bmC" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) @@ -3444,11 +3444,11 @@ "bol" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay) "bom" = (/turf/simulated/wall/r_wall,/area/medical/medbay) "bon" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/obj/machinery/door/poddoor/shutters{desc = "A type of shutter"; dir = 8; id = "kitchenshutter"; layer = 3.3; name = "Kitchen Shutters"; id = "Kitchen Shutters"},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) -"boo" = (/obj/structure/table,/obj/item/weapon/monkeycube_box,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) +"boo" = (/obj/structure/table,/obj/item/weapon/storage/monkeycube_box,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bop" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "boq" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) -"bor" = (/obj/structure/closet/secure_closet/meat,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen) -"bos" = (/obj/structure/closet/secure_closet/fridge,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen) +"bor" = (/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen) +"bos" = (/obj/structure/closet/secure_closet/freezer/kitchen,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen) "bot" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen) "bou" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen) "bov" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Chapel Storage"; req_access_txt = "22"},/turf/simulated/floor,/area/chapel/main) @@ -3489,7 +3489,7 @@ "bpe" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 25},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/aft) "bpf" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) "bpg" = (/obj/machinery/camera{c_tag = "Genetical Research Monkey Pen"; dir = 1; network = "Medbay"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) -"bph" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/ash,/obj/machinery/crema_switch{desc = "Descretly disposing the bodies of past employees since anno domine"; id = "crematorium"; pixel_x = -25; req_access = null; req_access_txt = "40"},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) +"bph" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/ash,/obj/machinery/crema_switch{desc = "Descretly disposing the bodies of past employees since anno domine"; id = "crematorium"; pixel_x = -25; req_access = null; req_access_txt = "40"},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "bpi" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "bpj" = (/obj/structure/closet/crate,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "bpk" = (/obj/structure/morgue,/obj/machinery/camera{c_tag = "Morgue"; dir = 1; network = "Medbay"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) @@ -3539,12 +3539,12 @@ "bqc" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) "bqd" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/poddoor/shutters{desc = "A type of shutter"; dir = 8; id = "kitchenshutter"; layer = 3.3; name = "Kitchen Shutters"; id = "Kitchen Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/kitchen) "bqe" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/westleft{dir = 1; name = "Kitchen Delivery"; req_access_txt = "28"},/turf/simulated/floor{icon_state = "delivery"},/area/crew_quarters/kitchen) -"bqf" = (/obj/structure/table,/obj/machinery/blender,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) +"bqf" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bqg" = (/obj/structure/table,/obj/machinery/juicer,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bqh" = (/obj/structure/table,/obj/machinery/processor,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bqi" = (/obj/structure/table,/obj/item/weapon/book/manual/chef_recipes,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bqj" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) -"bqk" = (/obj/structure/closet/secure_closet/kitchen,/obj/machinery/power/apc{dir = 4; name = "Kitchen APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) +"bqk" = (/obj/machinery/power/apc{dir = 4; name = "Kitchen APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bql" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor{icon_state = "green"; dir = 10},/area/hydroponics) "bqm" = (/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor{icon_state = "green"},/area/hydroponics) "bqn" = (/obj/machinery/camera{c_tag = "Hydrophonics Kitchen Access"; dir = 1; network = "SS13"},/turf/simulated/floor{icon_state = "green"},/area/hydroponics) @@ -3636,7 +3636,7 @@ "brV" = (/obj/structure/table/woodentable,/turf/simulated/floor{dir = 4; icon_state = "carpetside"},/area/chapel/main) "brW" = (/obj/structure/table,/obj/item/device/radio/intercom{pixel_x = 0; pixel_y = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "brX" = (/obj/structure/closet/wardrobe/virology_white,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) -"brY" = (/obj/structure/closet/secure_closet/viro_personal,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) +"brY" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "brZ" = (/obj/machinery/atmospherics/pipe/tank/air,/obj/machinery/camera{c_tag = "Virology Back Room"; network = "Medbay"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "bsa" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/medical/virology) "bsb" = (/obj/structure/table,/obj/machinery/light{dir = 1},/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) @@ -3696,14 +3696,14 @@ "btd" = (/obj/machinery/light,/obj/machinery/firealarm{dir = 2; layer = 4; pixel_x = 0; pixel_y = 25},/obj/structure/closet/l3closet/virology,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "bte" = (/obj/structure/table,/obj/item/clothing/gloves/latex,/obj/item/clothing/glasses/hud/health,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "btf" = (/obj/structure/table,/obj/item/weapon/storage/syringes{pixel_x = 6; pixel_y = 6},/obj/item/weapon/storage/beakerbox,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) -"btg" = (/obj/structure/table,/obj/item/weapon/cleaner,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) +"btg" = (/obj/structure/table,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "bth" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "bti" = (/obj/machinery/camera{c_tag = "Virology"; dir = 1; network = "Medbay"},/obj/machinery/light,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "btj" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "btk" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "btl" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "btm" = (/obj/machinery/light,/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/obj/structure/table,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) -"btn" = (/obj/machinery/door/poddoor/four_tile_hor,/turf/space,/area) +"btn" = (/obj/machinery/door/poddoor,/turf/space,/area) "bto" = (/turf/space,/area/start) "btp" = (/obj/effect/landmark/start,/turf/space,/area/start) "btq" = (/turf/unsimulated/wall{icon = 'icons/misc/fullscreen.dmi'; icon_state = "title"; name = "Baystation 13"},/area/start) @@ -3713,13 +3713,13 @@ "btu" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/supply/dock) "btv" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/supply/dock) "btw" = (/turf/simulated/shuttle/floor,/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/supply/dock) -"btx" = (/obj/effect/marker/supplymarker,/turf/simulated/shuttle/floor,/area/supply/dock) +"btx" = (/turf/simulated/shuttle/floor,/area/supply/dock) "bty" = (/turf/simulated/shuttle/floor,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_f5"; tag = "icon-swall_f10"},/area/supply/dock) "btz" = (/turf/simulated/shuttle/wall{tag = "icon-swall3"; icon_state = "swall3"; dir = 2},/area/supply/dock) -"btA" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; pixel_x = -32},/obj/effect/marker/supplymarker,/turf/simulated/shuttle/floor,/area/supply/dock) +"btA" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; pixel_x = -32},/turf/simulated/shuttle/floor,/area/supply/dock) "btB" = (/obj/machinery/door/airlock/external{name = "Supply Dock Airlock"},/turf/simulated/shuttle/floor,/area/supply/dock) "btC" = (/turf/simulated/shuttle/floor,/area/supply/dock) -"btD" = (/obj/effect/sign/movingparts{pixel_x = -32},/obj/effect/marker/supplymarker,/turf/simulated/shuttle/floor,/area/supply/dock) +"btD" = (/obj/effect/sign/movingparts{pixel_x = -32},/turf/simulated/shuttle/floor,/area/supply/dock) "btE" = (/turf/space,/area/shuttle/escape/centcom) "btF" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/escape/centcom) "btG" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/escape/centcom) @@ -3758,13 +3758,13 @@ "bun" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "buo" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "bup" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) -"buq" = (/obj/structure/closet/secure_closet/medicine,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) +"buq" = (/obj/structure/closet/secure_closet/medical1,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "bur" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "bus" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/escape/centcom) "but" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/shuttle/escape/centcom) "buu" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/storage/firstaid/fire,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "buv" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/escape/centcom) -"buw" = (/obj/machinery/door/airlock/glass/glass_security{name = "Secure Transport"; req_access_txt = "1"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) +"buw" = (/obj/machinery/door/airlock/glass_security{name = "Secure Transport"; req_access_txt = "1"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "bux" = (/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom) "buy" = (/obj/item/weapon/handcuffs,/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom) "buz" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/obj/effect/sign/movingparts{pixel_x = -32},/turf/simulated/shuttle/floor,/area/supply/dock) @@ -3792,7 +3792,7 @@ "buV" = (/obj/structure/rack,/turf/unsimulated/floor{icon_state = "grimy"},/area) "buW" = (/turf/unsimulated/floor{icon_state = "grimy"},/area) "buX" = (/obj/structure/stool/bed,/turf/unsimulated/floor{icon_state = "grimy"},/area) -"buY" = (/obj/structure/table/reinforced,/obj/item/weapon/surgicaldrill,/obj/item/weapon/storage/briefcase/surgery,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area) +"buY" = (/obj/structure/table/reinforced,/obj/item/weapon/surgicaldrill,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area) "buZ" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area) "bva" = (/obj/effect/decal/cleanable/dirt,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area) "bvb" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area) @@ -3846,7 +3846,7 @@ "bvX" = (/obj/item/stack/tile/plasteel,/turf/unsimulated/floor,/area) "bvY" = (/obj/structure/device/piano,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bvZ" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/dice,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) -"bwa" = (/obj/structure/table/reinforced,/obj/item/weapon/cigpacket,/obj/item/weapon/matchbox,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) +"bwa" = (/obj/structure/table/reinforced,/obj/item/weapon/cigpacket,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bwb" = (/obj/structure/rack,/turf/unsimulated/floor{tag = "icon-floorscorched1"; icon_state = "floorscorched1"},/area) "bwc" = (/turf/unsimulated/floor{icon_state = "floor"},/area) "bwd" = (/obj/structure/noticeboard{pixel_x = 32; pixel_y = 32},/turf/unsimulated/floor{icon_state = "floor"},/area) @@ -3854,7 +3854,7 @@ "bwf" = (/obj/item/weapon/caution/cone,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bwg" = (/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area) "bwh" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/fancy/donut_box,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area) -"bwi" = (/obj/structure/rack,/obj/structure/walllocker{pixel_x = -24},/turf/unsimulated/floor{icon_state = "floor"},/area) +"bwi" = (/turf/unsimulated/floor{icon_state = "floor"},/area) "bwj" = (/obj/effect/decal/cleanable/dirt,/turf/unsimulated/floor{icon_state = "floor"},/area) "bwk" = (/obj/item/weapon/storage/crayonbox,/turf/unsimulated/floor{icon_state = "dark"},/area) "bwl" = (/obj/item/weapon/book/manual/chef_recipes,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area) @@ -3872,7 +3872,7 @@ "bwx" = (/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/structure/table/reinforced,/obj/item/weapon/pen/blue,/turf/simulated/floor{icon_state = "white"},/area) "bwy" = (/obj/structure/filingcabinet,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bwz" = (/obj/item/weapon/book/manual/barman_recipes,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area) -"bwA" = (/obj/structure/table/reinforced,/obj/item/weapon/cleaner,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area) +"bwA" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area) "bwB" = (/obj/structure/closet/wardrobe/chaplain_black,/turf/unsimulated/floor{icon_state = "floor"},/area) "bwC" = (/turf/unsimulated/floor{icon_state = "floor"},/area) "bwD" = (/obj/structure/closet/gmcloset,/turf/unsimulated/floor{icon_state = "floor"},/area) From ab440fbf7d164a22db41d544fde6ee87d6cf33a6 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 1 Dec 2012 18:35:27 +0400 Subject: [PATCH 19/35] Fixed compile error in custom items. Made rigs protect against radiation again. --- code/modules/clothing/spacesuits/rig.dm | 4 ++-- code/modules/customitems/item_defines.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index ab04e347fe8..9429e41cb31 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -4,7 +4,7 @@ desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding." icon_state = "rig0-engineering" item_state = "eng_helm" - armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60) + armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 100) allowed = list(/obj/item/device/flashlight) var/brightness_on = 4 //luminosity when on var/on = 0 @@ -42,7 +42,7 @@ icon_state = "rig-engineering" item_state = "eng_hardsuit" slowdown = 2 - armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60) + armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 100) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 6ee0502c886..8ddc7e68b17 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -529,7 +529,7 @@ desc = "A colorful pair of magboots with the name Susan Harris clearly written on the back." icon = 'custom_items.dmi' icon_state = "atmosmagboots0" - verb/toggle() + toggle() set name = "Toggle Magboots" set category = "Object" set src in usr From 0b614a488ccc8d685f6d8f91da2535f8f1a81d2d Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sun, 2 Dec 2012 00:02:43 +0400 Subject: [PATCH 20/35] Made bandages stop bleeding when applied, not waiting until next 20-tick organ update cycle. --- code/datums/organs/organ_external.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm index 4a89aecf382..d59c2a79315 100644 --- a/code/datums/organs/organ_external.dm +++ b/code/datums/organs/organ_external.dm @@ -214,6 +214,7 @@ proc/bandage() var/rval = 0 + src.status &= ~ORGAN_BLEEDING for(var/datum/wound/W in wounds) if(W.internal) continue rval |= !W.bandaged From 0a9b6f6bbe9ae0f8fa6eebe8458a9df7e4368982 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sun, 2 Dec 2012 00:03:30 +0400 Subject: [PATCH 21/35] Removed armor suit from Captain's spawn gear --- code/game/jobs/job/captain.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 3c81adadc97..7303cb0d4dd 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -21,7 +21,7 @@ var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H) U.hastie = new /obj/item/clothing/tie/medal/gold/captain(U) H.equip_to_slot_or_del(U, slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt) + //H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/captain(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head) From 507dc0c49651cc88e37245fffceea4208fa59931 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sun, 2 Dec 2012 16:30:24 +0400 Subject: [PATCH 22/35] Better feedback messages and ability to target groin, hands and feet. --- code/game/objects/items/stacks/medical.dm | 50 ++++++++++------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 559d8255d36..63992bde103 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -23,42 +23,34 @@ if (istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M - var/datum/organ/external/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) - + var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting) if(affecting.status & ORGAN_ROBOT) user << "\red This isn't useful at all on a robotic limb.." return 1 - if(src.heal_brute) - if(!affecting.bandage()) - user << "\red The wounds on this limb have already been bandaged." - return 1 - else if(src.heal_burn) - if(!affecting.salve()) - user << "\red The wounds on this limb have already been salved." - return 1 + if(src.heal_brute) + if(!affecting.bandage()) + user << "\red The wounds on [M]'s [affecting.display_name] have already been bandaged." + return 1 + else + user.visible_message( "\blue [user] bandages wounds on [M]'s [affecting.display_name].", \ + "\blue You bandage wounds on [M]'s [affecting.display_name]." ) + + else if(src.heal_burn) + if(!affecting.salve()) + user << "\red The wounds on [M]'s [affecting.display_name] have already been salved." + return 1 + else + user.visible_message( "\blue [user] salves wounds on [M]'s [affecting.display_name].", \ + "\blue You salve wounds on [M]'s [affecting.display_name]." ) H.UpdateDamageIcon() - M.updatehealth() else M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2)) + user.visible_message( \ + "\blue [M] has been applied with [src] by [user].", \ + "\blue You apply \the [src] to [M]." \ + ) use(1) - - if (user) - if (M != user) - user.visible_message( \ - "\blue [M] has been applied with [src] by [user].", \ - "\blue You apply \the [src] to [M]." \ - ) - else - var/t_himself = "itself" - if (user.gender == MALE) - t_himself = "himself" - else if (user.gender == FEMALE) - t_himself = "herself" - - user.visible_message( \ - "\blue [M] applied [src] on [t_himself].", \ - "\blue You apply \the [src] on yourself." \ - ) + M.updatehealth() From 77943e04f377bc3d1a11df734f5d44a8a25d8095 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 2 Dec 2012 13:58:57 +0100 Subject: [PATCH 23/35] Balance fix to random blob event. It now lasts 20 minutes instead of 5, and accordingly each blob advancements happens every 30 seconds instead of every 7 seconds. This means more time to respond to the blob, but overally the blob can still be just as harmful if nothing is done about it. --- code/game/gamemodes/events/miniblob.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/events/miniblob.dm b/code/game/gamemodes/events/miniblob.dm index cbb32198363..93f3c2a7172 100644 --- a/code/game/gamemodes/events/miniblob.dm +++ b/code/game/gamemodes/events/miniblob.dm @@ -9,7 +9,7 @@ blobevent = 1 spawn(0) dotheblobbaby() - spawn(3000) + spawn(12000) // blob event can last up to 20 minutes blobevent = 0 spawn(rand(1000, 2000)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") @@ -25,5 +25,5 @@ if(B.z != 1) continue B.Life() - spawn(70) - dotheblobbaby() \ No newline at end of file + spawn(280) // advance 1 tile every 30 seconds + dotheblobbaby() From 6ab420237b6b7a1bf49c23861c8bc742e5ecca26 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 6 Dec 2012 15:14:17 +0100 Subject: [PATCH 24/35] Attack log will now store type path for bullets. --- code/modules/projectiles/projectile.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 067ef207acd..ab930dcfe56 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -87,19 +87,19 @@ visible_message("\red [A.name] is hit by the [src.name] in the [def_zone]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter if(istype(firer, /mob)) - M.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src]" - firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src]" - log_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]") + M.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src.type]" + firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src.type]" + log_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src.type]") - log_admin("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]") - msg_admin_attack("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]") //BS12 EDIT ALG + log_admin("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src.type]") + msg_admin_attack("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src.type]") //BS12 EDIT ALG else M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a [src]" - log_attack("UNKNOWN shot [M] ([M.ckey]) with a [src]") + log_attack("UNKNOWN shot [M] ([M.ckey]) with a [src.type]") log_admin("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src]") - msg_admin_attack("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src]") //BS12 EDIT ALG + msg_admin_attack("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src.type]") //BS12 EDIT ALG spawn(0) if(A) From d567d88749e9cb53e95be103269e36ce1b462b48 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 6 Dec 2012 18:20:56 +0400 Subject: [PATCH 25/35] Fixed issue with severed heads not being visible --- code/datums/organs/organ_external.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm index d59c2a79315..c10c6c77ecd 100644 --- a/code/datums/organs/organ_external.dm +++ b/code/datums/organs/organ_external.dm @@ -356,7 +356,7 @@ H = new /obj/item/weapon/organ/head(owner.loc, owner) if(ishuman(owner)) if(owner.gender == FEMALE) - H.icon_state = "head_f_l" + H.icon_state = "head_f" H.overlays += owner.generate_head_icon() H:transfer_identity(owner) H.pixel_x = -10 @@ -682,7 +682,7 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H) obj/item/weapon/organ/head name = "head" - icon_state = "head_m_l" + icon_state = "head_m" var/mob/living/carbon/brain/brainmob var/brain_op_stage = 0 From c56974f2e8ba65ba9d6c3fd0db35c68e85a1295e Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 9 Dec 2012 16:04:43 +0100 Subject: [PATCH 26/35] Fixes issue #2043 Player notes list now has a better organized interface, which should prevent BYOND overloading and dying a gruesome death. --- code/modules/admin/admin.dm | 31 +++++++++++++++++++++++++++---- code/modules/admin/holder2.dm | 2 ++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 35c600dcd53..74c27f30e2f 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -173,10 +173,11 @@ var/global/floorIsLava = 0 /datum/player_info/var/content // text content of the information /datum/player_info/var/timestamp // Because this is bloody annoying -/datum/admins/proc/PlayerNotes() +#define PLAYER_NOTES_ENTRIES_PER_PAGE 50 +/datum/admins/proc/PlayerNotes(var/page = 1) set category = "Admin" set name = "Player Notes" - var/dat = "Player notes
    " + var/dat = "Player notes
    " if (!istype(src,/datum/admins)) src = usr.client.holder if (!istype(src,/datum/admins)) @@ -189,10 +190,32 @@ var/global/floorIsLava = 0 if(!note_keys) dat += "No notes found." else + dat += "
    " sortList(note_keys) - for(var/t in note_keys) + + // Display the notes on the current page + var/number_pages = note_keys.len / PLAYER_NOTES_ENTRIES_PER_PAGE + var/page_index = page - 1 + if(page_index < 0 || page_index >= number_pages) + return + + for(var/index = page_index * PLAYER_NOTES_ENTRIES_PER_PAGE + 1, \ + index <= (page_index + 1) * PLAYER_NOTES_ENTRIES_PER_PAGE, \ + index++) + + var/t = note_keys[index] dat += "" - dat += "
    [t]
    " + + dat += "
    " + + // Display a footer to select different pages + for(var/index = 1, index <= number_pages, index++) + if(index == page) + dat += "" + dat += "[index] " + if(index == page) + dat += "" + usr << browse(dat, "window=player_notes;size=400x400") diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 96bc9b6e20c..3d2c506ae48 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -2706,4 +2706,6 @@ var/list/admin_datums = list() switch(href_list["notes"]) if("show") show_player_info(ckey) + if("list") + PlayerNotes(href_list["index"]) return From fd4a3576d46f5f8db6b9153a41f48491606e05de Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 9 Dec 2012 21:00:36 +0400 Subject: [PATCH 27/35] Fix to the improved player notes list. --- code/modules/admin/admin.dm | 19 ++++++++++++------- code/modules/admin/holder2.dm | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 74c27f30e2f..7a14927c057 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -174,16 +174,18 @@ var/global/floorIsLava = 0 /datum/player_info/var/timestamp // Because this is bloody annoying #define PLAYER_NOTES_ENTRIES_PER_PAGE 50 -/datum/admins/proc/PlayerNotes(var/page = 1) +/datum/admins/proc/PlayerNotes() set category = "Admin" set name = "Player Notes" - var/dat = "Player notes
    " if (!istype(src,/datum/admins)) src = usr.client.holder if (!istype(src,/datum/admins)) usr << "Error: you are not an admin!" return + PlayerNotesPage(1) +/datum/admins/proc/PlayerNotesPage(page) + var/dat = "Player notes
    " var/savefile/S=new("data/player_notes.sav") var/list/note_keys S >> note_keys @@ -195,14 +197,17 @@ var/global/floorIsLava = 0 // Display the notes on the current page var/number_pages = note_keys.len / PLAYER_NOTES_ENTRIES_PER_PAGE + // Emulate ceil(why does BYOND not have ceil) + if(number_pages != round(number_pages)) + number_pages = round(number_pages) + 1 var/page_index = page - 1 if(page_index < 0 || page_index >= number_pages) return - for(var/index = page_index * PLAYER_NOTES_ENTRIES_PER_PAGE + 1, \ - index <= (page_index + 1) * PLAYER_NOTES_ENTRIES_PER_PAGE, \ - index++) - + var/lower_bound = page_index * PLAYER_NOTES_ENTRIES_PER_PAGE + 1 + var/upper_bound = (page_index + 1) * PLAYER_NOTES_ENTRIES_PER_PAGE + upper_bound = min(upper_bound, note_keys.len) + for(var/index = lower_bound, index <= upper_bound, index++) var/t = note_keys[index] dat += "[t]" @@ -1146,4 +1151,4 @@ proc/move_alien_ship() alien_ship_location = 0 else alien_ship_location = 1 - return \ No newline at end of file + return diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 3d2c506ae48..9f9e9abd3fa 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -2707,5 +2707,5 @@ var/list/admin_datums = list() if("show") show_player_info(ckey) if("list") - PlayerNotes(href_list["index"]) + PlayerNotesPage(href_list["index"]) return From aa7d0eec6ce8a749c071761de55ceb713c7f7e61 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Mon, 10 Dec 2012 16:53:53 +0000 Subject: [PATCH 28/35] Compile fix. Signed-off-by: Mloc-Argent --- baystation12.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/baystation12.dme b/baystation12.dme index ce69add117c..bdbb2ffbcb1 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1150,6 +1150,7 @@ #include "code\modules\mob\living\silicon\robot\life.dm" #include "code\modules\mob\living\silicon\robot\login.dm" #include "code\modules\mob\living\silicon\robot\robot.dm" +#include "code\modules\mob\living\silicon\robot\robot_items.dm" #include "code\modules\mob\living\silicon\robot\robot_modules.dm" #include "code\modules\mob\living\silicon\robot\robot_movement.dm" #include "code\modules\mob\living\silicon\robot\say.dm" From c4e9afe0ae067212e497564cad50c1869ea39809 Mon Sep 17 00:00:00 2001 From: cib Date: Tue, 11 Dec 2012 11:57:22 +0100 Subject: [PATCH 29/35] Fix issue #2048 Disables random space ninja spawns. --- code/game/gamemodes/events.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index facc5f88eb6..acb669a4a99 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -67,9 +67,9 @@ spawn(rand(300,600)) del(P) */ - if(3) + /*if(3) if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. - space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like. + space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.*/ if(4) mini_blob_event() @@ -524,4 +524,4 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is world << "Finished processing FIREDOORS. Processed: [firedoornum]" world << "Ion Storm Main Done" - */ \ No newline at end of file + */ From f664e7c99d76d1d4ba3a02c7fade598950d1b041 Mon Sep 17 00:00:00 2001 From: cib Date: Tue, 11 Dec 2012 12:07:11 +0100 Subject: [PATCH 30/35] Fixes issue #2033 --- code/modules/mob/living/carbon/human/life.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0dbd1dd272c..402757f62ea 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -274,7 +274,7 @@ if(E.name == "l_hand" || E.name == "l_arm") if(hand && equipped()) drop_item() - emote("custom v drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!") + emote("me", 1, "drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!") var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src) spark_system.attach(src) @@ -284,7 +284,7 @@ else if(E.name == "r_hand" || E.name == "r_arm") if(!hand && equipped()) drop_item() - emote("custom v drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!") + emote("me", 1, "drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!") var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src) spark_system.attach(src) From 0db60b65c72379492b7daa67920f25808103e9e0 Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Wed, 12 Dec 2012 02:49:29 -0800 Subject: [PATCH 31/35] Portable generator Fix Portable generators properly drop their fuel when deconstructed Portable generators need their cover open to be destructed now Fixed a runtime error when building a portable generator with a 2s wire --- code/game/machinery/constructable_frame.dm | 2 +- code/modules/power/port_gen.dm | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index e9dfd6a6a74..7790526dd77 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -154,7 +154,7 @@ update_desc() break user << desc - if(P.loc != src && !istype(P, /obj/item/weapon/cable_coil)) + if(P && P.loc != src && !istype(P, /obj/item/weapon/cable_coil)) user << "\red You cannot add that component to the machine!" diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 57a71fbb5cc..82530f3add6 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -213,12 +213,22 @@ display round(lastgen) and plasmatank amount user << "\blue You open the access panel." else user << "\blue You close the access panel." - else if(istype(O, /obj/item/weapon/crowbar) && !open) + else if(istype(O, /obj/item/weapon/crowbar) && open) var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc) for(var/obj/item/I in component_parts) if(I.reliability < 100) I.crit_fail = 1 I.loc = src.loc + while ( sheets > 0 ) + var/obj/item/stack/sheet/G = new sheet_path(src.loc) + + if ( sheets > 50 ) + G.amount = 50 + else + G.amount = sheets + + sheets -= G.amount + new_frame.state = 2 new_frame.icon_state = "box_1" del(src) From 62d88717ba7d9c5333b2bb494658d8c07c6230f7 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 16 Dec 2012 00:18:50 +0100 Subject: [PATCH 32/35] Fixed a bug with rev objective checking. If a single alive, non-converted head left the station z-level, it'd be a victory for the revs. --- code/game/gamemodes/objective.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 40acaf36c90..ec1f67e3a57 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -106,6 +106,7 @@ datum/objective/mutiny/rp // less violent rev objectives check_completion() + var/rval = 1 if(target && target.current) if(target.current.stat == DEAD || target.current.handcuffed || !ishuman(target.current)) return 1 @@ -115,9 +116,9 @@ datum/objective/mutiny/rp return 1 var/turf/T = get_turf(target.current) if(T && (T.z != 1)) //If they leave the station they count as dead for this - return 2 + rval = 2 return 0 - return 1 + return rval datum/objective/anti_revolution/execute find_target() From 7b8a33dc53335b0953d6e46b08656b0c7ad41eb9 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 16 Dec 2012 03:39:45 +0100 Subject: [PATCH 33/35] Fixed compile error regarding unclosed comment in events.dm --- code/game/gamemodes/events.dm | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index acb669a4a99..90370188385 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -36,40 +36,6 @@ spawn(700) meteor_wave() spawn_meteors() - - /*if(2) - command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('sound/AI/granomalies.ogg') - var/turf/T = pick(blobstart) - var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) - spawn(rand(50, 300)) - del(bh)*/ - /* - if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO - command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('sound/AI/spanomalies.ogg') - var/list/turfs = new - var/turf/picked - for(var/turf/simulated/floor/T in world) - if(T.z == 1) - turfs += T - for(var/turf/simulated/floor/T in turfs) - if(prob(20)) - spawn(50+rand(0,3000)) - picked = pick(turfs) - var/obj/effect/portal/P = new /obj/effect/portal( T ) - P.target = picked - P.creator = null - P.icon = 'icons/obj/objects.dmi' - P.failchance = 0 - P.icon_state = "anom" - P.name = "wormhole" - spawn(rand(300,600)) - del(P) - */ - /*if(3) - if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. - space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.*/ if(4) mini_blob_event() From 0855c5d1af1374d5fe2609774a468ab505fbb54d Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 16 Dec 2012 04:04:43 +0100 Subject: [PATCH 34/35] Fixes issue #2006 Medical belt can now hold autoinjector. --- code/game/objects/items/weapons/storage/belt.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 3662579f5cd..79a60e0a794 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -95,7 +95,8 @@ "/obj/item/stack/medical", "/obj/item/device/flashlight/pen", "/obj/item/clothing/mask/surgical", - "/obj/item/clothing/gloves/latex" + "/obj/item/clothing/gloves/latex", + "/obj/item/weapon/reagent_containers/hypospray/autoinjector" ) @@ -153,4 +154,4 @@ storage_slots = 1 can_hold = list( "/obj/item/clothing/mask/luchador" - ) \ No newline at end of file + ) From 7cf324431687617516b1988e5ddc3ec175bb4feb Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 16 Dec 2012 04:57:32 +0100 Subject: [PATCH 35/35] Fixes issue #2059 Mob transform into monkey no longer uses hardcoded DNA size of 14. --- code/modules/mob/transform_procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index ff624a0bae8..d1c60d9bb62 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -29,7 +29,7 @@ dna = null O.dna.uni_identity = "00600200A00E0110148FC01300B009" //O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8" - O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*13)]BB8" + O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8" O.loc = loc O.viruses = viruses viruses = list()